This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository nx-libs. from 3027f50 Enforce symlink creation for Xinerama et al. library symlinks. new d35a362 Xinerama symlinking: Attach Xinerama symlinking to nxagent bin:package (and not libnx-xinerama1). The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 3 +++ ...x-xinerama1.postinst.in => nxagent.postinst.in} | 2 +- debian/{libnx-xinerama1.prerm => nxagent.prerm} | 2 +- debian/rules | 6 +++--- nx-libs.spec | 8 ++++---- 5 files changed, 12 insertions(+), 9 deletions(-) rename debian/{libnx-xinerama1.postinst.in => nxagent.postinst.in} (98%) rename debian/{libnx-xinerama1.prerm => nxagent.prerm} (97%) -- Alioth's /srv/git/code.x2go.org/nx-libs.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository nx-libs. commit d35a3622dd57f18cfa94051302a694cbc506d982 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Sep 28 08:15:52 2015 +0200 Xinerama symlinking: Attach Xinerama symlinking to nxagent bin:package (and not libnx-xinerama1). Backported from Arctica GH 3.6.x branch. --- debian/changelog | 3 +++ ...x-xinerama1.postinst.in => nxagent.postinst.in} | 2 +- debian/{libnx-xinerama1.prerm => nxagent.prerm} | 2 +- debian/rules | 6 +++--- nx-libs.spec | 8 ++++---- 5 files changed, 12 insertions(+), 9 deletions(-) diff --git a/debian/changelog b/debian/changelog index c8ab3df..efb0200 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 <git-admin@x2go.org> Sat, 04 Jul 2015 06:29:19 +0200 diff --git a/debian/libnx-xinerama1.postinst.in b/debian/nxagent.postinst.in similarity index 98% rename from debian/libnx-xinerama1.postinst.in rename to debian/nxagent.postinst.in index 38cc415..4ad52a5 100755 --- a/debian/libnx-xinerama1.postinst.in +++ b/debian/nxagent.postinst.in @@ -1,5 +1,5 @@ #!/bin/sh -# postinst script for libnx-x11 +# postinst script for nxagent # # see: dh_installdeb(1) diff --git a/debian/libnx-xinerama1.prerm b/debian/nxagent.prerm similarity index 97% rename from debian/libnx-xinerama1.prerm rename to debian/nxagent.prerm index 8cca06c..edc882a 100755 --- a/debian/libnx-xinerama1.prerm +++ b/debian/nxagent.prerm @@ -1,5 +1,5 @@ #!/bin/sh -# prerm script for libnx-xinerama1 +# prerm script for nxagent # # see: dh_installdeb(1) # summary of how this script can be called: diff --git a/debian/rules b/debian/rules index 6a82c67..2cd77b3 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 c71a181..0fda993 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) -- Alioth's /srv/git/code.x2go.org/nx-libs.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
-
git-admin＠x2go.org