[X2go-Commits] nx-libs.git - master (branch) updated: redist-client/3.5.0.11-10-gfb27493

X2go dev team git-admin at x2go.org
Thu Mar 1 22:13:43 CET 2012


The branch, master has been updated
       via  fb274937dea4838ff18724f556305a05282cd45a (commit)
       via  055436f481b323da2e354eddb76b3099cd96e6ff (commit)
      from  3776a6f417d4844f92b035eec2ca3d06466ec4e8 (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 fb274937dea4838ff18724f556305a05282cd45a
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Mar 1 22:13:32 2012 +0100

    Provide temporary workaround for installation on Debian 64bit with multiarch support (via libnx-x11.postinst and .prerm).

commit 055436f481b323da2e354eddb76b3099cd96e6ff
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Mar 1 22:06:08 2012 +0100

    fix wrong lib-name in libnx-x11.postinst

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

Summary of changes:
 debian/changelog          |    2 +-
 debian/libnx-x11.postinst |    2 +-
 debian/libnx-x11.prerm    |   42 ++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 44 insertions(+), 2 deletions(-)
 create mode 100755 debian/libnx-x11.prerm

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 68d4012..578cdac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,7 +5,7 @@ nx-libs (2:3.5.0.12-0) UNRELEASED; urgency=low
     packaging. Test for Makefiles in subfolders before calling them.
     Fixes build failure during ,,make distclean'' calls.
   * Provide temporary workaround for installation on Debian 64bit with
-    multiarch support.
+    multiarch support (via libnx-x11.postinst and .prerm).
 
   [ Mihai Moldovan ]
   * Add patch: 051_nxcomp_macos105-fdisset.full+lite.patch, work around
diff --git a/debian/libnx-x11.postinst b/debian/libnx-x11.postinst
index ad5a094..ed56bd7 100755
--- a/debian/libnx-x11.postinst
+++ b/debian/libnx-x11.postinst
@@ -30,7 +30,7 @@ case "$1" in
 			if test -e $libdir/libX11.so.6; then
 				ln -s $libdir/libX11.so.6 /usr/lib/nx/X11/Xinerama/libNX_X11.so.6
 			fi
-			if test -e $libdir/libNX_Xext.so.6; then
+			if test -e $libdir/libXext.so.6; then
 				ln -s $libdir/libXext.so.6 /usr/lib/nx/X11/Xinerama/libNX_Xext.so.6
 			fi
 		fi
diff --git a/debian/libnx-x11.prerm b/debian/libnx-x11.prerm
new file mode 100755
index 0000000..3fcd330
--- /dev/null
+++ b/debian/libnx-x11.prerm
@@ -0,0 +1,42 @@
+#!/bin/sh
+# postrm script for x2goserver-fmbindings
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postrm> `remove'
+#        * <postrm> `purge'
+#        * <old-postrm> `upgrade' <new-version>
+#        * <new-postrm> `failed-upgrade' <old-version>
+#        * <new-postrm> `abort-install'
+#        * <new-postrm> `abort-install' <old-version>
+#        * <new-postrm> `abort-upgrade' <old-version>
+#        * <disappearer's-postrm> `disappear' <overwriter>
+#          <overwriter-version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+	purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+		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
+	;;
+	*)
+		echo "postrm 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


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




More information about the x2go-commits mailing list