This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit 31e2d532901a136869ab025d8ae2c4f24b05fe1f Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Jul 30 01:23:17 2018 +0200 debian/rules: add support for perl/perl:any substitution variable based upon detected OS version. --- debian/changelog | 6 +++++- debian/rules | 31 +++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index febb305..e498e9b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,10 @@ x2goserver (4.1.0.2-0x2go1) UNRELEASED; urgency=medium - * Continue development + [ Mihai Moldovan ] + * New upstream version (4.1.0.2): + * debian/rules: + + Add support for perl/perl:any substitution variable based upon detected + OS version. -- X2Go Release Manager <git-admin@x2go.org> Fri, 27 Jul 2018 07:06:39 +0200 diff --git a/debian/rules b/debian/rules index 08a8f16..c9527bf 100755 --- a/debian/rules +++ b/debian/rules @@ -1,5 +1,33 @@ #!/usr/bin/make -f +RELEASE_VER = 0 +RELEASE_VER_MAJOR = 0 +RELEASE_VER_MINOR = 0 +SUBSTVARS_LEGACY = -Vdist:Depends="perl" +SUBSTVARS_MULTI_ARCH_HINT = -Vdist:Depends="perl:any" +SUBSTVARS = $(SUBSTVARS_LEGACY) +USE_GTK = 2.0 + +ifeq ($(shell { dpkg-vendor --is Debian && echo yes; } || { dpkg-vendor --is Raspbian && echo yes; }),yes) + RELEASE_VER = $(shell /usr/bin/lsb_release -r | /bin/sed -e 's/[ ]*//g' | /usr/bin/cut -d ':' -f '2' | /usr/bin/cut -d '.' -f '1') +# Let's fake testing's and unstable's "release version"... +ifeq ($(RELEASE_VER),testing) + RELEASE_VER = 999 +endif +ifeq ($(RELEASE_VER),unstable) + RELEASE_VER = 9999 +endif +ifeq ($(shell /bin/bash -c '(( $(RELEASE_VER) >= 8 )) && echo yes'),yes) + SUBSTVARS = $(SUBSTVARS_MULTI_ARCH_HINT) +endif +else ifeq ($(shell dpkg-vendor --is Ubuntu && echo yes),yes) + RELEASE_VER_MAJOR = $(shell /usr/bin/lsb_release -r | /bin/sed -e 's/[ ]*//g' | /usr/bin/cut -d ':' -f '2' | /usr/bin/cut -d '.' -f '1') + RELEASE_VER_MINOR = $(shell /usr/bin/lsb_release -r | /bin/sed -e 's/[ ]*//g' | /usr/bin/cut -d ':' -f '2' | /usr/bin/cut -d '.' -f '2') +ifeq ($(shell /bin/bash -c '(( $(RELEASE_VER_MAJOR) >= 16 )) && echo yes'),yes) + SUBSTVARS = $(SUBSTVARS_MULTI_ARCH_HINT) +endif +endif + export NXLIBDIR="/usr/lib/$(shell dpkg-architecture -qDEB_HOST_MULTIARCH)/nx" export DEB_BUILD_MAINT_OPTIONS = hardening=+all @@ -29,3 +57,6 @@ override_dh_auto_clean: rm -f Makefile.perl.old PREFIX=/usr NXLIBDIR=$(NXLIBDIR) dh_auto_clean rm -f Makefile.perl + +override_dh_gencontrol: + dh_gencontrol -- $(SUBSTVARS) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git