dh: Fix bug in binary-indep in compat 5-12

Signed-off-by: Niels Thykier <niels@thykier.net>

2 files changed, 8 insertions, 2 deletions

diff --git a/debian/changelog b/debian/changelog
index 0b4adc00..4a8ce522 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,10 @@ debhelper (12.5.4) UNRELEASED; urgency=medium
     for automatic udeb detection, which incorrectly also checked
     when --add-udeb was passed.  Thanks to Andreas Metzler for
     reporting the issue.  (Closes: #935577)
+  * dh: Fix bug where overrides for dh_dwz, dh_strip, dh_makeshlibs
+    or dh_shlibdeps could be triggered via binary-indep in compat
+    12 and earlier.  Thanks to Andreas Beckmann for reporting the
+    issue.  (Closes: #935780)
 
  -- Niels Thykier <niels@thykier.net>  Tue, 20 Aug 2019 14:14:47 +0000
 
diff --git a/dh b/dh
index 79d48ca3..222dba7a 100755
--- a/dh
+++ b/dh
@@ -668,8 +668,10 @@ sub _compute_addons {
 		push(@addon_requests, '+elf-tools');
 	} elsif (compat(12, 1)) {
 		# In compat 12 and earlier, we only inject the sequence if there are arch
-		# packages present.
-		push(@addon_requests, '+elf-tools') if getpackages('arch');
+		# packages present and the sequence requires it.
+		if (getpackages('arch') and $sequence_type ne SEQUENCE_TYPE_INDEP_ONLY) {
+			push(@addon_requests, '+elf-tools');
+		}
 	} else {
 		# In compat 13, we always inject the addon if not explicitly requested and
 		# then flag it as arch_only