[SCM] Debian package checker branch, master, updated. 2.2.6-58-g63c78f2
The following commit has been merged in the master branch:
commit f00e5534655b6d42fdf24cce3b19a5e57272c327
Author: Russ Allbery <rra@debian.org>
Date: Sun Mar 8 14:44:35 2009 -0700
Fix false positives with GFDL 1.1
* checks/copyright-file:
+ [RA] Allow commas between the GFDL license name and version when
suppressing false positives for the 1.1 version. Thanks, Aurelien
Jarno. (Closes: #516687)
diff --git a/checks/copyright-file b/checks/copyright-file
index 6855164..2bb6460 100644
--- a/checks/copyright-file
+++ b/checks/copyright-file
@@ -224,7 +224,7 @@ if (m,/usr/share/common-licenses,
|| m/LaTeX Project Public License/
|| m/(?:^From:.*^To:|^To:.*^From:).*(?:GNU General Public License|GPL)/ms
|| m/AFFERO GENERAL PUBLIC LICENSE/
- || m/GNU Free Documentation License\s*Version 1\.1/
+ || m/GNU Free Documentation License[,\s]*Version 1\.1/
|| m/CeCILL FREE SOFTWARE LICENSE AGREEMENT/ #v2.0
|| m/FREE SOFTWARE LICENSING AGREEMENT CeCILL/ #v1.1
|| m/CNRI OPEN SOURCE GPL-COMPATIBLE LICENSE AGREEMENT/
diff --git a/debian/changelog b/debian/changelog
index 40fdbf4..8c0815f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,6 +28,9 @@ lintian (2.2.7) UNRELEASED; urgency=low
+ [RA] Avoid false positive for versionless license files when the
file is referred to without a hyphen; instead, issue a separate tag
that explains the problem. Based on a patch from Raphael Geissert.
+ + [RA] Allow commas between the GFDL license name and version when
+ suppressing false positives for the 1.1 version. Thanks, Aurelien
+ Jarno. (Closes: #516687)
* checks/cruft:
+ [RA] Be robust against whitespace in the Architecture field.
* checks/debconf:
--
Debian package checker
Reply to: