diff options
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rwxr-xr-x | debian/libnx-x11.postinst.in (renamed from debian/libnx-x11.postinst) | 8 | ||||
| -rwxr-xr-x | debian/rules | 4 |
3 files changed, 11 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog index 535d008c2..9d4fcfd89 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,10 @@ nx-libs (2:3.5.0.28-0x2go1) UNRELEASED; urgency=medium * Add 025_nxcomp-fix-ftbfs-against-jpeg9a.full+lite.patch. Fix FTBFS when built against libjpeg9a. Thanks to Gabriel Marcano for sending this in. (Fixes: #578). + * debian/libnx-x11.postinst: + + Don't use dpkg-architecture (bin:package dpkg-dev) in postinst script. + Instead prep a libnx-x11.postinst script at build time. (Fixes: + #621). [ Nito Martinez ] * Add 400_nxcomp-version.full+lite.patch. Allow 4-digit version comparison diff --git a/debian/libnx-x11.postinst b/debian/libnx-x11.postinst.in index f5840547d..c690be387 100755 --- a/debian/libnx-x11.postinst +++ b/debian/libnx-x11.postinst.in @@ -23,11 +23,9 @@ case "$1" in ### 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 1>/dev/null 2>/dev/null; then - libdir=/usr/lib/$(dpkg-architecture -qDEB_BUILD_MULTIARCH) - else - libdir=/usr/lib - fi + + libdir=/usr/lib/#DEB_BUILD_MULTIARCH# + 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 diff --git a/debian/rules b/debian/rules index 042061cf5..6e45185e4 100755 --- a/debian/rules +++ b/debian/rules @@ -21,6 +21,7 @@ override_dh_clean: rm -f nx-X11/programs/Xserver/hw/nxagent/changelog rm -f nx-X11/programs/nxauth/changelog rm -Rf replace.sh Makefile bin rgb VERSION.x2goagent etc/keystrokes.cfg + rm -f debian/libnx-x11.postinst dh_clean override_dh_auto_install: @@ -45,6 +46,9 @@ override_dh_auto_build: ln -sf VERSION.x2goagent debian/VERSION ln -sf nxcomp/VERSION debian/VERSION + # let's prep the libnx-x11.postinst script with the value of the build systems's DEB_BUILD_MULTIARCH variable + sed debian/libnx-x11.postinst.in -e 's/#DEB_BUILD_MULTIARCH#/$(DEB_BUILD_MULTIARCH)/' > debian/libnx-x11.postinst + # remove bundled libraries (keep this in sync with roll-tarball.sh) rm -Rf nx-X11/extras/{drm,expat,fontconfig,freetype2,fonts,ogl-sample,regex,rman,ttf2pt1,x86emu,zlib} rm -Rf nx-X11/lib/{expat,fontconfig,fontenc,font/FreeType,font/include/fontenc.h,freetype2,regex,zlib} |