Fine-tune symlinking of libXinerama.

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

debian/libnx-x11.install

 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

debian/libnx-x11.links

 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

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

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