aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorMihai Moldovan <ionic@ionic.de>2015-04-30 14:25:25 +0200
committerMihai Moldovan <ionic@ionic.de>2015-04-30 14:30:59 +0200
commita9bc7bdb6bc8c51f3ed8f35e80c4c0291f3d7ac2 (patch)
treee70982ab5561d088335bae94a64f71f68eb7d066 /debian
parent7a6b40a11ded7f36e8d99039144238d33a84849d (diff)
downloadnx-libs-a9bc7bdb6bc8c51f3ed8f35e80c4c0291f3d7ac2.tar.gz
nx-libs-a9bc7bdb6bc8c51f3ed8f35e80c4c0291f3d7ac2.tar.bz2
nx-libs-a9bc7bdb6bc8c51f3ed8f35e80c4c0291f3d7ac2.zip
debian/libnx-xinerama1.*: move Xinerama dir back to nx-x11-common. Only delete known files. Fixes RPM build failures.
Diffstat (limited to 'debian')
-rwxr-xr-xdebian/libnx-xinerama1.postinst.in7
-rwxr-xr-xdebian/libnx-xinerama1.prerm13
2 files changed, 13 insertions, 7 deletions
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)