[X2go-Commits] nx-libs.git - test (branch) updated: 0096b8244f14cf0fda9691cd99b0a44a29bd0c4d

[X2go dev team]

The branch, test has been updated
       via  0096b8244f14cf0fda9691cd99b0a44a29bd0c4d (commit)
       via  7d116d41e0f2ab33e70b6ed1c11b61750cb4160e (commit)
      from  1ae97588f16046f49f11c5ec92640bb8caa633ef (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 0096b8244f14cf0fda9691cd99b0a44a29bd0c4d
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Oct 21 01:07:17 2011 +0200

    fix installation paths for Debian package

commit 7d116d41e0f2ab33e70b6ed1c11b61750cb4160e
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Oct 21 01:06:51 2011 +0200

    re-add autoconf runs for nxcom* libs

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

Summary of changes:
 Makefile                        |    3 +++
 debian/control                  |    2 +-
 debian/libnx-x11.install        |    6 +++---
 debian/libxcomp-dev.install     |    8 ++++----
 debian/libxcomp3.install        |    4 ++--
 debian/libxcompext-dev.install  |    4 ++--
 debian/libxcompext3.install     |    2 +-
 debian/libxcompshad-dev.install |    4 ++--
 debian/libxcompshad3.install    |    2 +-
 9 files changed, 19 insertions(+), 16 deletions(-)

The diff of changes is:
diff --git a/Makefile b/Makefile
index ce1e94c..46bc230 100755
--- a/Makefile
+++ b/Makefile
@@ -17,6 +17,9 @@ distclean:
 	cd nxcompshad && test -f Makefile && make distclean || true
 
 build-arch:
+	cd nxcomp && autoconf
+	cd nxcompext && autoconf
+	cd nxcompshad && autoconf
 	cd nx-X11 && make World
 
 build-indep:
diff --git a/debian/control b/debian/control
index f506735..5772a5f 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Homepage: http://code.x2go.org/releases/source/nx-libs
 Vcs-Git: git://code.x2go.org/nx-libs.git
 Vcs-Browser: http://code.x2go.org/gitweb?p=nx-libs.git;a=summary
 
-Package: libx11-nx
+Package: libnx-x11
 Architecture: any
 Depends:
  ${shlibs:Depends},
diff --git a/debian/libnx-x11.install b/debian/libnx-x11.install
index 85542f4..bc60adb 100644
--- a/debian/libnx-x11.install
+++ b/debian/libnx-x11.install
@@ -1,4 +1,4 @@
-nx-X11/lib/X11/lib*                usr/lib/nx-X11
-nx-X11/lib/Xext/lib*               usr/lib/nx-X11
-nx-X11/lib/Xrender/lib*            usr/lib/nx-X11
+nx-X11/lib/X11/lib*                usr/lib/nx/X11
+nx-X11/lib/Xext/lib*               usr/lib/nx/X11
+nx-X11/lib/Xrender/lib*            usr/lib/nx/X11
 
diff --git a/debian/libxcomp-dev.install b/debian/libxcomp-dev.install
index 67c2e48..dd9b01d 100644
--- a/debian/libxcomp-dev.install
+++ b/debian/libxcomp-dev.install
@@ -1,4 +1,4 @@
-nxcomp/libXcomp.so	usr/lib
-nxcomp/libXcomp.a	usr/lib
-nxcomp/NX*.h		usr/include
-nxcomp/MD5.h		usr/include
+nxcomp/libXcomp.so	usr/lib/nx
+nxcomp/libXcomp.a	usr/lib/nx
+nxcomp/NX*.h		usr/include/nx
+nxcomp/MD5.h		usr/include/nx
diff --git a/debian/libxcomp3.install b/debian/libxcomp3.install
index f05269f..bef21a1 100644
--- a/debian/libxcomp3.install
+++ b/debian/libxcomp3.install
@@ -1,2 +1,2 @@
-nxcomp/libXcomp.so.3.* usr/lib
-nxcomp/libXcomp.so.3 usr/lib
+nxcomp/libXcomp.so.3.* usr/lib/nx
+nxcomp/libXcomp.so.3 usr/lib/nx
diff --git a/debian/libxcompext-dev.install b/debian/libxcompext-dev.install
index 91d1136..fce72a4 100644
--- a/debian/libxcompext-dev.install
+++ b/debian/libxcompext-dev.install
@@ -1,2 +1,2 @@
-nxcompext/libXcompext.so usr/lib
-nxcompext/NX*.h usr/include
+nxcompext/libXcompext.so usr/lib/nx
+nxcompext/NX*.h usr/include/nx
diff --git a/debian/libxcompext3.install b/debian/libxcompext3.install
index 302e814..88f74f8 100644
--- a/debian/libxcompext3.install
+++ b/debian/libxcompext3.install
@@ -1 +1 @@
-nxcompext/libXcompext.so.* usr/lib
+nxcompext/libXcompext.so.* usr/lib/nx
diff --git a/debian/libxcompshad-dev.install b/debian/libxcompshad-dev.install
index 70fe535..6816b15 100644
--- a/debian/libxcompshad-dev.install
+++ b/debian/libxcompshad-dev.install
@@ -1,4 +1,4 @@
 nxcompshad/*.h		usr/include/nx
 nxcompshad/*.a		usr/lib/nx/
-nxcompshad/lib*.so		usr/lib/
-nxcompshad/*.a		usr/lib/
+nxcompshad/lib*.so	usr/lib/nx/
+nxcompshad/*.a		usr/lib/nx/
diff --git a/debian/libxcompshad3.install b/debian/libxcompshad3.install
index 495ef8b..9307a38 100644
--- a/debian/libxcompshad3.install
+++ b/debian/libxcompshad3.install
@@ -1 +1 @@
-nxcompshad/lib*.so.*	usr/lib/
+nxcompshad/lib*.so.*	usr/lib/nx


hooks/post-receive
-- 
nx-libs.git (NX libraries)

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 "nx-libs.git" (NX libraries).