[X2Go-Commits] nx-libs.git - build-main (branch) updated: redist-client/3.5.0.11-13-g4f7c8d0
X2Go dev team
git-admin at x2go.org
Fri Aug 30 16:23:31 CEST 2013
The branch, build-main has been updated
via 4f7c8d079014b28204f6733a4e11708be012b215 (commit)
from 95929b8a50ce2ea07c1a0784b58a94fb0b23e36a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 1 +
debian/libnx-x11.postinst | 18 ++++++++++--------
2 files changed, 11 insertions(+), 8 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index f11eef9..9660afd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ nx-libs (2:3.5.0.12-0) UNRELEASED; urgency=low
Fixes build failure during ,,make distclean'' calls.
* Provide temporary workaround for installation on Debian 64bit with
multiarch support (via libnx-x11.postinst and .prerm).
+ * Re-introduce proper Xinerama support on non-multiarch systems.
[ Mihai Moldovan ]
* Add patch: 051_nxcomp_macos105-fdisset.full+lite.patch, work around
diff --git a/debian/libnx-x11.postinst b/debian/libnx-x11.postinst
index 514833c..f584054 100755
--- a/debian/libnx-x11.postinst
+++ b/debian/libnx-x11.postinst
@@ -24,15 +24,17 @@ case "$1" in
### multiarch support into the Debian source package of
### nx-libs.
if dpkg-architecture -qDEB_BUILD_MULTIARCH 1>/dev/null 2>/dev/null; then
- rm -f /usr/lib/nx/X11/Xinerama/libNX_X11.so.6
- rm -f /usr/lib/nx/X11/Xinerama/libNX_Xext.so.6
libdir=/usr/lib/$(dpkg-architecture -qDEB_BUILD_MULTIARCH)
- 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
- ln -s $libdir/libXext.so.6 /usr/lib/nx/X11/Xinerama/libNX_Xext.so.6
- fi
+ else
+ libdir=/usr/lib
+ fi
+ rm -f /usr/lib/nx/X11/Xinerama/libNX_X11.so.6
+ rm -f /usr/lib/nx/X11/Xinerama/libNX_Xext.so.6
+ 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
+ ln -s $libdir/libXext.so.6 /usr/lib/nx/X11/Xinerama/libNX_Xext.so.6
fi
;;
hooks/post-receive
--
nx-libs.git (NX (redistributed))
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "nx-libs.git" (NX (redistributed)).
More information about the x2go-commits
mailing list