This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goclient. from 7c91b92 debian/control.in: add build-dependency upon m4, needed by our preprocessing shell script. new d532f77 Makefile: support version switching through a QT_VERSION variable - might be overridden via environment variables or the make call. new 3963b76 debian/rules: assign default values to the FORCE_{VENDOR,RELEASE_VER} variables - thus allowing passed-in values through the environment. new f1082e3 Utilize new version switching in main Makefile by overriding the QT_VERSION make variable. The 3 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: Makefile | 17 +++++++++++++++-- debian/changelog | 6 ++++++ debian/rules | 7 +++++-- 3 files changed, 26 insertions(+), 4 deletions(-) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit d532f77f0c5cdbaf67f477e408ce177db21824ea Author: Mihai Moldovan <ionic@ionic.de> Date: Wed May 12 22:17:14 2021 +0200 Makefile: support version switching through a QT_VERSION variable - might be overridden via environment variables or the make call. --- Makefile | 17 +++++++++++++++-- debian/changelog | 2 ++ 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 0654f1d..bac0109 100755 --- a/Makefile +++ b/Makefile @@ -6,6 +6,10 @@ CLIENT_BINARY=$(CLIENT_DIR)/x2goclient SHELL=/bin/bash +# Default to Qt 4. +# We'll change this to Qt 5 as soon as Qt-4-based platforms go EOL. +QT_VERSION ?= 4 + INSTALL_DIR=install -d -o root -g root -m 755 INSTALL_FILE=install -o root -g root -m 644 INSTALL_SYMLINK=ln -s -f @@ -20,8 +24,17 @@ ETCDIR=/etc/x2go BINDIR=$(PREFIX)/bin SHAREDIR=$(PREFIX)/share MANDIR=$(SHAREDIR)/man -QMAKE_BINARY=qmake-qt4 -LRELEASE_BINARY=lrelease-qt4 +ifeq ($(QT_VERSION),4) + QMAKE_BINARY := qmake-qt4 + LRELEASE_BINARY := lrelease-qt4 +else + ifeq ($(QT_VERSION),5) + QMAKE_BINARY := qmake + LRELEASE_BINARY := lrelease + else + $(error Unsupported Qt version "$(QT_VERSION)" passed.) + endif +endif QMAKE_OPTS= LDFLAGS= diff --git a/debian/changelog b/debian/changelog index 682bf1e..dc5df05 100644 --- a/debian/changelog +++ b/debian/changelog @@ -40,6 +40,8 @@ x2goclient (4.1.2.3-0x2go1) UNRELEASED; urgency=medium - src/sshmasterconnection.{c,h}: fix builds, new function should have been registered and not static, but private. - .gitignore: add debian/control, since it's now auto-generated. + - Makefile: support version switching through a QT_VERSION variable - + might be overridden via environment variables or the make call. * debian/control: + Move to debian/control.in. * debian/control.in: -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit 3963b76d7074b17623f99f95cde0355f87b000fe Author: Mihai Moldovan <ionic@ionic.de> Date: Wed May 12 22:19:32 2021 +0200 debian/rules: assign default values to the FORCE_{VENDOR,RELEASE_VER} variables - thus allowing passed-in values through the environment. --- debian/changelog | 2 ++ debian/rules | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index dc5df05..b564488 100644 --- a/debian/changelog +++ b/debian/changelog @@ -73,6 +73,8 @@ x2goclient (4.1.2.3-0x2go1) UNRELEASED; urgency=medium non-chrooted by sbuild before building the source package, so forcing will overwrite the file our buildscripts generated with something not matching the target system. + + Assign default values to the FORCE_{VENDOR,RELEASE_VER} variables - thus + allowing passed-in values through the environment. * debian/: + New file "watch". We won't need this per se (since we're upstream and there cannot be a newer version of the Debian package without releasing diff --git a/debian/rules b/debian/rules index 6c69b98..25fd032 100755 --- a/debian/rules +++ b/debian/rules @@ -14,8 +14,8 @@ VENDOR_UBUNTU := QT_VERSION := 4 # Setting these disables autodetection. -FORCE_VENDOR := -FORCE_RELEASE_VER := +FORCE_VENDOR ?= +FORCE_RELEASE_VER ?= ifneq ($(FORCE_VENDOR),) ifneq ($(FORCE_RELEASE_VER),) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit f1082e39d352186cb28e95c6737d84d30e1c6fd3 Author: Mihai Moldovan <ionic@ionic.de> Date: Wed May 12 22:20:39 2021 +0200 Utilize new version switching in main Makefile by overriding the QT_VERSION make variable. --- debian/changelog | 2 ++ debian/rules | 3 +++ 2 files changed, 5 insertions(+) diff --git a/debian/changelog b/debian/changelog index b564488..ea930fc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -75,6 +75,8 @@ x2goclient (4.1.2.3-0x2go1) UNRELEASED; urgency=medium matching the target system. + Assign default values to the FORCE_{VENDOR,RELEASE_VER} variables - thus allowing passed-in values through the environment. + + Utilize new version switching in main Makefile by overriding the + QT_VERSION make variable. * debian/: + New file "watch". We won't need this per se (since we're upstream and there cannot be a newer version of the Debian package without releasing diff --git a/debian/rules b/debian/rules index 25fd032..4eb06ad 100755 --- a/debian/rules +++ b/debian/rules @@ -94,6 +94,9 @@ override_dh_auto_configure: if [ -f ChangeLog.gitlog ]; then cp ChangeLog.gitlog res/txt/git-info; fi dh_auto_configure +override_dh_auto_build: + dh_auto_build -- 'QT_VERSION=$(QT_VERSION)' + override_dh_auto_clean: # Try to regenerate debian/control if necessary, but don't force it. # sbuild will run the clean operation non-chrooted before building the -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
-
git-admin＠x2go.org