[X2go-Commits] nxcomp.git - master (branch) updated: 3.5.0-1-8-g4bf73d1

[X2go dev team]

The branch, master has been updated
       via  4bf73d13238e1f74ad1019979f377eb7f59bd352 (commit)
      from  02ab8c66b85d6bf4f7f3809e480922e40488df96 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 4bf73d13238e1f74ad1019979f377eb7f59bd352
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Oct 14 00:45:34 2011 +0200

    Place nx-X11 headers in /usr/include/nx/X11.

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog               |    7 +++++++
 debian/libxcomp-dev.install    |    4 ++--
 debian/x11proto-nx-dev.install |    2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index d74b58e..ca61fae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,13 @@ nxcomp (3.5.0-2-0~x2go1) UNRELEASED; urgency=low
   [ Oleksandr Shneyder ]
   * New upstream version
 
+  [ Mike Gabriel ]
+  * Place nx-X11 headers in /usr/include/nx/X11.
+
+  [ Reinhard Tartler ]
+  * Import nx-X11 headers from nx-x11/include and package as x11proto-nx-dev.
+  * Build nxcomp against nx-X11 headers.
+
  -- Oleksandr Shneyder <oleksandr.shneyder at treuchtlingen.de>  Fri, 30 Sep 2011 15:02:59 +0200
 
 nxcomp (3.5.0-1-0~x2go2) unstable; urgency=low
diff --git a/debian/libxcomp-dev.install b/debian/libxcomp-dev.install
index b537657..7c72243 100644
--- a/debian/libxcomp-dev.install
+++ b/debian/libxcomp-dev.install
@@ -1,4 +1,4 @@
 libXcomp.so	usr/lib
 libXcomp.a	usr/lib
-NX*.h		usr/include
-MD5.h		usr/include
+NX*.h		usr/include/nx
+MD5.h		usr/include/nx
diff --git a/debian/x11proto-nx-dev.install b/debian/x11proto-nx-dev.install
index c51d1fa..bd131c8 100644
--- a/debian/x11proto-nx-dev.install
+++ b/debian/x11proto-nx-dev.install
@@ -1 +1 @@
-X11/* /usr/include/X11
+X11/* /usr/include/nx/X11


hooks/post-receive
-- 
nxcomp.git (NX comp library)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "nxcomp.git" (NX comp library).