This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goserver. from d35e1973 Continue development new c2868ae3 debian/control: replace dependency upon x2goserver-x2gokdrive with substitution variable ${kdrive:Depends}. new 9697ad04 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). The 2 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 | 10 +++++++++- debian/control | 3 +-- debian/rules | 24 ++++++++++++++++++------ 3 files changed, 28 insertions(+), 9 deletions(-) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit c2868ae3b8163fff26e1c629d6c4c6598d9656bf Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Jul 3 01:22:48 2023 +0200 debian/control: replace dependency upon x2goserver-x2gokdrive with substitution variable ${kdrive:Depends}. --- debian/changelog | 6 +++++- debian/control | 3 +-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index c0008d7d..e1693060 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,10 @@ x2goserver (4.1.0.6-0x2go1) UNRELEASED; urgency=medium - * Continue development + [ Mihai Moldovan ] + * New upstream version (4.1.0.6): + * debian/control: + + Replace dependency upon x2goserver-x2gokdrive with substitution + variable ${kdrive:Depends}. -- X2Go Release Manager <git-admin@x2go.org> Tue, 06 Jun 2023 19:32:34 +0200 diff --git a/debian/control b/debian/control index 40c63bb0..726a4885 100644 --- a/debian/control +++ b/debian/control @@ -42,8 +42,7 @@ Depends: x2goserver-common (>= ${source:Version}), x2goserver-x2goagent (<< ${source:Version}.1~), x2goserver-x2goagent (>= ${source:Version}), - x2goserver-x2gokdrive (<< ${source:Version}.1~), - x2goserver-x2gokdrive (>= ${source:Version}), + ${kdrive:Depends} xauth, xkb-data, ${misc:Depends}, -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
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
-
git-admin＠x2go.org