[SCM] Debian package checker branch, master, updated. 2.4.1-35-gf37a803

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

The following commit has been merged in the master branch:
commit f37a803649f40b727b452c642d90c8ed7b356cf1
Author: Russ Allbery <rra@debian.org>
Date:   Sun Jun 27 19:38:05 2010 -0700

    Add changelog and test suite for team upload check

diff --git a/checks/nmu b/checks/nmu
index 59f5522..f0115cd 100644
--- a/checks/nmu
+++ b/checks/nmu
@@ -71,8 +71,7 @@ if ($firstline) {
 	}
 	$changelog_mentions_local = 1 if /\blocal\s+package\b/i;
 	$changelog_mentions_qa = 1 if /orphan/i or /qa (?:group )?upload/i;
-	$changelog_mentions_team_upload = 1 if / \* Team upload./;
-
+	$changelog_mentions_team_upload = 1 if /team upload/i;
 }
 
 my $version = $info->field("version");
diff --git a/checks/nmu.desc b/checks/nmu.desc
index b552a40..2e8f240 100644
--- a/checks/nmu.desc
+++ b/checks/nmu.desc
@@ -22,8 +22,9 @@ Tag: team-upload-has-incorrect-version-number
 Severity: normal
 Certainty: certain
 Info: A team upload (uploading a package from the same team without adding
- onself as maintainer or uploader) is a maintainer upload: it should not get a
- NMU revision number.
+ onself as maintainer or uploader) is a maintainer upload: it should not
+ get a NMU revision number.  Team uploads are recognized by the string
+ "team upload" on the first line of the changelog file.
 
 Tag: source-nmu-has-incorrect-version-number
 Severity: normal
diff --git a/debian/changelog b/debian/changelog
index b70ee15..0372f91 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ lintian (2.4.2) UNRELEASED; urgency=low
       - conflicts-with-version
       - copyright-refers-to-deprecated-bsd-license-file
       - init.d-script-depends-on-unknown-virtual-facility
+      - team-upload-has-incorrect-version-number
       - xc-package-type-in-debian-control (pedantic)
     + Removed:
       - arch-any-in-binary-pkg (now in arch-wildcard-in-binary-package)
@@ -59,6 +60,9 @@ lintian (2.4.2) UNRELEASED; urgency=low
     + [RA] Skip Haskell library documentation when warning about
       documentation not registered with doc-base.  Patch from Erik de
       Castro Lopo.  (Closes: #586877)
+  * checks/nmu{,.desc}:
+    + [RA] Recognize team uploads and do not treat them like NMUs.  Patch
+      from Charles Plessy.  (Closes: #582741)
   * checks/rules.desc:
     + [RA] Add reference for debian-rules-makemaker-prefix-is-deprecated.
   * checks/scripts:
diff --git a/t/tests/fields-binary-nmu-version/debian/debian/changelog.in b/t/tests/nmu-team-upload/debian/debian/changelog.in
similarity index 92%
copy from t/tests/fields-binary-nmu-version/debian/debian/changelog.in
copy to t/tests/nmu-team-upload/debian/debian/changelog.in
index f057675..b1c0b34 100644
--- a/t/tests/fields-binary-nmu-version/debian/debian/changelog.in
+++ b/t/tests/nmu-team-upload/debian/debian/changelog.in
@@ -1,6 +1,6 @@
 {$srcpkg} ({$version}) unstable; urgency=low
 
-  * NMU.
+  * Team upload.
   * Lintian Test Suite.
   * Test: {$testname}
 
diff --git a/t/tests/nmu-team-upload/desc b/t/tests/nmu-team-upload/desc
new file mode 100644
index 0000000..8aaad7a
--- /dev/null
+++ b/t/tests/nmu-team-upload/desc
@@ -0,0 +1,5 @@
+Testname: nmu-team-upload
+Sequence: 6000
+Version: 1.0+nmu1
+Description: Test for versioning of a team upload
+Test-For: team-upload-has-incorrect-version-number
diff --git a/t/tests/nmu-team-upload/tags b/t/tests/nmu-team-upload/tags
new file mode 100644
index 0000000..9c17c79
--- /dev/null
+++ b/t/tests/nmu-team-upload/tags
@@ -0,0 +1 @@
+W: nmu-team-upload source: team-upload-has-incorrect-version-number 1.0+nmu1

-- 
Debian package checker