[SCM] Debian package checker branch, master, updated. cf41e4c842d7c347f2e8b815c7aaa58c15acc5fb

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

The following commit has been merged in the master branch:
commit cf41e4c842d7c347f2e8b815c7aaa58c15acc5fb
Author: Russ Allbery <rra@debian.org>
Date:   Thu Jul 10 22:13:56 2008 -0700

    Ignore CNRI OPEN SOURCE license when checking for GPL references
    
    * checks/changelog-file:
      + [RA] Ignore "CNRI OPEN SOURCE GPL-COMPATIBLE LICENSE AGREEMENT" when
        looking for missing GPL references.  Thanks, Scott Kitterman.
        (Closes: #490264)

diff --git a/checks/copyright-file b/checks/copyright-file
index d2141a2..3f87743 100644
--- a/checks/copyright-file
+++ b/checks/copyright-file
@@ -240,6 +240,7 @@ if (m,/usr/share/common-licenses,
     || m/AFFERO GENERAL PUBLIC LICENSE/
     || m/GNU Free Documentation License\s*Version 1\.1/
     || m/CeCILL FREE SOFTWARE LICENSE AGREEMENT/
+    || m/CNRI OPEN SOURCE GPL-COMPATIBLE LICENSE AGREEMENT/
     || $wrong_directory_detected) {
     # False positive or correct reference.  Ignore.
 } elsif (m/GNU Free Documentation License/i or m/\bGFDL\b/) {
diff --git a/debian/changelog b/debian/changelog
index b5b1d43..e845461 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ lintian (1.24.2) unstable; urgency=low
 
   * checks/changelog-file:
     + [ADB] Add missing "use Dep". Thanks gregor herrmann (Closes: #488397)
+    + [RA] Ignore "CNRI OPEN SOURCE GPL-COMPATIBLE LICENSE AGREEMENT" when
+      looking for missing GPL references.  Thanks, Scott Kitterman.
+      (Closes: #490264)
   * checks/copyright-file{,.desc}:
     + [ADB] Check for over-long lines in copyright files.  (Closes: #479651)
   * checks/cruft{,.desc}:

-- 
Debian package checker