[SCM] Debian package checker branch, master, updated. 2.5.2-111-g55ea7a7

["Niels Thykier" <niels@thykier.net>]

The following commit has been merged in the master branch:
commit 55ea7a753aaabebe61bc8dec1aa8ebea24c0c923
Author: Jakub Wilk <jwilk@debian.org>
Date:   Wed Sep 7 12:34:44 2011 +0200

    Extended the helper-templates-in-copyright check
    
    Also only emit it once per package.
    
    Signed-off-by: Niels Thykier <niels@thykier.net>

diff --git a/checks/copyright-file b/checks/copyright-file
index 3dcaf3c..251f26e 100644
--- a/checks/copyright-file
+++ b/checks/copyright-file
@@ -136,13 +136,6 @@ if (m,\r,) {
 
 my $wrong_directory_detected = 0;
 
-if (m,\<fill in (?:http/)?ftp site\>, or m/\<Must follow here\>/) {
-    tag 'helper-templates-in-copyright';
-}
-if (m,\<Put the license of the package here,) {
-    tag 'helper-templates-in-copyright';
-}
-
 if (m,(usr/share/common-licenses/(?:GPL|LGPL|BSD|Artistic)\.gz),) {
     tag 'copyright-refers-to-compressed-license', $1;
 }
@@ -255,13 +248,17 @@ if (m,(?:under )?(?:the )?(?:same )?(?:terms )?as Perl itself,i &&
 
 # Checks for various packaging helper boilerplate.
 
-if (m,\<put author[\'\(]s\)? name and email here\>,o) {
-    tag 'helper-templates-in-copyright';
-}
-if (m,\<Copyright \(C\) YYYY Name OfAuthor\>,o or
+if (m,\<fill in (?:http/)?ftp site\>,o or
+    m,\<Must follow here\>,o or
+    m,\<Put the license of the package here,o or
+    m,\<put author[\'\(]s\)? name and email here\>,o or
+    m,\<Copyright \(C\) YYYY Name OfAuthor\>,o or
     m,Upstream Author\(s\),o or
     m,\<years\>,o or
     m,\<special license\>,o or
+    m,\<Put the license of the package here indented by 1 space\>,o or
+    m,\<This follows the format of Description: lines in control file\>,o or
+    m,\<Including paragraphs\>,o or
     m,\<likewise for another author\>,o) {
     tag 'helper-templates-in-copyright';
 }
diff --git a/debian/changelog b/debian/changelog
index 6dcc9c8..25c37a7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -52,6 +52,8 @@ lintian (2.5.3) UNRELEASED; urgency=low
   * checks/copyright-file{,.desc}:
     + [JW] Check for CRLF line endings in copyright files.
       (Closes: #634191)
+    + [JW] Extended helper-templates-in-copyright and ensure it is
+      only emitted once per package.
   * checks/debhelper:
     + [NT] Recognise /usr/share/R/debian/r-cran.mk as a cdbs-based
       build.  This prevents false-positive "unneeded cdbs" warning.
diff --git a/t/tests/generic-dh-make-2005/tags b/t/tests/generic-dh-make-2005/tags
index 6e4623b..eb71be2 100644
--- a/t/tests/generic-dh-make-2005/tags
+++ b/t/tests/generic-dh-make-2005/tags
@@ -1,7 +1,5 @@
 E: generic-dh-make-2005: description-is-dh_make-template
 E: generic-dh-make-2005: helper-templates-in-copyright
-E: generic-dh-make-2005: helper-templates-in-copyright
-E: generic-dh-make-2005: helper-templates-in-copyright
 E: generic-dh-make-2005: section-is-dh_make-template
 I: generic-dh-make-2005 source: debian-watch-file-is-missing
 I: generic-dh-make-2005: extended-description-is-probably-too-short
diff --git a/t/tests/generic-dh-make-2008/tags b/t/tests/generic-dh-make-2008/tags
index 4287bb5..8912546 100644
--- a/t/tests/generic-dh-make-2008/tags
+++ b/t/tests/generic-dh-make-2008/tags
@@ -1,8 +1,6 @@
 E: generic-dh-make-2008: copyright-contains-dh_make-todo-boilerplate
 E: generic-dh-make-2008: description-is-dh_make-template
 E: generic-dh-make-2008: helper-templates-in-copyright
-E: generic-dh-make-2008: helper-templates-in-copyright
-E: generic-dh-make-2008: helper-templates-in-copyright
 E: generic-dh-make-2008: section-is-dh_make-template
 I: generic-dh-make-2008 source: debian-watch-file-is-missing
 I: generic-dh-make-2008: copyright-with-old-dh-make-debian-copyright

-- 
Debian package checker