[X2Go-Commits] [x2goclient] 03/03: Utilize new version switching in main Makefile by overriding the QT_VERSION make variable.

git-admin at x2go.org git-admin at x2go.org
Wed May 12 23:07:14 CEST 2021


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 at 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


More information about the x2go-commits mailing list