[X2Go-Commits] [x2goclient] 01/02: debian/rules: do not force re-generation of debian/control in clean rule.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goclient.

commit 0d6cdcac454c2c3deb69a1fbae26f81ff6722be7
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Wed May 12 19:50:45 2021 +0200

    debian/rules: do not force re-generation of debian/control in clean rule.
    
    Its executed 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.
---
 debian/changelog | 4 ++++
 debian/rules     | 6 ++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3e994d2..0a74d9c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -64,6 +64,10 @@ x2goclient (4.1.2.3-0x2go1) UNRELEASED; urgency=medium
     + Force re-generation of debian/control in clean rule.
     + Add force variables to bypass autodetection via lsb-release. This will
       be used by our buildscripts.
+    + Do not force re-generation of debian/control in clean rule. Its executed
+      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.
   * 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 f98aa6e..6c69b98 100755
--- a/debian/rules
+++ b/debian/rules
@@ -95,8 +95,10 @@ override_dh_auto_configure:
 	dh_auto_configure
 
 override_dh_auto_clean:
-	# Force regenration of debian/control - we need this for architecture checks.
-	touch debian/control.in
+	# Try to regenerate debian/control if necessary, but don't force it.
+	# sbuild will run the clean operation non-chrooted before building the
+	# source package, meaning that we're not running in the target system,
+	# so forcefully regenerating it will lead to wrong results.
 	debian/rules 'debian/control'
 	dh_auto_clean
 	rm -f res/txt/changelog

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git