From d35a3622dd57f18cfa94051302a694cbc506d982 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 28 Sep 2015 08:15:52 +0200 Subject: Xinerama symlinking: Attach Xinerama symlinking to nxagent bin:package (and not libnx-xinerama1). Backported from Arctica GH 3.6.x branch. --- debian/changelog | 3 ++ debian/libnx-xinerama1.postinst.in | 56 -------------------------------------- debian/libnx-xinerama1.prerm | 51 ---------------------------------- debian/nxagent.postinst.in | 56 ++++++++++++++++++++++++++++++++++++++ debian/nxagent.prerm | 51 ++++++++++++++++++++++++++++++++++ debian/rules | 6 ++-- nx-libs.spec | 8 +++--- 7 files changed, 117 insertions(+), 114 deletions(-) delete mode 100755 debian/libnx-xinerama1.postinst.in delete mode 100755 debian/libnx-xinerama1.prerm create mode 100755 debian/nxagent.postinst.in create mode 100755 debian/nxagent.prerm diff --git a/debian/changelog b/debian/changelog index c8ab3df60..efb0200da 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,9 @@ nx-libs (2:3.5.0.33-0x2go1) UNRELEASED; urgency=low + Revert 5a9f829. Make sure libnx-Xinerama1 based Xinerama works again with X2Go on Debian based systems. + Enforce symlink creation for Xinerama et al. library symlinks. + * Xinerama symlinking: Attach Xinerama symlinking to nxagent bin:package (and + not libnx-xinerama1). + Backported from Arctica GH 3.6.x branch. -- X2Go Release Manager Sat, 04 Jul 2015 06:29:19 +0200 diff --git a/debian/libnx-xinerama1.postinst.in b/debian/libnx-xinerama1.postinst.in deleted file mode 100755 index 38cc415f4..000000000 --- a/debian/libnx-xinerama1.postinst.in +++ /dev/null @@ -1,56 +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. - - libdir=/usr/lib/#DEB_BUILD_MULTIARCH# - - # Already existent files are not removed. - # Users will need to explicitly remove them and (re-) configure this package. - if test -e $libdir/libX11.so.6; then - ln -sf $libdir/libX11.so.6 /usr/lib/nx/X11/Xinerama/libNX_X11.so.6 - fi - if test -e $libdir/libXext.so.6; then - ln -sf $libdir/libXext.so.6 /usr/lib/nx/X11/Xinerama/libNX_Xext.so.6 - fi - if test -e $libdir/libNX_Xinerama.so.1; then - ln -sf $libdir/libNX_Xinerama.so.1 /usr/lib/nx/X11/Xinerama/libXinerama.so.1 - 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-xinerama1.prerm b/debian/libnx-xinerama1.prerm deleted file mode 100755 index 8cca06c85..000000000 --- a/debian/libnx-xinerama1.prerm +++ /dev/null @@ -1,51 +0,0 @@ -#!/bin/sh -# prerm script for libnx-xinerama1 -# -# see: dh_installdeb(1) -# summary of how this script can be called: -# * `remove' -# * `upgrade' -# * `failed-upgrade' -# * `remove' `in-favour' -# * `deconfigure' `in-favour' -# `removing' -# -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package - -set -e - - - -case "$1" in - remove) - if test -d /usr/lib/nx/X11/Xinerama; then - if test -e /usr/lib/nx/X11/Xinerama/libNX_X11.so.6; then - rm -f /usr/lib/nx/X11/Xinerama/libNX_X11.so.6 - fi - - if test -e /usr/lib/nx/X11/Xinerama/libNX_Xext.so.6; then - rm -f /usr/lib/nx/X11/Xinerama/libNX_Xext.so.6 - fi - - - if test -e /usr/lib/nx/X11/Xinerama/libXinerama.so.1; then - rm -f /usr/lib/nx/X11/Xinerama/libXinerama.so.1 - fi - fi - ;; - deconfigure|upgrade|failed-upgrade) - : - ;; - *) - echo "prerm 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/nxagent.postinst.in b/debian/nxagent.postinst.in new file mode 100755 index 000000000..4ad52a525 --- /dev/null +++ b/debian/nxagent.postinst.in @@ -0,0 +1,56 @@ +#!/bin/sh +# postinst script for nxagent +# +# 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# + + # Already existent files are not removed. + # Users will need to explicitly remove them and (re-) configure this package. + if test -e $libdir/libX11.so.6; then + ln -sf $libdir/libX11.so.6 /usr/lib/nx/X11/Xinerama/libNX_X11.so.6 + fi + if test -e $libdir/libXext.so.6; then + ln -sf $libdir/libXext.so.6 /usr/lib/nx/X11/Xinerama/libNX_Xext.so.6 + fi + if test -e $libdir/libNX_Xinerama.so.1; then + ln -sf $libdir/libNX_Xinerama.so.1 /usr/lib/nx/X11/Xinerama/libXinerama.so.1 + 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/nxagent.prerm b/debian/nxagent.prerm new file mode 100755 index 000000000..edc882a46 --- /dev/null +++ b/debian/nxagent.prerm @@ -0,0 +1,51 @@ +#!/bin/sh +# prerm script for nxagent +# +# see: dh_installdeb(1) +# summary of how this script can be called: +# * `remove' +# * `upgrade' +# * `failed-upgrade' +# * `remove' `in-favour' +# * `deconfigure' `in-favour' +# `removing' +# +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + +set -e + + + +case "$1" in + remove) + if test -d /usr/lib/nx/X11/Xinerama; then + if test -e /usr/lib/nx/X11/Xinerama/libNX_X11.so.6; then + rm -f /usr/lib/nx/X11/Xinerama/libNX_X11.so.6 + fi + + if test -e /usr/lib/nx/X11/Xinerama/libNX_Xext.so.6; then + rm -f /usr/lib/nx/X11/Xinerama/libNX_Xext.so.6 + fi + + + if test -e /usr/lib/nx/X11/Xinerama/libXinerama.so.1; then + rm -f /usr/lib/nx/X11/Xinerama/libXinerama.so.1 + fi + fi + ;; + deconfigure|upgrade|failed-upgrade) + : + ;; + *) + echo "prerm 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 6a82c674d..2cd77b383 100755 --- a/debian/rules +++ b/debian/rules @@ -34,7 +34,7 @@ override_dh_clean: if [ ! -f replace.sh ] && [ ! -h replace.sh ]; then ln -s debian/Makefile.replace.sh replace.sh; fi . ./replace.sh; set -x; ls debian/*.install.in | while read file; do rm -f $$(string_rep $$file .install.in .install); done rm -fR replace.sh Makefile bin etc/rgb VERSION.x2goagent etc/keystrokes.cfg etc/nxagent.keyboard etc/x2goagent.keyboard - rm -f debian/libnx-xinerama1.postinst + rm -f debian/nxagent.postinst rm -fR .preserve/ if [ -f nxcomp/.VERSION.NoMachine ]; then mv nxcomp/.VERSION.NoMachine nxcomp/VERSION; fi dh_clean @@ -119,8 +119,8 @@ override_dh_auto_build: ln -sf debian/VERSION VERSION.x2goagent ln -sf ../debian/VERSION nxcomp/VERSION - # let's prep the libnx-xinerama1.postinst script with the value of the build systems's DEB_BUILD_MULTIARCH variable - sed debian/libnx-xinerama1.postinst.in -e 's/#DEB_BUILD_MULTIARCH#/$(DEB_BUILD_MULTIARCH)/' > debian/libnx-xinerama1.postinst + # let's prep the nxagent.postinst script with the value of the build systems's DEB_BUILD_MULTIARCH variable + sed debian/nxagent.postinst.in -e 's/#DEB_BUILD_MULTIARCH#/$(DEB_BUILD_MULTIARCH)/' > debian/nxagent.postinst # make a copy of code to be preserved for build mkdir -p .preserve diff --git a/nx-libs.spec b/nx-libs.spec index c71a18107..0fda99332 100644 --- a/nx-libs.spec +++ b/nx-libs.spec @@ -819,10 +819,6 @@ ln -s -f ../../../../%{_lib}/libNX_Xinerama.so.1 %{buildroot}%{_libdir}/nx/X11/X %dir %{_libdir}/nx/X11 %dir %{_datadir}/nx %{_datadir}/nx/SecurityPolicy -%dir %{_libdir}/nx/X11/Xinerama/ -%{_libdir}/nx/X11/Xinerama/libNX_X11.so.6 -%{_libdir}/nx/X11/Xinerama/libNX_Xext.so.6 -%{_libdir}/nx/X11/Xinerama/libXinerama.so.1* %files -n libNX_X11-6 %defattr(-,root,root) @@ -1121,6 +1117,10 @@ ln -s -f ../../../../%{_lib}/libNX_Xinerama.so.1 %{buildroot}%{_libdir}/nx/X11/X %{_datadir}/pixmaps/nxagent.xpm %{_datadir}/nx/rgb %{_datadir}/man/man1/nxagent.1* +%dir %{_libdir}/nx/X11/Xinerama/ +%{_libdir}/nx/X11/Xinerama/libNX_X11.so.6 +%{_libdir}/nx/X11/Xinerama/libNX_Xext.so.6 +%{_libdir}/nx/X11/Xinerama/libXinerama.so.1* %files -n nxauth %defattr(-,root,root) -- cgit v1.2.3