Skip to content

N
nx-libs
Commit 4f7c8d07 authored by Mike Gabriel's avatar Mike Gabriel
Browse files
Options

Re-introduce proper Xinerama support on non-multiarch systems.

parent 95929b8a
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 2 deletions
debian/changelog
View file @ 4f7c8d07
...@@ -6,6 +6,7 @@ nx-libs (2:3.5.0.12-0) UNRELEASED; urgency=low ...@@ -6,6 +6,7 @@ nx-libs (2:3.5.0.12-0) UNRELEASED; urgency=low
Fixes build failure during ,,make distclean'' calls. Fixes build failure during ,,make distclean'' calls.
* Provide temporary workaround for installation on Debian 64bit with * Provide temporary workaround for installation on Debian 64bit with
multiarch support (via libnx-x11.postinst and .prerm). multiarch support (via libnx-x11.postinst and .prerm).
* Re-introduce proper Xinerama support on non-multiarch systems.
[ Mihai Moldovan ] [ Mihai Moldovan ]
* Add patch: 051_nxcomp_macos105-fdisset.full+lite.patch, work around * Add patch: 051_nxcomp_macos105-fdisset.full+lite.patch, work around
......
debian/libnx-x11.postinst
View file @ 4f7c8d07
...@@ -24,16 +24,18 @@ case "$1" in ...@@ -24,16 +24,18 @@ case "$1" in
### multiarch support into the Debian source package of ### multiarch support into the Debian source package of
### nx-libs. ### nx-libs.
if dpkg-architecture -qDEB_BUILD_MULTIARCH 1>/dev/null 2>/dev/null; then if dpkg-architecture -qDEB_BUILD_MULTIARCH 1>/dev/null 2>/dev/null; then
libdir=/usr/lib/$(dpkg-architecture -qDEB_BUILD_MULTIARCH)
else
libdir=/usr/lib
fi
rm -f /usr/lib/nx/X11/Xinerama/libNX_X11.so.6 rm -f /usr/lib/nx/X11/Xinerama/libNX_X11.so.6
rm -f /usr/lib/nx/X11/Xinerama/libNX_Xext.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 if test -e $libdir/libX11.so.6; then
ln -s $libdir/libX11.so.6 /usr/lib/nx/X11/Xinerama/libNX_X11.so.6 ln -s $libdir/libX11.so.6 /usr/lib/nx/X11/Xinerama/libNX_X11.so.6
fi 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 ln -s $libdir/libXext.so.6 /usr/lib/nx/X11/Xinerama/libNX_Xext.so.6
fi fi
fi
;; ;;
abort-upgrade|abort-remove|abort-deconfigure) abort-upgrade|abort-remove|abort-deconfigure)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment