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

lintian: r1037 - in trunk: checks debian

Author: rra
Date: 2007-12-04 07:05:03 +0100 (Tue, 04 Dec 2007)
New Revision: 1037

Modified:
   trunk/checks/copyright-file
   trunk/checks/copyright-file.desc
   trunk/debian/changelog
Log:
  + [RA] Check for the complete GFDL included in the copyright file and
    expand copyright-file-contains-full-gpl-license to look for GPL v3
    references.  Also check for correct references to common-licenses
    for the GFDL and LGPL.

Modified: trunk/checks/copyright-file
===================================================================
--- trunk/checks/copyright-file	2007-12-04 05:35:54 UTC (rev 1036)
+++ trunk/checks/copyright-file	2007-12-04 06:05:03 UTC (rev 1037)
@@ -175,11 +175,18 @@
     tag "old-fsf-address-in-copyright-file", "";
 }
 
-if (length($_) > 12000 and
-    m/\bGNU GENERAL PUBLIC LICENSE\s*TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION\b/m and m/\bVersion 2\b/) {
-    tag "copyright-file-contains-full-gpl-license", "";
+if (length($_) > 12000
+    and ((m/\bGNU GENERAL PUBLIC LICENSE\s*TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION\b/m
+          and m/\bVersion 2\s/)
+         or (m/\bGNU GENERAL PUBLIC LICENSE\s*Version 3/ and m/\bTERMS AND CONDITIONS\s/))) {
+    tag "copyright-file-contains-full-gpl-license";
 }
 
+if (length($_) > 12000
+    and m/\bGNU Free Documentation License\s*Version 1\.2/ and m/\b1\. APPLICABILITY AND DEFINITIONS/) {
+    tag "copyright-file-contains-full-gfdl-license";
+}
+
 if (m/^This copyright info was automatically extracted from the perl module\./) {
     tag "helper-templates-in-copyright", "";
 }
@@ -199,20 +206,27 @@
 # 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
-    && !m/AFFERO GENERAL PUBLIC LICENSE/
-    && !$wrong_directory_detected) {
-    tag "copyright-should-refer-to-common-license-file-for-gpl", "";
+if (m,/usr/share/common-licenses,
+    || m/Zope Public License/
+    || m/LICENSE AGREEMENT FOR PYTHON 1.6.1/
+    || m/LaTeX Project Public License/
+    || m/(^From:.*^To:|^To:.*^From:).*(GNU General Public License|GPL)/ms
+    || m/AFFERO GENERAL PUBLIC LICENSE/
+    || $wrong_directory_detected) {
+    # False positive or correct reference.  Ignore.
+} elsif (m/GNU Free Documentation License/i or m/\bGFDL\b/) {
+    tag "copyright-should-refer-to-common-license-file-for-gfdl";
+} elsif (m/GNU (Lesser|Library) General Public License/i or m/\bLGPL\b/) {
+    tag "copyright-should-refer-to-common-license-file-for-lgpl";
+} elsif (m/GNU General Public License/i or m/\bGPL\b/) {
+    tag "copyright-should-refer-to-common-license-file-for-gpl";
 }
 
 if (m,Upstream Author\(s\),) {
-    tag "copyright-lists-upstream-authors-with-dh_make-boilerplate", "";
+    tag "copyright-lists-upstream-authors-with-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\.}) {
     tag "copyright-contains-dh_make-todo-boilerplate", "";
 }
 

Modified: trunk/checks/copyright-file.desc
===================================================================
--- trunk/checks/copyright-file.desc	2007-12-04 05:35:54 UTC (rev 1036)
+++ trunk/checks/copyright-file.desc	2007-12-04 06:05:03 UTC (rev 1037)
@@ -42,10 +42,17 @@
 Tag: copyright-file-contains-full-gpl-license
 Type: error
 Info: The copyright file /usr/share/doc/<i>pkg</i>/copyright contains the
- complete text of the GPL.  It should refer to the file
- <tt>/usr/share/common-licenses/GPL</tt> instead.
+ complete text of the GPL v2 or v3.  It should refer to the file
+ <tt>/usr/share/common-licenses/GPL-2</tt> or <tt>GPL-3</tt> instead.
 Ref: policy 12.5
 
+Tag: copyright-file-contains-full-gfdl-license
+Type: error
+Info: The copyright file /usr/share/doc/<i>pkg</i>/copyright contains the
+ complete text of the GFDL v1.2.  It should refer to the file
+ <tt>/usr/share/common-licenses/GFDL-1.2</tt> instead.
+Ref: policy 12.5
+
 Tag: usr-share-doc-symlink-without-dependency
 Type: error
 Info: If the package installs a symbolic link /usr/share/doc/<i>pkg1</i> -&gt;
@@ -132,11 +139,28 @@
 Tag: copyright-should-refer-to-common-license-file-for-gpl
 Type: error
 Ref: policy 12.5
-Info: The string "GNU General Public License" or "GPL" appears in the
+Info: The strings "GNU General Public License" or "GPL" appear 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-should-refer-to-common-license-file-for-gfdl
+Type: error
+Ref: policy 12.5
+Info: The strings "GNU Free Documentation License" or "GFDL" appear 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 GFDL
+ on Debian systems.
+
+Tag: copyright-should-refer-to-common-license-file-for-lgpl
+Type: error
+Ref: policy 12.5
+Info: The strings "GNU Lesser General Public License", "GNU Library
+ General Public License", or "LGPL" appear 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 LGPL on Debian
+ systems.
+
 Tag: copyright-lists-upstream-authors-with-dh_make-boilerplate
 Type: warning
 Info: There is "Upstream Author(s)" in your copyright file. This was most

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2007-12-04 05:35:54 UTC (rev 1036)
+++ trunk/debian/changelog	2007-12-04 06:05:03 UTC (rev 1037)
@@ -25,6 +25,10 @@
            if the maintainer left the dh_make boilerplate in the
            copyright file. Based on patch by Cyril Brulebois
            <cyril.brulebois@enst-bretagne.fr>. (Closes: #448677)
+    + [RA] Check for the complete GFDL included in the copyright file and
+      expand copyright-file-contains-full-gpl-license to look for GPL v3
+      references.  Also check for correct references to common-licenses
+      for the GFDL and LGPL.
   * checks/deb-format:
     + [HE] Remove, not needed any more. (Closes: #447257)
   * checks/debconf:
Reply to: