[SCM] Debian package checker branch, master, updated. 2.4.2-47-g7cf10de
The following commit has been merged in the master branch:
commit 14c164ba1248fd0d2fd11b2dc71812ff5db5bb91
Author: Russ Allbery <rra@debian.org>
Date: Sun Jul 25 21:17:05 2010 -0700
Remove exceptions for GPLv1
* checks/copyright-file{,.desc}:
+ [RA] Remove exceptions for GPL v1, which is now in common-licenses
and mentioned in Policy 3.9.1.
diff --git a/checks/copyright-file b/checks/copyright-file
index 0d3aedd..336d0f4 100644
--- a/checks/copyright-file
+++ b/checks/copyright-file
@@ -158,23 +158,19 @@ if (m,(usr/share/common-licenses/(?:GPL|LGPL|BSD|Artistic)\.gz),) {
tag "copyright-refers-to-compressed-license", $1;
}
-# Allow generic GPL references for packages licensed under the same terms as
-# Perl for now. Perl references GPL version 1, which isn't in
-# common-licenses.
-#
# Avoid complaining about referring to a versionless license file if the word
# "version" appears nowhere in the copyright file. This won't catch all of
# 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:\s+Artistic\s+or\s+GPL-1\+,
- && !m,License:\s+Perl,) {
+if (m,(usr/share/common-licenses/(L?GPL|GFDL))([^-]),i) {
my ($ref, $license, $separator) = ($1, $2, $3);
if ($separator =~ /[\d\w]/) {
tag 'copyright-refers-to-nonexistent-license-file', "$ref$separator";
} elsif (m,\b(?:any|or)\s+later(?:\s+version)?\b,i
- || m,License: $license-[\d\.]+\+,i) {
+ || m,License: $license-[\d\.]+\+,i
+ || m,as Perl itself,i
+ || m,License-Alias:\s+Perl,
+ || m,License:\s+Perl,) {
tag "copyright-refers-to-symlink-license", $ref;
} else {
tag "copyright-refers-to-versionless-license-file", $ref
@@ -213,8 +209,7 @@ if (m/(?:Free\s*Software\s*Foundation.*02139|02111-1307)/s) {
my $gpl;
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/)
+ and (m/\bGNU GENERAL PUBLIC LICENSE\s*TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION\b/m
or (m/\bGNU GENERAL PUBLIC LICENSE\s*Version 3/ and m/\bTERMS AND CONDITIONS\s/))) {
tag "copyright-file-contains-full-gpl-license";
$gpl = 1;
@@ -251,7 +246,6 @@ if (m,/usr/share/common-licenses,
|| m/CeCILL FREE SOFTWARE LICENSE AGREEMENT/ #v2.0
|| m/FREE SOFTWARE LICENSING AGREEMENT CeCILL/ #v1.1
|| m/CNRI OPEN SOURCE GPL-COMPATIBLE LICENSE AGREEMENT/
- || m/GNU GENERAL PUBLIC LICENSE\s+Version 1/
|| m/compatible\s+with\s+(?:the\s+)?(?:GNU\s+)?GPL/
|| m/(?:GNU\s+)?GPL\W+compatible/
|| m/was\s+previously\s+(?:distributed\s+)?under\s+the\s+GNU/
diff --git a/checks/copyright-file.desc b/checks/copyright-file.desc
index 8ff1a29..ab86bd8 100644
--- a/checks/copyright-file.desc
+++ b/checks/copyright-file.desc
@@ -46,8 +46,9 @@ Tag: copyright-file-contains-full-gpl-license
Severity: important
Certainty: certain
Info: The copyright file /usr/share/doc/<i>pkg</i>/copyright contains the
- 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.
+ complete text of the GPL v1, v2, or v3. It should refer to the file
+ <tt>/usr/share/common-licenses/GPL-1</tt>, <tt>GPL-2</tt>, or
+ <tt>GPL-3</tt> instead.
Ref: policy 12.5
Tag: copyright-file-contains-full-gfdl-license
@@ -347,6 +348,9 @@ Info: The copyright file refers to the versionless symlink in
published by the Free Software Foundation; either version 2, or (at your
option) any later version", the <tt>debian/copyright</tt> file should
refer to <tt>/usr/share/common-licenses/GPL-2</tt>, not <tt>/GPL</tt>.
+ .
+ For packages released under the same terms as Perl, Perl references the
+ GPL version 1, so point to <tt>/usr/share/common-licenses/GPL-1</tt>.
Tag: copyright-refers-to-versionless-license-file
Severity: normal
diff --git a/debian/changelog b/debian/changelog
index 3627890..8119d66 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,9 +18,11 @@ lintian (2.4.3) UNRELEASED; urgency=low
files ending in a trailing blank line. (Closes: #586816)
* checks/control-files.desc:
+ [RA] Add references to Policy requirements added in 3.9.1.
- * checks/copyright-file.desc:
+ * checks/copyright-file{,.desc}:
+ [RA] Add examples for copyright-without-copyright-notice. Based on
a patch by Jari Aalto. (Closes: #580767)
+ + [RA] Remove exceptions for GPL v1, which is now in common-licenses
+ and mentioned in Policy 3.9.1.
* checks/cruft.desc:
+ [RA] Add some hints to the ancient-libtool long description on how
to update the libtool files oneself. (Closes: #580767)
diff --git a/t/tests/copyright-file-general/tags b/t/tests/copyright-file-general/tags
index 0a43f11..8a45a0f 100644
--- a/t/tests/copyright-file-general/tags
+++ b/t/tests/copyright-file-general/tags
@@ -2,6 +2,7 @@ E: copyright-compressed: copyright-file-compressed
E: copyright-full-apache-2: copyright-file-contains-full-apache-2-license
E: copyright-full-gfdl: copyright-file-contains-full-gfdl-license
E: copyright-full-gfdl: copyright-should-refer-to-common-license-file-for-gfdl
+E: copyright-full-gpl-1: copyright-should-refer-to-common-license-file-for-gpl
E: copyright-full-gpl: copyright-file-contains-full-gpl-license
E: copyright-full-gpl: copyright-should-refer-to-common-license-file-for-gpl
E: copyright-misc-errors: copyright-refers-to-compressed-license usr/share/common-licenses/BSD.gz
--
Debian package checker
Reply to: