[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] Debian package checker branch, master, updated. 2.5.1-147-g8a7261c



The following commit has been merged in the master branch:
commit 8a7261c3f4fe5c4af64baf23110ae0f7973f7a67
Author: Niels Thykier <niels@thykier.net>
Date:   Mon Jul 25 23:52:43 2011 +0200

    Allow LowThresholdNMU as a "NMU" indicator

diff --git a/checks/nmu b/checks/nmu
index d59c14e..bbd7daa 100644
--- a/checks/nmu
+++ b/checks/nmu
@@ -64,7 +64,7 @@ my $firstline = (grep /^\s*\*/, split('\n', $changes))[0];
 # Check the first line for QA, NMU or team upload mentions.
 if ($firstline) {
 	local $_ = $firstline;
-	if (/\bnmu\b/i or /non-maintainer upload/i) {
+	if (/\bnmu\b/i or /non-maintainer upload/i or m/LowThresholdNMU/io) {
 		unless (/(?:ackno|\back\b|confir|incorporat).*(?:\bnmu\b|non-maintainer)/i) {
 			$changelog_mentions_nmu = 1;
 		}
diff --git a/debian/changelog b/debian/changelog
index 67e91f5..57e1ca9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -108,6 +108,11 @@ lintian (2.5.2) UNRELEASED; urgency=low
   * checks/menu-format.desc:
     + [NT] Mentioned how to git rid of the CR characters in the
       desktop file.  Thanks to Jakub Wilk.
+  * checks/nmu:
+    + [NT] "LowThresholdNMU" will now work as an alternative to
+      "NMU" in changelogs for suppressing
+      changelog-should-mention-nmu.  Thanks to Jordi Mallach for
+      the report.  (Closes: #620418)
   * checks/rules:
     + [NT] Check included files in d/rules against a limited
       number of common makefile snippets, which are known not

-- 
Debian package checker


Reply to: