From 4f7c8d079014b28204f6733a4e11708be012b215 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Thu, 1 Mar 2012 22:31:35 +0100 Subject: Re-introduce proper Xinerama support on non-multiarch systems. --- debian/changelog | 1 + debian/libnx-x11.postinst | 18 ++++++++++-------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index f11eef9b0..9660afd0e 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 514833ca5..f5840547d 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 ;; -- cgit v1.2.3