aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorMihai Moldovan <ionic@ionic.de>2015-05-05 01:23:50 +0200
committerMihai Moldovan <ionic@ionic.de>2015-05-05 01:25:10 +0200
commit5a9f8294ce2f9c4265c5359323d7ad157974d016 (patch)
tree7c3741de4677a491aea6eff1349f4b7fca55567c /debian
parent5f2a5ac842699efa577337261e4336b6503d1029 (diff)
downloadnx-libs-5a9f8294ce2f9c4265c5359323d7ad157974d016.tar.gz
nx-libs-5a9f8294ce2f9c4265c5359323d7ad157974d016.tar.bz2
nx-libs-5a9f8294ce2f9c4265c5359323d7ad157974d016.zip
debian/libnx-xinerama1.*: fix faulty logic when creating symlinks.
Backported from Arctica GH 3.6.x branch.
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog2
-rwxr-xr-xdebian/libnx-xinerama1.postinst.in6
2 files changed, 5 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index 32201c4cd..e1b14ceb7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -144,6 +144,8 @@ nx-libs (2:3.5.0.32-0x2go1) UNRELEASED; urgency=low
Backported from Arctica GH 3.6.x branch.
* debian/control: workaround missing dependencies of nxagent on Ubuntu for
now.
+ * debian/libnx-xinerama1.*: fix faulty logic when creating symlinks.
+ Backported from Arctica GH 3.6.x branch.
[ Bernard Cafarelli ]
* nx-X11: link to libdl to fix undefined references to 'dlopen' and 'dlsym'.
diff --git a/debian/libnx-xinerama1.postinst.in b/debian/libnx-xinerama1.postinst.in
index c3706038c..6d9ba36ef 100755
--- a/debian/libnx-xinerama1.postinst.in
+++ b/debian/libnx-xinerama1.postinst.in
@@ -28,13 +28,13 @@ case "$1" in
# 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
+ 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/libXext.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
- if test -e $libdir/libNX_Xinerama.so.1; then
+ if ! test -e $libdir/libNX_Xinerama.so.1; then
ln -s $libdir/libNX_Xinerama.so.1 /usr/lib/nx/X11/Xinerama/libXinerama.so.1
fi
;;