[SCM] Debian package checker branch, master, updated. 2.2.6-68-ga710092
The following commit has been merged in the master branch:
commit d14277098893eed15cf5f74b729538bf39a65acb
Author: Russ Allbery <rra@debian.org>
Date: Sun Mar 8 17:40:22 2009 -0700
Avoid some versionless GPL reference false positives
* checks/copyright-file
+ [RA] Don't warn about versionless GPL references if the word version
appears nowhere in the copyright file.
diff --git a/checks/copyright-file b/checks/copyright-file
index 2bb6460..07b70ab 100644
--- a/checks/copyright-file
+++ b/checks/copyright-file
@@ -152,6 +152,11 @@ if (m,(usr/share/common-licenses/(?:GPL|LGPL|BSD|Artistic)\.gz),) {
# 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,) {
my ($ref, $license, $separator) = ($1, $2, $3);
@@ -161,7 +166,8 @@ if (m,(usr/share/common-licenses/(L?GPL|GFDL))([^-]),i && !m,as Perl itself,i
|| m,License: $license-[\d\.]+\+,i) {
tag "copyright-refers-to-symlink-license", $ref;
} else {
- tag "copyright-refers-to-versionless-license-file", $ref;
+ tag "copyright-refers-to-versionless-license-file", $ref
+ if /\bversion\b/;
}
}
diff --git a/debian/changelog b/debian/changelog
index 232a4e8..fffed15 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -38,6 +38,8 @@ lintian (2.2.7) UNRELEASED; urgency=low
+ [RA] Allow commas between the GFDL license name and version when
suppressing false positives for the 1.1 version. Thanks, Aurelien
Jarno. (Closes: #516687)
+ + [RA] Don't warn about versionless GPL references if the word version
+ appears nowhere in the copyright file.
* checks/cruft:
+ [RA] Be robust against whitespace in the Architecture field.
* checks/debconf:
diff --git a/t/tests/copyright-file-general/debian/debian/control.in b/t/tests/copyright-file-general/debian/debian/control.in
index ae5a1cd..265809c 100644
--- a/t/tests/copyright-file-general/debian/debian/control.in
+++ b/t/tests/copyright-file-general/debian/debian/control.in
@@ -126,3 +126,13 @@ Description: this should not emit any error
This is a test package designed to exercise some feature or tag of
Lintian. It is part of the Lintian test suite and may do very odd
things. It should not be installed like a regular package.
+
+Package: copyright-versionless
+Architecture: all
+Depends: $\{shlibs:Depends\}, $\{misc:Depends\}
+Description: checks a valid versionless GPL reference
+ Refers to the GPL and truly doesn't mention any version.
+ .
+ This is a test package designed to exercise some feature or tag of
+ Lintian. It is part of the Lintian test suite and may do very odd
+ things. It should not be installed like a regular package.
diff --git a/t/tests/copyright-file-general/debian/debian/copyright-versionless.copyright b/t/tests/copyright-file-general/debian/debian/copyright-versionless.copyright
new file mode 100644
index 0000000..c08f501
--- /dev/null
+++ b/t/tests/copyright-file-general/debian/debian/copyright-versionless.copyright
@@ -0,0 +1,2 @@
+This package is copyright (c) 2009, Some Name <example@example.org> and is
+licensed under the GPL, see `/usr/share/common-licenses/GPL'.
--
Debian package checker
Reply to: