lintian: r619 - in trunk: checks debian

[rra@debian.org]

Author: rra
Date: 2006-04-13 07:15:53 +0200 (Thu, 13 Apr 2006)
New Revision: 619

Modified:
   trunk/checks/copyright-file
   trunk/checks/copyright-file.desc
   trunk/debian/changelog
Log:
* checks/copyright-file{.desc,}:
  + [RA] Don't assume mentions of GPL or GNU General Public License
    after what look like mail headers are referring to the license of
    the package.  Be a bit more specific in the old FSF address check
    to avoid false positives on other Cambridge, MA addresses.  Reported
    by Adam C. Powell IV.  (Closes: #205934)

Modified: trunk/checks/copyright-file
===================================================================
--- trunk/checks/copyright-file	2006-04-12 03:38:21 UTC (rev 618)
+++ trunk/checks/copyright-file	2006-04-13 05:15:53 UTC (rev 619)
@@ -162,8 +162,9 @@
     $wrong_directory_detected = 1;
 }
 
-# lame check for old FSF zip code
-if (m/(02139|02111-1307)/) {
+# Lame check for old FSF zip code.  Try to avoid false positives from other
+# Cambridge, MA addresses.
+if (m/(Free\s*Software\s*Foundation.*02139|02111-1307)/s) {
     tag "old-fsf-address-in-copyright-file", "";
 }
 
@@ -186,9 +187,15 @@
     tag "copyright-does-not-refer-to-common-license-file", "$1";
 }
 
+# This check is a bit prone to false positives, since some other licenses
+# mention the GPL.  Also exclude any mention of the GPL following what looks
+# like mail headers, since sometimes e-mail discussions of licensing are
+# included in the copyright file but aren't referring to the license of the
+# package.
 if (m/(GNU General Public License|GPL)/ && !m,/usr/share/common-licenses,
     && !m/Zope Public License/ && !m/LICENSE AGREEMENT FOR PYTHON 1.6.1/
     && !m/LaTeX Project Public License/ && !m/GNU Free Documentation License/
+    && !m/(^From:.*^To:|^To:.*^From:).*(GNU General Public License|GPL)/ms
     && !$wrong_directory_detected) {
     tag "copyright-should-refer-to-common-license-file-for-gpl", "";
 }

Modified: trunk/checks/copyright-file.desc
===================================================================
--- trunk/checks/copyright-file.desc	2006-04-12 03:38:21 UTC (rev 618)
+++ trunk/checks/copyright-file.desc	2006-04-13 05:15:53 UTC (rev 619)
@@ -132,8 +132,10 @@
 Tag: copyright-should-refer-to-common-license-file-for-gpl
 Type: error
 Ref: policy 12.5
-Info: Packages distributed under the GNU GPL must make reference to
- /usr/share/common-licenses as the location of the GPL on Debian systems.
+Info: The string "GNU General Public License" or "GPL" appears in the
+ copyright file for this package, but the copyright file does not
+ reference <tt>/usr/share/common-licenses</tt> as the location of the GPL
+ on Debian systems.
 
 Tag: copyright-lists-upstream-authors-with-dh_make-boilerplate
 Type: warning

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2006-04-12 03:38:21 UTC (rev 618)
+++ trunk/debian/changelog	2006-04-13 05:15:53 UTC (rev 619)
@@ -11,6 +11,12 @@
     + [RA] Include a list of known X metapackages.
   * checks/control-file{.desc,}:
     + [RA] Warn if debian/control in a source package is a symlink.
+  * checks/copyright-file{.desc,}:
+    + [RA] Don't assume mentions of GPL or GNU General Public License
+      after what look like mail headers are referring to the license of
+      the package.  Be a bit more specific in the old FSF address check
+      to avoid false positives on other Cambridge, MA addresses.  Reported
+      by Adam C. Powell IV.  (Closes: #205934)
   * checks/debconf:
     + [RA] Allow Indices as a template field.  cdebconf uses it and
       debconf ignores it.  Reported by Frans Pop.  (Closes: #361986)