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 021050f nx-libs.spec: add xkeyboard-config to nxagent's Requires. new 449eae1 Revert "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 | 5 +++++ debian/libnx-xinerama1.postinst.in | 6 +++--- 2 files changed, 8 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 449eae1be9ee948872fd35f3a6629b714ceec496 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Sep 22 15:09:27 2015 +0200 Revert "debian/libnx-xinerama1.*: fix faulty logic when creating symlinks." This reverts commit 5a9f8294ce2f9c4265c5359323d7ad157974d016. Conflicts (resolved by Mike Gabriel): debian/changelog --- debian/changelog | 5 +++++ debian/libnx-xinerama1.postinst.in | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2201acc..9ca34cc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,11 @@ nx-libs (2:3.5.0.33-0x2go1) UNRELEASED; urgency=low - Add xkeyboard-config to nxagent's Requires. Should be a weak dependency, but RPM doesn't support that too well yet. + [ Mike Gabriel ] + * debian/libxinerama1.postinst.in: + + Revert 5a9f829. Make sure libnx-Xinerama1 based Xinerama works + again with X2Go on Debian based systems. + -- X2Go Release Manager <git-admin@x2go.org> Sat, 04 Jul 2015 06:29:19 +0200 nx-libs (2:3.5.0.32-0x2go1) unstable; urgency=low diff --git a/debian/libnx-xinerama1.postinst.in b/debian/libnx-xinerama1.postinst.in index 6d9ba36..c370603 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
-
git-admin＠x2go.org