diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2012-03-01 22:31:35 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2012-03-01 22:31:35 +0100 |
| commit | 4f7c8d079014b28204f6733a4e11708be012b215 (patch) | |
| tree | 1568adadb4a6247d438ee678b6221b67154665df | |
| parent | 95929b8a50ce2ea07c1a0784b58a94fb0b23e36a (diff) | |
| download | nx-libs-4f7c8d079014b28204f6733a4e11708be012b215.tar.gz nx-libs-4f7c8d079014b28204f6733a4e11708be012b215.tar.bz2 nx-libs-4f7c8d079014b28204f6733a4e11708be012b215.zip | |
Re-introduce proper Xinerama support on non-multiarch systems.
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rwxr-xr-x | 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 ;; |