[debhelper-devel] [debhelper] 01/01: dh_gencontrol: Discard "Multi-Arch: no"

[Niels Thykier]

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

nthykier pushed a commit to branch master
in repository debhelper.

commit a0c929f8a95b3affe8a54f8de36d4efda5feb07a
Author: Helmut Grohne <helmut at subdivi.de>
Date:   Tue Mar 7 18:56:27 2017 +0000

    dh_gencontrol: Discard "Multi-Arch: no"
    
    As dak auto-rejects packages with those uploads and we may want to use
    an explicit "no" to disable future auto-computation of the Multi-Arch
    field.
    
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 debian/changelog | 2 ++
 dh_gencontrol    | 9 +++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 852b0c8..d5bf37d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ debhelper (10.2.6) UNRELEASED; urgency=medium
     (Closes: #853881)
   * Disable stripping during dh_auto_* in makefile buildsystem in compat 11.
     (Closes: #844077)
+  * Remove explicit "Multi-Arch: no" stanzas as they are auto-rejected.
+    (Closes: #857028)
 
   [ Niels Thykier ]
   * Dh_Lib.pm: Make getpackages() produce the correct result independently
diff --git a/dh_gencontrol b/dh_gencontrol
index 4edb065..17c010b 100755
--- a/dh_gencontrol
+++ b/dh_gencontrol
@@ -78,7 +78,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 		complex_doit("echo misc:Pre-Depends= >> $substvars");
 	}
 
-	my (@debug_info_params, $build_ids);
+	my (@debug_info_params, $build_ids, @multiarch_params);
 	if ( -d $dbgsym_info_dir ) {
 		$build_ids = read_dbgsym_build_ids($dbgsym_info_dir);
 	}
@@ -134,9 +134,14 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 		push(@debug_info_params, "-DBuild-Ids=${build_ids}");
 	}
 
+	# Remove explicit "Multi-Arch: no" headers to avoid autorejects by dak.
+	push (@multiarch_params, '-UMulti-Arch')
+		if (package_multiarch($package) eq 'no');
+
 	# Generate and install control file.
 	doit("dpkg-gencontrol", "-p$package", "-l$changelog", "-T$substvars",
-		"-P$tmp", @debug_info_params, @{$dh{U_PARAMS}});
+		"-P$tmp", @debug_info_params, @multiarch_params,
+		@{$dh{U_PARAMS}});
 
 	# This chmod is only necessary if the user sets the umask to
 	# something odd.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debhelper/debhelper.git