[X2Go-Commits] [nx-libs] 01/02: debian/libnx-xinerama1.*: move Xinerama dir back to nx-x11-common. Only delete known files. Fixes RPM build failures.

git-admin at x2go.org git-admin at x2go.org
Thu Apr 30 14:47:36 CEST 2015


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch 3.5.0.x
in repository nx-libs.

commit 0af0060d5cfdf3593c1f6f20077c85ba353cbef0
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Thu Apr 30 14:34:11 2015 +0200

    debian/libnx-xinerama1.*: move Xinerama dir back to nx-x11-common. Only delete known files. Fixes RPM build failures.
---
 debian/Makefile.nx-libs            |    2 +-
 debian/libnx-xinerama1.postinst.in |    7 +------
 debian/libnx-xinerama1.prerm       |   13 ++++++++++++-
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/debian/Makefile.nx-libs b/debian/Makefile.nx-libs
index 9df219e..87610bf 100644
--- a/debian/Makefile.nx-libs
+++ b/debian/Makefile.nx-libs
@@ -139,7 +139,7 @@ install-full:
 	# $(DESTDIR)$(NXLIBDIR)/X11/Xinerama/libNX_Xext.so.6 -> /usr/<libdir>/libXext.so.6
 	# $(DESTDIR)$(NXLIBDIR)/X11/Xinerama/libXinerama.so.1 -> /usr/<libdir>/libNX_Xinerama.so.1
 	# Only create the owned directory here for nx-x11-common.
-	$(INSTALL_DIR) $(DESTDIR)$(NXLIBDIR)/X11
+	$(INSTALL_DIR) $(DESTDIR)$(NXLIBDIR)/X11/Xinerama
 
 	$(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/nx/X11/bitmaps
 	$(INSTALL_FILE) nx-X11/.build-exports/include/X11/bitmaps/* \
diff --git a/debian/libnx-xinerama1.postinst.in b/debian/libnx-xinerama1.postinst.in
index 9b88c4b..c370603 100755
--- a/debian/libnx-xinerama1.postinst.in
+++ b/debian/libnx-xinerama1.postinst.in
@@ -26,13 +26,8 @@ case "$1" in
 
 		libdir=/usr/lib/#DEB_BUILD_MULTIARCH#
 
-		# Already existent files and directories are not removed.
+		# Already existent files are not removed.
 		# Users will need to explicitly remove them and (re-) configure this package.
-
-		if test ! -e /usr/lib/nx/X11/Xinerama; then
-			install -d -m 755 /usr/lib/nx/X11/Xinerama
-		fi
-
 		if test -e $libdir/libX11.so.6; then
 			ln -s $libdir/libX11.so.6 /usr/lib/nx/X11/Xinerama/libNX_X11.so.6
 		fi
diff --git a/debian/libnx-xinerama1.prerm b/debian/libnx-xinerama1.prerm
index 91105d0..8cca06c 100755
--- a/debian/libnx-xinerama1.prerm
+++ b/debian/libnx-xinerama1.prerm
@@ -20,7 +20,18 @@ set -e
 case "$1" in
 	remove)
 		if test -d /usr/lib/nx/X11/Xinerama; then
-			rm -rf /usr/lib/nx/X11/Xinerama
+			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
 		fi
 		;;
 	deconfigure|upgrade|failed-upgrade)

--
Alioth's /srv/git/code.x2go.org/nx-libs.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git


More information about the x2go-commits mailing list