aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2012-02-20 10:00:00 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2012-02-20 10:00:00 +0100
commitfde6a88a81ebdeb151a39e05977279d060f16884 (patch)
treeb340f02908629670c7ebc301c0fb7ca7d9d4c2e2 /debian
parentec47c22c264bd2f1d2ce6e434b503a701dc129f7 (diff)
downloadnx-libs-fde6a88a81ebdeb151a39e05977279d060f16884.tar.gz
nx-libs-fde6a88a81ebdeb151a39e05977279d060f16884.tar.bz2
nx-libs-fde6a88a81ebdeb151a39e05977279d060f16884.zip
Fine-tune symlinking of libXinerama.
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog1
-rw-r--r--debian/libnx-x11.install1
-rw-r--r--debian/libnx-x11.links4
-rwxr-xr-xdebian/post-build-nx.sh3
-rwxr-xr-xdebian/rules2
5 files changed, 4 insertions, 7 deletions
diff --git a/debian/changelog b/debian/changelog
index 1e007bb2f..185f8e9e4 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 f2cf59e09..7838d089f 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 67a1d2495..82c245fdb 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 4ca212854..2d1f8d27e 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 4a4782d6a..a5ac09e06 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