summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog9
-rwxr-xr-xdh6
2 files changed, 12 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index 49afe012..fed3e6b5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+debhelper (11.1.1) UNRELEASED; urgency=medium
+
+ * dh: Fix an off-by-one in a compat check. This fixes an
+ internal error for compat 9 packages that requires dh to
+ recurse into the debian/rules file. Thanks to Helmut
+ Grohne for reporting the bug. (Closes: #886518)
+
+ -- Niels Thykier <niels@thykier.net> Sun, 07 Jan 2018 09:17:16 +0000
+
debhelper (11.1) unstable; urgency=medium
[ Paul Tagliamonte ]
diff --git a/dh b/dh
index e123ed03..7e5322e0 100755
--- a/dh
+++ b/dh
@@ -687,12 +687,12 @@ if ( -f $build_stamp_file and not compat(9)) {
$completed_sequences{'build'} = 1 if $build_indep_target_done and $build_arch_target_done;
}
-# In compat <= 9, the sequences are always inlined (those versions do not
-# recurse into debian/rules anyway). In compat 10+, we never inline an
+# In compat <= 8, the sequences are always inlined (those versions do not
+# recurse into debian/rules anyway). In compat 9+, we never inline an
# existing rules target.
my ($rules_targets, $full_sequence) = optimize_sequence(\%sequences,
$sequence,
- (!compat(9) ? 0 : 1),
+ (!compat(8) ? 0 : 1),
\%completed_sequences
);
my $stoppoint = $#{$full_sequence};