[SCM] Debian package checker branch, master, updated. 2.0.0-rc1-1-gcd4c0e8
The following commit has been merged in the master branch:
commit cd4c0e898ef01cb899bce11c356cdb6bf0ebceaa
Author: Frank Lichtenheld <djpig@debian.org>
Date: Tue Sep 16 19:36:19 2008 +0200
checks/copyright-file: Also detect v1.1 of CeCILL license, not only v2.0
Closes: #498994
diff --git a/checks/copyright-file b/checks/copyright-file
index f3eee1b..3b5430e 100644
--- a/checks/copyright-file
+++ b/checks/copyright-file
@@ -229,7 +229,8 @@ if (m,/usr/share/common-licenses,
|| 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/CeCILL FREE SOFTWARE LICENSE AGREEMENT/
+ || 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/
diff --git a/debian/changelog b/debian/changelog
index 9a56cc7..7b8a81c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+lintian (2.0.0) unstable; urgency=low
+
+ * checks/copyright-file:
+ + [FL] Also detect v1.1 of CeCILL license, not only v2.0.
+ (Closes: #498994)
+
+ -- Frank Lichtenheld <djpig@debian.org> Tue, 16 Sep 2008 19:34:29 +0200
+
lintian (2.0.0~rc1) experimental; urgency=low
* [FL] Merge the results of the GSoC project by Jordà Polo,
--
Debian package checker
Reply to: