This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit 4486b5c0dc029e6198ee634ad0fe2d426e559759 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Jul 4 14:29:41 2016 +0200 Revisit packaging for latest change in x2goserver-x2goagent. Don't inject $(LIBDIR) rather than injecting $(NXLIBDIR) via debian/rules and x2goserver.spec. --- Makefile | 1 + debian/changelog | 3 +++ debian/rules | 10 +++++----- x2goserver-x2goagent/Makefile | 4 ++-- x2goserver.spec | 4 ++-- 5 files changed, 13 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 07408f8..31ad093 100755 --- a/Makefile +++ b/Makefile @@ -6,6 +6,7 @@ RM_DIR=rmdir -p --ignore-fail-on-non-empty DESTDIR ?= PREFIX ?= /usr/local ETCDIR=/etc/x2go +LIBDIR ?= $(PREFIX)/lib/x2go SHAREDIR=$(PREFIX)/share/x2go PERL ?= /usr/bin/perl diff --git a/debian/changelog b/debian/changelog index 5d65e28..d1b5b81 100644 --- a/debian/changelog +++ b/debian/changelog @@ -73,6 +73,9 @@ x2goserver (4.1.0.0-0x2go1.1) UNRELEASED; urgency=low sets the env var $NXAPP and then calls the nxagent wrapper script. For this to work properly, the x2goagent symlinks has to be placed into directory where the nxagent executable is installed ($LIBDIR/nx/bin/, normally). + - Revisit packaging for latest change in x2goserver-x2goagent. Don't inject + $(LIBDIR) rather than injecting $(NXLIBDIR) via debian/rules and + x2goserver.spec. * debian/control: + Package X2Go::Log in separate package: libx2go-log-perl. + Package X2Go::Server::DB in separate package: libx2go-server-db-perl. diff --git a/debian/rules b/debian/rules index f5fff6f..5cd21e5 100755 --- a/debian/rules +++ b/debian/rules @@ -1,17 +1,17 @@ #!/usr/bin/make -f -export LIBDIR="/usr/lib/$(shell dpkg-architecture -qDEB_HOST_MULTIARCH)" +export NXLIBDIR="/usr/lib/$(shell dpkg-architecture -qDEB_HOST_MULTIARCH)/nx" %: - PREFIX=/usr LIBDIR=$(LIBDIR) dh $@ + PREFIX=/usr NXLIBDIR=$(NXLIBDIR) dh $@ override_dh_auto_build: - PREFIX=/usr LIBDIR=$(LIBDIR) PERL_INSTALLDIRS=vendor dh_auto_build + PREFIX=/usr NXLIBDIR=$(NXLIBDIR) PERL_INSTALLDIRS=vendor dh_auto_build override_dh_auto_install: if [ -f ChangeLog.gitlog ]; then cp ChangeLog.gitlog ChangeLog; fi $(MAKE) -f Makefile build-arch - PREFIX=/usr LIBDIR=$(LIBDIR) dh_auto_install + PREFIX=/usr NXLIBDIR=$(NXLIBDIR) dh_auto_install override_dh_auto_clean: rm -f ChangeLog @@ -20,5 +20,5 @@ override_dh_auto_clean: rm -f ChangeLog.gitlog rm -f MYMETA.yml rm -f Makefile.perl.old - PREFIX=/usr LIBDIR=$(LIBDIR) dh_auto_clean + PREFIX=/usr NXLIBDIR=$(NXLIBDIR) dh_auto_clean rm -f Makefile.perl diff --git a/x2goserver-x2goagent/Makefile b/x2goserver-x2goagent/Makefile index 1a46943..f29e2ca 100755 --- a/x2goserver-x2goagent/Makefile +++ b/x2goserver-x2goagent/Makefile @@ -15,8 +15,8 @@ DESTDIR ?= PREFIX ?= /usr/local ETCDIR=/etc/x2go BINDIR=$(PREFIX)/bin -LIBDIR ?= $(PREFIX)/lib -NXLIBDIR=$(LIBDIR)/nx +LIBDIR=$(PREFIX)/lib/x2go +NXLIBDIR ?= $(LIBDIR)/../nx MANDIR=$(PREFIX)/share/man SHAREDIR=$(PREFIX)/share/x2go diff --git a/x2goserver.spec b/x2goserver.spec index 8e5dab0..51ffeae 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -485,11 +485,11 @@ sed -i -e 's/-o root -g root//' */Makefile %build export PATH=%{_qt4_bindir}:$PATH -make CFLAGS="%{optflags} -fPIC" %{?_smp_mflags} PERL_INSTALLDIRS=vendor PREFIX=%{_prefix} LIBDIR=%{_libdir} +make CFLAGS="%{optflags} -fPIC" %{?_smp_mflags} PERL_INSTALLDIRS=vendor PREFIX=%{_prefix} NXLIBDIR=%{_prefix}%{_lib}/nx %install -make install DESTDIR=%{buildroot} PREFIX=%{_prefix} LIBDIR=%{_libdir} +make install DESTDIR=%{buildroot} PREFIX=%{_prefix} NXLIBDIR=%{_prefix}/%{_lib}/nx # We currently need to disable the broken symlinks check on OpenSuSE, as long # as we can't pull in nx-libs 3.5.99 or higher. Once we can add it as a BuildRequires, # this env var can and should be removed again. -- Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git