[SCM] Debian package checker branch, master, updated. 2.5.0-42-g2fa19fd

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

The following commit has been merged in the master branch:
commit 2fa19fd1a71b82fb1094ca563fba2223ab8d1899
Author: Nelson A. de Oliveira <naoliv@debian.org>
Date:   Thu Jun 9 23:08:52 2011 +0200

    Improved the dh-make copyright template checks
    
    Signed-off-by: Niels Thykier <niels@thykier.net>

diff --git a/checks/copyright-file b/checks/copyright-file
index d10fa80..1fb0798 100644
--- a/checks/copyright-file
+++ b/checks/copyright-file
@@ -267,29 +267,31 @@ 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\>,) {
+if (m,\<put author[\'\(]s\)? name and email here\>,o) {
     tag 'helper-templates-in-copyright';
 }
 if (m,\<Copyright \(C\) YYYY Name OfAuthor\>,o or
-    m,\<Copyright \(C\) \d{4} Upstream Full Name\>,o or
-    m,My Full Name \<name\@place.com\>,o or
+    m,Author\(s\),o or
+    m,\<years\>,o or
+    m,\<special license\>,o or
     m,\<likewise for another author\>,o) {
     tag 'helper-templates-in-copyright';
 }
 
-if (m/This copyright info was automatically extracted/) {
+if (m/This copyright info was automatically extracted/o) {
     tag 'copyright-contains-dh-make-perl-boilerplate';
 }
 
-if (m,url://example\.com, or m,url://somewhere\.com,) {
+if (m,url://,o) {
     tag 'copyright-has-url-from-dh_make-boilerplate';
 }
 
-if (m{\# Please also look if there are files or directories which have a\n\# different copyright/license attached and list them here\.}) {
+if (m{\# Please also look if there are files or directories which have a\n\# different copyright/license attached and list them here\.}o, or
+    m{\# If you want to use GPL v2 or later for the /debian/\* files use\n\# the following clauses, or change it to suit. Delete these two lines}o) {
     tag 'copyright-contains-dh_make-todo-boilerplate';
 }
 
-if (m,The\s+Debian\s+packaging\s+is\s+\(C\)\s+\d+,i) {
+if (m,The\s+Debian\s+packaging\s+is\s+\(C\)\s+\d+,io) {
     tag 'copyright-with-old-dh-make-debian-copyright';
 }
 
diff --git a/debian/changelog b/debian/changelog
index 196b0eb..f3eacef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,8 +21,7 @@ lintian (2.5.1) UNRELEASED; urgency=low
     + [NT] Always verify the checksums of changes-files.
   * checks/copyright-file:
     + [NT] Extended current dh_make template checks.  Thanks to
-      Nelson A. de Oliveira for the report and investigative work.
-      (Closes: #598412)
+      Nelson A. de Oliveira for the patch.  (Closes: #598412)
   * checks/fields{,.desc}:
     + [NT] Allow "all" and "any" to appear together in the Architecture
       field of a .dsc file.  (Closes: #626775)
diff --git a/t/tests/copyright-file-general/desc b/t/tests/copyright-file-general/desc
index 4b69a77..20af005 100644
--- a/t/tests/copyright-file-general/desc
+++ b/t/tests/copyright-file-general/desc
@@ -25,4 +25,5 @@ Test-For:
  copyright-should-refer-to-common-license-file-for-lgpl
  copyright-without-copyright-notice
  debian-copyright-file-uses-obsolete-national-encoding
+ helper-templates-in-copyright
  old-style-copyright-file
diff --git a/t/tests/copyright-file-general/tags b/t/tests/copyright-file-general/tags
index 2e0fefc..9a588c8 100644
--- a/t/tests/copyright-file-general/tags
+++ b/t/tests/copyright-file-general/tags
@@ -11,6 +11,7 @@ E: copyright-full-lgpl: copyright-should-refer-to-common-license-file-for-lgpl
 E: copyright-misc-errors: copyright-refers-to-compressed-license usr/share/common-licenses/BSD.gz
 E: copyright-misc-errors: copyright-refers-to-incorrect-directory usr/share/common-licences
 E: copyright-misc-errors: copyright-refers-to-old-directory
+E: copyright-misc-errors: helper-templates-in-copyright
 E: copyright-missing-perl-license-pointer: copyright-file-lacks-pointer-to-perl-license
 E: copyright-old-style: FSSTND-dir-in-usr usr/doc/
 E: copyright-old-style: old-style-copyright-file

-- 
Debian package checker