From a9bc7bdb6bc8c51f3ed8f35e80c4c0291f3d7ac2 Mon Sep 17 00:00:00 2001
From: Mihai Moldovan <ionic@ionic.de>
Date: Thu, 30 Apr 2015 14:25:25 +0200
Subject: debian/libnx-xinerama1.*: move Xinerama dir back to nx-x11-common.
 Only delete known files. Fixes RPM build failures.

---
 Makefile                           |  2 +-
 debian/libnx-xinerama1.postinst.in |  7 +------
 debian/libnx-xinerama1.prerm       | 13 ++++++++++++-
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index 47efbde52..c218d8604 100644
--- a/Makefile
+++ b/Makefile
@@ -160,7 +160,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)/$(ETCDIR_NX)
 	$(INSTALL_DIR) $(DESTDIR)/$(ETCDIR_X2GO)
diff --git a/debian/libnx-xinerama1.postinst.in b/debian/libnx-xinerama1.postinst.in
index 9b88c4b6f..c3706038c 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 91105d0f8..8cca06c85 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)
-- 
cgit v1.2.3