library clean-up: Don't build libNX_Xinerama anymore. Use system's libXinerama shared library. (Fixes ArcticaProject/nx-libs#49).

 This commit goes along with a patch from Ulrich Sibiller who managed to
 move the Xinerama awareness for NX sessions into the Xserver code. This
 makes Xinerama support for NX in libNX_Xinerama.so obsolete.

 Fixes ArcticaProject/nx-libs#49

9 files changed, 15 insertions, 163 deletions

diff --git a/debian/control b/debian/control
index 946dd4b2a..94aa64014 100644
--- a/debian/control
+++ b/debian/control
@@ -22,12 +22,11 @@ Build-Depends:
  libxrandr-dev,
  libxfixes-dev,
  libxtst-dev,
+ libxinerama-dev,
  autoconf,
  pkg-config,
  x11proto-core-dev,
  expat,
-Build-Conflicts:
- x11proto-xinerama-dev,
 Standards-Version: 3.9.6
 Homepage: http://code.x2go.org/gitweb?p=nx-libs.git;a=summary
 Vcs-Git: git://code.x2go.org/nx-libs.git
@@ -548,21 +547,17 @@ Multi-Arch: same
 Pre-Depends:
  ${misc:Pre-Depends},
 Depends:
- ${shlibs:Depends},
  ${misc:Depends},
-Breaks: nxlibs (<= 3.5.1),
-        libnx-x11 (<< 2:3.5.0.29-0x2go2~),
 Description: nx-X11 Xinerama extension library
  NX is a software suite which implements very efficient
  compression of the X11 protocol. This increases performance when
  using X applications over a network, especially a slow one.
  .
- libNX_Xinerama provides an X Window System client interface to the XINERAMA
- extension to the X protocol.
+ This package removes the obsoleted libNX_Xinerama.so.1 library.
+ Xinerama support in NX has been moved into nxagent whereas X-Clients
+ can now use the libXinerama library shipped with X.Org.
  .
- The Xinerama (also known as panoramiX) extension allows for multiple screens
- attached to a single display to be treated as belonging together, and to give
- desktop applications a better idea of the monitor layout. 
+ This package can be safely removed.
 
 Package: libnx-xinerama-dev
 Provides: libnx-xinerama1-dev
@@ -570,24 +565,16 @@ Section: libdevel
 Architecture: any
 Multi-Arch: same
 Depends:
- libnx-xinerama1 (= ${binary:Version}),
- nx-x11proto-xinerama-dev (= ${binary:Version}),
  ${misc:Depends},
-Breaks: nxlibs (<= 3.5.1),
-        libnx-x11-dev (<< 2:3.5.0.29-0x2go2~),
 Description: nx-X11 Xinerama extension library (development headers)
  NX is a software suite which implements very efficient
  compression of the X11 protocol. This increases performance when
  using X applications over a network, especially a slow one.
  .
- libNX_Xinerama provides an X Window System client interface to the XINERAMA
- extension to the X protocol.
+ This package removes the obsoleted headers for the libNX_Xinerama.so.1
+ library.
  .
- The Xinerama (also known as panoramiX) extension allows for multiple screens
- attached to a single display to be treated as belonging together, and to give
- desktop applications a better idea of the monitor layout. 
- .
- This package contains the development headers for this library.
+ This package can be safely removed.
 
 Package: nx-x11proto-xinerama-dev
 Section: libdevel
@@ -595,16 +582,15 @@ Architecture: any
 Multi-Arch: same
 Depends:
  ${misc:Depends},
-Breaks: nxlibs (<= 3.5.1),
-        libnx-x11-dev (<< 2:3.5.0.29-0x2go2~),
 Description: nx-X11 Xinerama extension wire protocol
  NX is a software suite which implements very efficient
  compression of the X11 protocol. This increases performance when
  using X applications over a network, especially a slow one.
  .
- This package provides development headers describing the wire protocol
- for the XINERAMA extension, used to use and manage a multiple-screen
- display.
+ This package removes the obsoleted headers for the libNX_Xinerama.so.1
+ library.
+ .
+ This package can be safely removed.
 
 Package: libnx-xinerama1-dbg
 Architecture: any
@@ -624,12 +610,10 @@ Description: nx-X11 Xinerama extension library (debug package)
  libNX_Xinerama provides an X Window System client interface to the XINERAMA
  extension to the X protocol.
  .
- The Xinerama (also known as panoramiX) extension allows for multiple
- screens attached to a single display to be treated as belonging
- together, and to give desktop applications a better idea of the monitor
- layout. 
+ This package removes the obsoleted debug symbols for the libNX_Xinerama.so.1
+ library.
  .
- This package contains debug symbols for this library.
+ This package can be safely removed.
 
 Package: libnx-xpm4
 Architecture: any
diff --git a/debian/libnx-xinerama-dev.install.in b/debian/libnx-xinerama-dev.install.in
deleted file mode 100644
index 59c0456aa..000000000
--- a/debian/libnx-xinerama-dev.install.in
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/lib/*/libNX_Xinerama.so
-usr/include/*/nx-X11/extensions/Xinerama.h
-usr/include/*/nx-X11/extensions/panoramiXext.h
diff --git a/debian/libnx-xinerama1.install.in b/debian/libnx-xinerama1.install.in
deleted file mode 100644
index d53de9c4f..000000000
--- a/debian/libnx-xinerama1.install.in
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/libNX_Xinerama.so.*
diff --git a/debian/libnx-xinerama1.symbols b/debian/libnx-xinerama1.symbols
deleted file mode 100644
index f8f73a3fd..000000000
--- a/debian/libnx-xinerama1.symbols
+++ /dev/null
@@ -1,11 +0,0 @@
-libNX_Xinerama.so.1 libnx-xinerama1 #MINVER#
- XPanoramiXAllocInfo@Base 3.5.0.29
- XPanoramiXGetScreenCount@Base 3.5.0.29
- XPanoramiXGetScreenSize@Base 3.5.0.29
- XPanoramiXGetState@Base 3.5.0.29
- XPanoramiXQueryExtension@Base 3.5.0.29
- XPanoramiXQueryVersion@Base 3.5.0.29
- XineramaIsActive@Base 3.5.0.29
- XineramaQueryExtension@Base 3.5.0.29
- XineramaQueryScreens@Base 3.5.0.29
- XineramaQueryVersion@Base 3.5.0.29
diff --git a/debian/nx-x11-common.install b/debian/nx-x11-common.install
index 1131e7291..b6fc46613 100644
--- a/debian/nx-x11-common.install
+++ b/debian/nx-x11-common.install
@@ -1,2 +1 @@
 usr/share/nx/SecurityPolicy
-usr/lib/nx/X11/
diff --git a/debian/nx-x11proto-xinerama-dev.install.in b/debian/nx-x11proto-xinerama-dev.install.in
deleted file mode 100644
index dca06ddee..000000000
--- a/debian/nx-x11proto-xinerama-dev.install.in
+++ /dev/null
@@ -1 +0,0 @@
-usr/include/*/nx-X11/extensions/panoramiXproto.h
\ No newline at end of file
diff --git a/debian/nxagent.postinst.in b/debian/nxagent.postinst.in
deleted file mode 100755
index 95879b943..000000000
--- a/debian/nxagent.postinst.in
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/bin/sh
-# postinst script for nxagent
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <postinst> `configure' <most-recently-configured-version>
-#        * <old-postinst> `abort-upgrade' <new version>
-#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
-#          <new-version>
-#        * <postinst> `abort-remove'
-#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
-#          <failed-install-package> <version> `removing'
-#          <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
-case "$1" in
-	configure)
-		### FIXME: this is a work-around while we have not implemented
-		###        multiarch support into the Debian source package of
-		###        nx-libs.
-
-		libdir=/usr/lib/#DEB_BUILD_MULTIARCH#
-
-		mkdir -p /usr/lib/nx/X11/Xinerama/
-		# Already existent files are not removed.
-		# Users will need to explicitly remove them and (re-) configure this package.
-		if test -e $libdir/libX11.so.6; then
-			ln -sf $libdir/libX11.so.6 /usr/lib/nx/X11/Xinerama/libNX_X11.so.6
-		fi
-		if test -e $libdir/libXext.so.6; then
-			ln -sf $libdir/libXext.so.6 /usr/lib/nx/X11/Xinerama/libNX_Xext.so.6
-		fi
-		if test -e $libdir/libNX_Xinerama.so.1; then
-			ln -sf $libdir/libNX_Xinerama.so.1 /usr/lib/nx/X11/Xinerama/libXinerama.so.1
-		fi
-	;;
-
-	abort-upgrade|abort-remove|abort-deconfigure)
-	;;
-
-	*)
-		echo "postinst called with unknown argument \`$1'" >&2
-		exit 1
-	;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/nxagent.prerm b/debian/nxagent.prerm
deleted file mode 100755
index 019284a16..000000000
--- a/debian/nxagent.prerm
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/sh
-# prerm script for nxagent
-#
-# see: dh_installdeb(1)
-# summary of how this script can be called:
-#        * <prerm> `remove'
-#        * <old-prerm> `upgrade' <new-version>
-#        * <new-prerm> `failed-upgrade' <old-version>
-#        * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
-#        * <deconfigured's-prerm> `deconfigure' `in-favour'
-#        <package-being-installed> <version> `removing'
-#        <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-set -e
-
-
-
-case "$1" in
-	remove)
-		if test -d /usr/lib/nx/X11/Xinerama; then
-			if test -e /usr/lib/nx/X11/Xinerama/libNX_X11.so.6; then
-				rm -f /usr/lib/nx/X11/Xinerama/libNX_X11.so.6
-			fi
-
-			if test -e /usr/lib/nx/X11/Xinerama/libNX_Xext.so.6; then
-				rm -f /usr/lib/nx/X11/Xinerama/libNX_Xext.so.6
-			fi
-
-			if test -e /usr/lib/nx/X11/Xinerama/libXinerama.so.1; then
-				rm -f /usr/lib/nx/X11/Xinerama/libXinerama.so.1
-			fi
-
-			rmdir --ignore-fail-on-non-empty /usr/lib/nx/X11/Xinerama
-
-		fi
-		;;
-	deconfigure|upgrade|failed-upgrade)
-		:
-		;;
-	*)
-		echo "prerm called with unknown argument \`$1'" >&2
-		exit 1
-		;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/rules b/debian/rules
index 729a2c6f4..c90bb6451 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,7 +20,6 @@ override_dh_auto_clean:
 override_dh_clean:
 	rm -f nx*/configure
 	. ./replace.sh; set -x; ls debian/*.install.in | while read file; do rm -f $$(string_rep $$file .install.in .install); done
-	rm -f debian/nxagent.postinst
 	rm -fR .preserve/
 	dh_clean
 
@@ -72,16 +71,12 @@ override_dh_auto_install:
 
 override_dh_auto_build:
 
-	# let's prep the nxagent.postinst script with the value of the build systems's DEB_BUILD_MULTIARCH variable
-	sed debian/nxagent.postinst.in -e 's/#DEB_BUILD_MULTIARCH#/$(DEB_BUILD_MULTIARCH)/' > debian/nxagent.postinst
-
 	LOCAL_LDFLAGS="$(LDFLAGS)" SHLIBGLOBALSFLAGS="$(LDFLAGS)" SHLIBDIR="$(LIBDIR)" PREFIX=/usr dh_auto_build --parallel
 
 override_dh_strip:
 	dh_strip -plibnx-x11-6 --dbg-package=libnx-x11-6-dbg
 	dh_strip -plibnx-xau6 --dbg-package=libnx-xau6-dbg
 	dh_strip -plibnx-xext6 --dbg-package=libnx-xext6-dbg
-	dh_strip -plibnx-xinerama1 --dbg-package=libnx-xinerama1-dbg
 	dh_strip -plibnx-xrender1 --dbg-package=libnx-xrender1-dbg
 	dh_strip -plibxcomp3 --dbg-package=libxcomp3-dbg
 	dh_strip -plibxcompshad3 --dbg-package=libxcompshad3-dbg