[SCM] Debian package checker branch, master, updated. 2.1.6-35-ga5f9cdd

["Russ Allbery" <rra@debian.org>]

The following commit has been merged in the master branch:
commit 8d39a297ef6f07a6108c0cf10b84f6e68f173a48
Author: Russ Allbery <rra@debian.org>
Date:   Sat Jan 24 15:42:56 2009 -0800

    Be more conservative about what text is an NMU ack
    
    * checks/nmu{,.desc}:
      + [RA] Only treat the mention of NMU as a maintainer acknowldegement
        if the "ack" string appears before the mention of NMU.  Avoids
        changelog-should-mention-nmu false positives for "NMU with ACK from
        maintainer."  Thanks, Evgeni Golov.  (Closes: #512738)

diff --git a/checks/nmu b/checks/nmu
index 6e8b9df..fdec897 100644
--- a/checks/nmu
+++ b/checks/nmu
@@ -56,7 +56,7 @@ my $firstline = (split('\n', $changes))[0];
 if ($firstline) {
 	local $_ = $firstline;
 	if (/\bnmu\b/i or /non-maintainer upload/i) {
-		unless (/(ackno|\back\b|confir|incorporat)/i) {
+		unless (/(ackno|\back\b|confir|incorporat).*(\bnmu\b|non-maintainer)/i) {
 			$changelog_mentions_nmu = 1;
 		}
 	}
diff --git a/checks/nmu.desc b/checks/nmu.desc
index 9603e5b..7f96052 100644
--- a/checks/nmu.desc
+++ b/checks/nmu.desc
@@ -66,7 +66,7 @@ Ref: devref 5.11.3
 
 Tag: changelog-should-not-mention-nmu
 Severity: normal
-Certainty: certain
+Certainty: possible
 Info: The first line of the changelog entry for this package appears to
  indicate it is a non-maintainer upload (by including either that string
  or the string "NMU" and not saying that it's an acknowledgement), but the
diff --git a/debian/changelog b/debian/changelog
index 5b96cab..b56149f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -32,8 +32,12 @@ lintian (2.2.0) UNRELEASED; urgency=low
   * checks/files:
     + [RA] Add swfobject.js to embedded-javascript-library.  Thanks, Paul
       Wise.  (Closes: #512363)
-  * checks/nmu:
+  * checks/nmu{,.desc}:
     + [RA] Use Lintian::Collect to read the changelog.
+    + [RA] Only treat the mention of NMU as a maintainer acknowldegement
+      if the "ack" string appears before the mention of NMU.  Avoids
+      changelog-should-mention-nmu false positives for "NMU with ACK from
+      maintainer."  Thanks, Evgeni Golov.  (Closes: #512738)
   * checks/patch-systems{,.desc}:
     + [RA] Add pedantic check for changes to the upstream source in the
       diff without using a patch system.  Thanks, Raphael Geissert.
diff --git a/t/tests/nmu-with-maintainer-ack/debian/debian/changelog.in b/t/tests/nmu-with-maintainer-ack/debian/debian/changelog.in
new file mode 100644
index 0000000..fc6a5e1
--- /dev/null
+++ b/t/tests/nmu-with-maintainer-ack/debian/debian/changelog.in
@@ -0,0 +1,15 @@
+{$srcpkg} ({$version}) unstable; urgency=low
+
+  * NMU with ACK from maintainer.
+  * This should not trigger changelog-should-mention-nmu even though it
+    has "ACK" in the first line.
+
+ -- Russ Allbery <rra@debian.org>  {$date}
+
+{$srcpkg} (1.0-1) unstable; urgency=low
+
+  * Lintian Test Suite.
+  * Test: {$testname}
+
+ -- {$author}  Sat, 24 Jan 2009 15:39:06 -0800
+
diff --git a/t/tests/nmu-with-maintainer-ack/desc b/t/tests/nmu-with-maintainer-ack/desc
new file mode 100644
index 0000000..8878f38
--- /dev/null
+++ b/t/tests/nmu-with-maintainer-ack/desc
@@ -0,0 +1,5 @@
+Testname: nmu-with-maintainer-ack
+Sequence: 6000
+Type: non-native
+Version: 1.0-1.1
+Test-Against: changelog-should-mention-nmu
diff --git a/t/tests/basic-non-native/tags b/t/tests/nmu-with-maintainer-ack/tags
similarity index 100%
copy from t/tests/basic-non-native/tags
copy to t/tests/nmu-with-maintainer-ack/tags
diff --git a/t/tests/basic-non-native/upstream/README b/t/tests/nmu-with-maintainer-ack/upstream/README
similarity index 100%
copy from t/tests/basic-non-native/upstream/README
copy to t/tests/nmu-with-maintainer-ack/upstream/README

-- 
Debian package checker