This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit 9697ad04999e08e66c36919e09f828d0a399776a Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Jul 3 01:23:30 2023 +0200 debian/rules: switch between the "actual" dependency upon x2goserver-x2gokdrive and an empty string based upon the Debian (>= 9/stretch) or Ubuntu version (>= 20.04/focal). --- debian/changelog | 4 ++++ debian/rules | 24 ++++++++++++++++++------ 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index e1693060..364b421a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,10 @@ x2goserver (4.1.0.6-0x2go1) UNRELEASED; urgency=medium * debian/control: + Replace dependency upon x2goserver-x2gokdrive with substitution variable ${kdrive:Depends}. + * debian/rules: + + Switch between the "actual" dependency upon x2goserver-x2gokdrive and an + empty string based upon the Debian (>= 9/stretch) or Ubuntu version (>= + 20.04/focal). -- X2Go Release Manager <git-admin@x2go.org> Tue, 06 Jun 2023 19:32:34 +0200 diff --git a/debian/rules b/debian/rules index 1ed48256..9fcaf937 100755 --- a/debian/rules +++ b/debian/rules @@ -3,9 +3,13 @@ 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) +PERL_DEP_LEGACY = -Vdist:Depends="perl" +PERL_DEP_MULTI_ARCH_HINT = -Vdist:Depends="perl:any" +PERL_DEP = $(PERL_DEP_LEGACY) +KDRIVE_DEP_REAL = -Vkdrive:Depends="x2goserver-x2gokdrive (<< $${source:Version}.1~), x2goserver-x2gokdrive (>= $${source:Version})," +KDRIVE_DEP_FAKE = -Vkdrive:Depends="" +KDRIVE_DEP = $(KDRIVE_DEP_FAKE) +SUBSTVARS = $(PERL_DEP) $(KDRIVE_DEP) # Setting these disables autodetection. FORCE_VENDOR ?= @@ -69,7 +73,10 @@ endif # Actual version switch. ifeq ($(VENDOR_DEBIAN),yes) ifeq ($(shell /bin/bash -c '(( $(RELEASE_VER) >= 8 )) && echo '"'"'yes'"'"),yes) - SUBSTVARS = $(SUBSTVARS_MULTI_ARCH_HINT) + PERL_DEP = $(PERL_DEP_MULTI_ARCH_HINT) + endif + ifeq ($(shell /bin/bash -c '(( $(RELEASE_VER) >= 9 )) && echo '"'"'yes'"'"),yes) + KDRIVE_DEP = $(KDRIVE_DEP_REAL) endif else ifeq ($(VENDOR_UBUNTU),yes) @@ -77,15 +84,20 @@ else # this as the transition happened on a major version. #ifeq ($(shell /bin/bash -c '(( $(RELEASE_VER_MAJOR) == 16 )) && echo '"'"'yes'"'"),yes) #ifeq ($(shell /bin/bash -c '(( $(RELEASE_VER_MINOR) >= 4 )) && echo '"'"'yes'"'"),yes) - #SUBSTVARS = $(SUBSTVARS_MULTI_ARCH_HINT) + #PERL_DEP = $(PERL_DEP_MULTI_ARCH_HINT) #endif #endif ifeq ($(shell /bin/bash -c '(( $(RELEASE_VER_MAJOR) >= 16 )) && echo '"'"'yes'"'"),yes) - SUBSTVARS = $(SUBSTVARS_MULTI_ARCH_HINT) + PERL_DEP = $(PERL_DEP_MULTI_ARCH_HINT) + endif + ifeq ($(shell /bin/bash -c '(( $(RELEASE_VER_MAJOR) >= 20 )) && echo '"'"'yes'"'"),yes) + KDRIVE_DEP = $(KDRIVE_DEP_REAL) endif endif endif +SUBSTVARS = $(PERL_DEP) $(KDRIVE_DEP) + export NXLIBDIR='/usr/lib/$(shell dpkg-architecture -qDEB_HOST_MULTIARCH)/nx' export LIBDIR='/usr/lib/x2go' -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git