[SCM] Debian package checker branch, master, updated. 2.3.4-5-g7bf8ac9
The following commit has been merged in the master branch:
commit 7bf8ac9153a76d5c952862564d8f27bbc88a3151
Author: Russ Allbery <rra@debian.org>
Date: Tue Mar 23 23:17:59 2010 -0700
Support multi-author changelogs in NMU checks
* checks/nmu:
+ [RA] Skip leading multi-author changelog lines when looking for
things like non-maintainer upload notes at the start of the
changelog entry. Thanks, Vincent Danjean. (Closes: #575192)
diff --git a/checks/nmu b/checks/nmu
index fd2febf..f3c23ec 100644
--- a/checks/nmu
+++ b/checks/nmu
@@ -58,7 +58,9 @@ my $distribution = $entry->Distribution;
my $uploader = canonicalize($entry->Maintainer);
my $changes = $entry->Changes;
$changes =~ s/^(\s*\n)+//;
-my $firstline = (split('\n', $changes))[0];
+my @lines = split("\n", $changes);
+shift @lines while $lines[0] =~ /^\s*(?:\[.+\])?\s*$/;
+my $firstline = $lines[0];
# Check the first line for QA and NMU mentions.
if ($firstline) {
diff --git a/debian/changelog b/debian/changelog
index 949be3b..2a4d9e0 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,10 @@ lintian (2.3.5) UNRELEASED; urgency=low
+ [RA] Allow $all to satisfy a $remote_fs or $local_fs requirement for
Required-Stop, since this has now been implemented. Thanks, Michael
Meskes.
+ * checks/nmu:
+ + [RA] Skip leading multi-author changelog lines when looking for
+ things like non-maintainer upload notes at the start of the
+ changelog entry. Thanks, Vincent Danjean. (Closes: #575192)
* checks/watch-file{,.desc}:
+ [RA] Warn about use of dversionmangle instead of uversionmangle to
handle tildes for upstream pre-releases. Patch from Peter
diff --git a/t/tests/fields-binary-nmu-version/debian/debian/changelog.in b/t/tests/nmu-multi-author/debian/debian/changelog.in
similarity index 79%
copy from t/tests/fields-binary-nmu-version/debian/debian/changelog.in
copy to t/tests/nmu-multi-author/debian/debian/changelog.in
index f057675..03a9f9a 100644
--- a/t/tests/fields-binary-nmu-version/debian/debian/changelog.in
+++ b/t/tests/nmu-multi-author/debian/debian/changelog.in
@@ -1,7 +1,7 @@
{$srcpkg} ({$version}) unstable; urgency=low
- * NMU.
- * Lintian Test Suite.
+ [ Russ Allbery ]
+ * Non-maintainer upload.
* Test: {$testname}
* Suppress "should close ITP bug" messages. (Closes: #123456)
diff --git a/t/tests/nmu-with-maintainer-ack/desc b/t/tests/nmu-multi-author/desc
similarity index 52%
copy from t/tests/nmu-with-maintainer-ack/desc
copy to t/tests/nmu-multi-author/desc
index f5b6f11..b129fe5 100644
--- a/t/tests/nmu-with-maintainer-ack/desc
+++ b/t/tests/nmu-multi-author/desc
@@ -1,6 +1,6 @@
-Testname: nmu-with-maintainer-ack
+Testname: nmu-multi-author
Sequence: 6000
Type: non-native
-Description: Test a variation on NMU wording
Version: 1.0-1.1
+Description: Test an NMU with a multi-author changelog
Test-Against: changelog-should-mention-nmu
diff --git a/t/debs/deb-format-record-size/tags b/t/tests/nmu-multi-author/tags
similarity index 100%
copy from t/debs/deb-format-record-size/tags
copy to t/tests/nmu-multi-author/tags
diff --git a/t/tests/basic-3.0-native/debian/README b/t/tests/nmu-multi-author/upstream/README
similarity index 100%
copy from t/tests/basic-3.0-native/debian/README
copy to t/tests/nmu-multi-author/upstream/README
--
Debian package checker
Reply to: