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

[SCM] Debian package checker branch, master, updated. 2.2.17-15-g1228185



The following commit has been merged in the master branch:
commit 16c5235770f9a9cb9aaea6fe6cb660533e82edaa
Author: Salvatore Bonaccorso <salvatore.bonaccorso@gmail.com>
Date:   Sat Oct 31 11:20:45 2009 +0100

    Fix some false positives of copyright-refers-to-symlink-license
    
    * checks/copyright-file:
      + [FL] Extend match for exceptions to copyright-refers-to-symlink-license
        to catch more ways to specify Perl's license.  Patch from
        Salvatore Bonaccorso.  (Closes: #549596)

diff --git a/checks/copyright-file b/checks/copyright-file
index a776ee8..293f9f0 100644
--- a/checks/copyright-file
+++ b/checks/copyright-file
@@ -163,7 +163,9 @@ if (m,(usr/share/common-licenses/(?:GPL|LGPL|BSD|Artistic)\.gz),) {
 # our false positives for GPL references that don't include a specific version
 # number, but it will get the obvious ones.
 if (m,(usr/share/common-licenses/(L?GPL|GFDL))([^-]),i && !m,as Perl itself,i
-    && !m,License-Alias:\s+Perl,) {
+    && !m,License-Alias:\s+Perl,
+    && !m,License:\s+Artistic\s+or\s+GPL-1\+,
+    && !m,License:\s+Perl,) {
     my ($ref, $license, $separator) = ($1, $2, $3);
     if ($separator =~ /[\d\w]/) {
 	tag 'copyright-refers-to-nonexistent-license-file', "$ref$separator";
diff --git a/debian/changelog b/debian/changelog
index 3e23849..17626f5 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,9 @@ lintian (2.2.18) UNRELEASED; urgency=low
   * checks/copyright-file:
     + [FL] Add special exception to no-copyright-file for perl.
       See #522827 for discussion.  (Closes: #553262)
+    + [FL] Extend match for exceptions to copyright-refers-to-symlink-license
+      to catch more ways to specify Perl's license.  Patch from
+      Salvatore Bonaccorso.  (Closes: #549596)
   * checks/cruft:
     + [FL] Add automake1.11 to list of autotools packages.  Thanks,
       Laurent Bigonville.  (Closes: #551051)

-- 
Debian package checker


Reply to: