diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2012-03-01 21:12:54 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2012-03-01 21:12:54 +0100 |
| commit | a71cebf0418d1d2c4fbc1012957bf1f1b54742cc (patch) | |
| tree | f49d87707d2e62950f561f5e06a7782527a18d28 /debian | |
| parent | 22d41ae20a02f10f7dd4245e426c0a007d42710c (diff) | |
| download | nx-libs-a71cebf0418d1d2c4fbc1012957bf1f1b54742cc.tar.gz nx-libs-a71cebf0418d1d2c4fbc1012957bf1f1b54742cc.tar.bz2 nx-libs-a71cebf0418d1d2c4fbc1012957bf1f1b54742cc.zip | |
Provide temporary workaround for installation on Debian 64bit with multiarch support.
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | debian/libnx-x11.links | 2 | ||||
| -rwxr-xr-x | debian/libnx-x11.postinst | 53 | ||||
| -rwxr-xr-x | debian/post-build-nx.sh | 2 |
4 files changed, 55 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog index a1676371b..68d40120e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ nx-libs (2:3.5.0.12-0) UNRELEASED; urgency=low * Update patch: 001_add-main-makefile.full+lite.patch, adapt patch from packaging. Test for Makefiles in subfolders before calling them. Fixes build failure during ,,make distclean'' calls. + * Provide temporary workaround for installation on Debian 64bit with + multiarch support. [ Mihai Moldovan ] * Add patch: 051_nxcomp_macos105-fdisset.full+lite.patch, work around diff --git a/debian/libnx-x11.links b/debian/libnx-x11.links index 82c245fdb..7331e79e6 100644 --- a/debian/libnx-x11.links +++ b/debian/libnx-x11.links @@ -1,4 +1,2 @@ -usr/lib/libX11.so.6 usr/lib/nx/X11/Xinerama/libNX_X11.so.6 -usr/lib/libXext.so.6 usr/lib/nx/X11/Xinerama/libNX_Xext.so.6 usr/lib/nx/X11/libNX_Xinerama.so usr/lib/nx/X11/Xinerama/libXinerama.so usr/lib/nx/X11/libNX_Xinerama.so.1 usr/lib/nx/X11/Xinerama/libXinerama.so.1 diff --git a/debian/libnx-x11.postinst b/debian/libnx-x11.postinst new file mode 100755 index 000000000..263024fa4 --- /dev/null +++ b/debian/libnx-x11.postinst @@ -0,0 +1,53 @@ +#!/bin/sh +# postinst script for libnx-x11 +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * <postinst> `configure' <most-recently-configured-version> +# * <old-postinst> `abort-upgrade' <new version> +# * <conflictor's-postinst> `abort-remove' `in-favour' <package> +# <new-version> +# * <postinst> `abort-remove' +# * <deconfigured's-postinst> `abort-deconfigure' `in-favour' +# <failed-install-package> <version> `removing' +# <conflicting-package> <version> +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + + +case "$1" in + configure) + ### FIXME: this is a work-around while we have not implemented + ### multiarch support into the Debian source package of + ### nx-libs. + if dpkg-architecture -qDEB_BUILD_MULTIARCH &>/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/libNX_Xext.so.6; then + ln -s $libdir/libXext.so.6 /usr/lib/nx/X11/Xinerama/libNX_Xext.so.6 + fi + fi + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 diff --git a/debian/post-build-nx.sh b/debian/post-build-nx.sh index 2d1f8d27e..94f18ac3c 100755 --- a/debian/post-build-nx.sh +++ b/debian/post-build-nx.sh @@ -20,8 +20,6 @@ find nx-X11/exports/lib/ | egrep "^.*\.so$" | while read libpath; do find $libdir/$libfile.* | while read symlink; do ln -s $libfile ${libdir//exports/.build-exports}/$(basename $symlink) done - - done exit 0 |