[X2go-Commits] nx-libs.git - master (branch) updated: redist-client/3.5.0.10-33-gfde6a88

[X2go dev team]

The branch, master has been updated
       via  fde6a88a81ebdeb151a39e05977279d060f16884 (commit)
      from  ec47c22c264bd2f1d2ce6e434b503a701dc129f7 (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 fde6a88a81ebdeb151a39e05977279d060f16884
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Feb 20 10:00:00 2012 +0100

    Fine-tune symlinking of libXinerama.

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

Summary of changes:
 debian/changelog         |    1 +
 debian/libnx-x11.install |    1 -
 debian/libnx-x11.links   |    4 ++--
 debian/post-build-nx.sh  |    3 ---
 debian/rules             |    2 +-
 5 files changed, 4 insertions(+), 7 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 1e007bb..185f8e9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,6 +27,7 @@ nx-libs (2:3.5.0.11-0) UNRELEASED; urgency=low
   * Fix Xinerama support in Debian package libnx-x11 when NX gets built with
     patch 600_nx-X11+nxcompext+nxcompshad_unique-libnames.full.patch. Still on
     the todo list: fix the nx-X11 installation via Makefile.
+  * Fine-tune symlinking of libXinerama.
 
   [ Jan Engelhardt ]
   * Update patch: 001_add-main-makefile.full+lite.patch, allow passing of
diff --git a/debian/libnx-x11.install b/debian/libnx-x11.install
index f2cf59e..7838d08 100644
--- a/debian/libnx-x11.install
+++ b/debian/libnx-x11.install
@@ -1,3 +1,2 @@
 nx-X11/.build-exports/lib/*                     usr/lib/nx/X11
-nx-X11/lib/Xinerama/libNX_Xinerama.so*          usr/lib/nx/X11/Xinerama
 nx-X11/programs/Xserver/Xext/SecurityPolicy     usr/share/nx
diff --git a/debian/libnx-x11.links b/debian/libnx-x11.links
index 67a1d24..82c245f 100644
--- a/debian/libnx-x11.links
+++ b/debian/libnx-x11.links
@@ -1,4 +1,4 @@
 usr/lib/libX11.so.6  usr/lib/nx/X11/Xinerama/libNX_X11.so.6
 usr/lib/libXext.so.6 usr/lib/nx/X11/Xinerama/libNX_Xext.so.6
-usr/lib/nx/X11/Xinerama/libNX_Xinerama.so usr/lib/nx/X11/Xinerama/libXinerama.so
-usr/lib/nx/X11/Xinerama/libNX_Xinerama.so.1 usr/lib/nx/X11/Xinerama/libXinerama.so.1
+usr/lib/nx/X11/libNX_Xinerama.so usr/lib/nx/X11/Xinerama/libXinerama.so
+usr/lib/nx/X11/libNX_Xinerama.so.1 usr/lib/nx/X11/Xinerama/libXinerama.so.1
diff --git a/debian/post-build-nx.sh b/debian/post-build-nx.sh
index 4ca2128..2d1f8d2 100755
--- a/debian/post-build-nx.sh
+++ b/debian/post-build-nx.sh
@@ -24,7 +24,4 @@ find nx-X11/exports/lib/ | egrep "^.*\.so$" | while read libpath; do
 
 done
 
-# do not install libXinerama into default path...
-rm -f nx-X11/.build-exports/lib/libXinerama*
-
 exit 0
diff --git a/debian/rules b/debian/rules
index 4a4782d..a5ac09e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,7 +9,7 @@ else
 endif
 
 %:
-	LD_LIBRARY_PATH=`pwd`/debian/libnx-x11/usr/lib/nx/X11:`pwd`/debian/libnx-x11/usr/lib/nx/X11/Xinerama:$$LD_LIBRARY_PATH dh $@ --with quilt
+	LD_LIBRARY_PATH=`pwd`/debian/libnx-x11/usr/lib/nx/X11:$$LD_LIBRARY_PATH dh $@ --with quilt
 
 override_dh_auto_clean:
 	rm -Rf nx-X11/.build-exports


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

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 (redistributed)).