Author: rra
Date: 2006-07-15 02:56:35 +0200 (Sat, 15 Jul 2006)
New Revision: 695
Modified:
trunk/checks/nmu
trunk/checks/nmu.desc
trunk/debian/changelog
trunk/testset/debug/debian/changelog
trunk/testset/etcfiles/debian/changelog
trunk/testset/tags.debug
Log:
* checks/nmu{.desc,}:
+ [RA] When checking for an NMU changelog entry, require "NMU" be
surrounded by word boundaries.
+ [RA] Warn if the changelog incorrectly indicates an NMU. Thanks to
George Danchev for the report.
Modified: trunk/checks/nmu
===================================================================
--- trunk/checks/nmu 2006-06-28 00:56:01 UTC (rev 694)
+++ trunk/checks/nmu 2006-07-15 00:56:35 UTC (rev 695)
@@ -46,9 +46,9 @@
while (<CHANGELOG>) {
if ($firstline) {
$changelog_mentions_nmu = 1
- if (/nmu/i or /non-maintainer upload/i) and not
/(ackno|confir)/i;
+ if (/\bnmu\b/i or /non-maintainer upload/i) and not
/(ackno|confir)/i;
$changelog_mentions_qa = 1 if /orphan/i or /qa (?:group
)?upload/i;
- $firstline = 0 if /^\s+\S/
+ $firstline = 0 if /^\s+\S/;
}
if (/^ -- ([^>]+>)/) {
$uploader = $1;
@@ -83,6 +83,8 @@
} else {
tag "changelog-should-mention-nmu", ""
if !$changelog_mentions_nmu && $upload_is_nmu;
+ tag "changelog-should-not-mention-nmu", ""
+ if $changelog_mentions_nmu && !$upload_is_nmu;
tag "source-nmu-has-incorrect-version-number", "$version"
if $upload_is_nmu && $version_nmuness != 1;
tag "maintainer-upload-has-incorrect-version-number", "$version"
Modified: trunk/checks/nmu.desc
===================================================================
--- trunk/checks/nmu.desc 2006-06-28 00:56:01 UTC (rev 694)
+++ trunk/checks/nmu.desc 2006-07-15 00:56:35 UTC (rev 695)
@@ -50,6 +50,18 @@
doublecheck that the most recent entry in the changelog is byte-for-byte
identical to the maintainer or one of the uploaders.
+Tag: changelog-should-not-mention-nmu
+Type: warning
+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
+ changelog indicates the person making this release is one of the
+ maintainers.
+ .
+ If this was intended to be an NMU, do not add yourself as a maintainer or
+ uploader. Otherwise, please rephrase your changelog entry to not cause
+ confusion.
+
Tag: changelog-is-symlink
Type: warning
Info: The file <tt>debian/changelog</tt> is a symlink instead of a regular
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2006-06-28 00:56:01 UTC (rev 694)
+++ trunk/debian/changelog 2006-07-15 00:56:35 UTC (rev 695)
@@ -1,3 +1,13 @@
+lintian (1.23.23) UNRELEASED; urgency=low
+
+ * checks/nmu{.desc,}:
+ + [RA] When checking for an NMU changelog entry, require "NMU" be
+ surrounded by word boundaries.
+ + [RA] Warn if the changelog incorrectly indicates an NMU. Thanks to
+ George Danchev for the report.
+
+ -- Russ Allbery <[EMAIL PROTECTED]> Fri, 14 Jul 2006 17:55:28 -0700
+
lintian (1.23.22) unstable; urgency=low
* checks/debconf:
Modified: trunk/testset/debug/debian/changelog
===================================================================
--- trunk/testset/debug/debian/changelog 2006-06-28 00:56:01 UTC (rev
694)
+++ trunk/testset/debug/debian/changelog 2006-07-15 00:56:35 UTC (rev
695)
@@ -1,5 +1,6 @@
debug (1.0) unstable; urgency=low
+ * NMU.
* Initial version.
-- Russ Allbery <[EMAIL PROTECTED]> Sat, 4 Mar 2006 21:31:06 -0800
Modified: trunk/testset/etcfiles/debian/changelog
===================================================================
--- trunk/testset/etcfiles/debian/changelog 2006-06-28 00:56:01 UTC (rev
694)
+++ trunk/testset/etcfiles/debian/changelog 2006-07-15 00:56:35 UTC (rev
695)
@@ -1,5 +1,6 @@
etcfiles (1) unstable; urgency=low
+ * Acknowledge NMU (Closes: #1234).
* initial setup
-- Lintian Maintainers <[EMAIL PROTECTED]> Fri, 21 Sep 2001 11:56:02 -0700
Modified: trunk/testset/tags.debug
===================================================================
--- trunk/testset/tags.debug 2006-06-28 00:56:01 UTC (rev 694)
+++ trunk/testset/tags.debug 2006-07-15 00:56:35 UTC (rev 695)
@@ -3,6 +3,7 @@
E: hello: unstripped-binary-or-object ./usr/bin/hello.dbg
E: libhello0-dbg: binary-with-bad-dynamic-table ./usr/lib/libhello.so.dbg
E: libhello0-dbg: sharedobject-in-library-directory-not-actually-a-shlib
usr/lib/libhello.so.dbg
+W: debug source: changelog-should-not-mention-nmu
W: debug source: out-of-date-standards-version 3.7.0 (current is 3.7.2)
W: hello: binary-without-manpage hello
W: hello: binary-without-manpage hello.dbg
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
