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

[SCM] Debian package checker branch, master, updated. 2.5.1-18-gf795467



The following commit has been merged in the master branch:
commit f7954670077aae29899f05da70ec071efdfdd2be
Author: Niels Thykier <niels@thykier.net>
Date:   Sun Jun 26 12:30:59 2011 +0200

    Stricten one of the  helper-template in copyright file regex

diff --git a/checks/copyright-file b/checks/copyright-file
index 1fb0798..53c2af8 100644
--- a/checks/copyright-file
+++ b/checks/copyright-file
@@ -271,7 +271,7 @@ 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,Author\(s\),o or
+    m,Upstream Author\(s\),o or
     m,\<years\>,o or
     m,\<special license\>,o or
     m,\<likewise for another author\>,o) {
diff --git a/debian/changelog b/debian/changelog
index 332dc82..fc34d18 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,11 @@ lintian (2.5.2) UNRELEASED; urgency=low
   * checks/circular-deps.desc:
     + [NT] Fixed typo; thanks to Nicolás Alvarez for the report
       and patch.  (Closes: #630925)
+  * checks/copyright-file:
+    + [NT] Stricten one of the regexes for catching left over
+      helper templates.  This should prevent false-positives for
+      some license texts.  Thanks to Charles Plessy for the
+      reporty.  (Closes: #631674)
   * checks/debhelper:
     + [NT] Do not trigger deprecation warning for dh_python if it
       is followed by a "$".  This prevents false-positives when

-- 
Debian package checker


Reply to: