This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch 3.5.0.x in repository nx-libs. from 5f2a5ac debian/control: workaround missing dependencies of nxagent on Ubuntu for now. new 5a9f829 debian/libnx-xinerama1.*: fix faulty logic when creating symlinks. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 2 ++ debian/libnx-xinerama1.postinst.in | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) -- Alioth's /srv/git/code.x2go.org/nx-libs.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
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 5a9f8294ce2f9c4265c5359323d7ad157974d016 Author: Mihai Moldovan <ionic@ionic.de> Date: Tue May 5 01:23:50 2015 +0200 debian/libnx-xinerama1.*: fix faulty logic when creating symlinks. Backported from Arctica GH 3.6.x branch. --- debian/changelog | 2 ++ debian/libnx-xinerama1.postinst.in | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 32201c4..e1b14ce 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 c370603..6d9ba36 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 ;; -- Alioth's /srv/git/code.x2go.org/nx-libs.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git