From 5a82f59941e6b6a35cbd02e3e42b2b0c32d1a0c9 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Thu, 2 Oct 2014 11:53:47 +0200 Subject: 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). --- debian/changelog | 4 ++++ debian/libnx-x11.postinst | 55 -------------------------------------------- debian/libnx-x11.postinst.in | 53 ++++++++++++++++++++++++++++++++++++++++++ debian/rules | 4 ++++ 4 files changed, 61 insertions(+), 55 deletions(-) delete mode 100755 debian/libnx-x11.postinst create mode 100755 debian/libnx-x11.postinst.in (limited to 'debian') 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 deleted file mode 100755 index f5840547d..000000000 --- a/debian/libnx-x11.postinst +++ /dev/null @@ -1,55 +0,0 @@ -#!/bin/sh -# postinst script for libnx-x11 -# -# see: dh_installdeb(1) - -set -e - -# summary of how this script can be called: -# * `configure' -# * `abort-upgrade' -# * `abort-remove' `in-favour' -# -# * `abort-remove' -# * `abort-deconfigure' `in-favour' -# `removing' -# -# 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 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_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 - ;; - - 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/libnx-x11.postinst.in b/debian/libnx-x11.postinst.in new file mode 100755 index 000000000..c690be387 --- /dev/null +++ b/debian/libnx-x11.postinst.in @@ -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: +# * `configure' +# * `abort-upgrade' +# * `abort-remove' `in-favour' +# +# * `abort-remove' +# * `abort-deconfigure' `in-favour' +# `removing' +# +# 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. + + 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 + 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 + ;; + + 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/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} -- cgit v1.2.3