Author: adsb
Date: 2009-04-16 21:45:46 +0000 (Thu, 16 Apr 2009)
New Revision: 1860
Modified:
trunk/debian/changelog
trunk/scripts/licensecheck.pl
Log:
licensecheck: Add detection of the AGPL. Thanks, Didier Raboud.
(Closes: #520903)
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2009-04-16 21:11:28 UTC (rev 1859)
+++ trunk/debian/changelog 2009-04-16 21:45:46 UTC (rev 1860)
@@ -4,6 +4,8 @@
* getbuildlog: Add a missing "use lib" to allow the special "last" and
"last-all" versions to work correctly. Thanks, Iustin Pop.
(Closes: #523982)
+ * licensecheck: Add detection of the AGPL. Thanks, Didier Raboud.
+ (Closes: #520903)
* rmadison: Allow a default URL to be specified in the configuration file.
Thanks, Roland Mas. (Closes: #524198)
Modified: trunk/scripts/licensecheck.pl
===================================================================
--- trunk/scripts/licensecheck.pl 2009-04-16 21:11:28 UTC (rev 1859)
+++ trunk/scripts/licensecheck.pl 2009-04-16 21:45:46 UTC (rev 1860)
@@ -386,11 +386,11 @@
my $extrainfo = "";
my $license = "";
- if ($licensetext =~ /version ([^ ]+) (?:\(?only\)?.? )?(?:of the GNU
General Public License )?as published by the Free Software Foundation/i or
- $licensetext =~ /GNU General Public License as published by the Free
Software Foundation; version ([^ ]+) /i) {
+ if ($licensetext =~ /version ([^ ]+) (?:\(?only\)?.? )?(?:of the GNU
(Affero )?General Public License )?as published by the Free Software
Foundation/i or
+ $licensetext =~ /GNU (Affero )?General Public License as published by
the Free Software Foundation; version ([^ ]+) /i) {
$gplver = " (v$1)";
- } elsif ($licensetext =~ /GNU General Public License, version ([^ ]+?)[
.]/) {
+ } elsif ($licensetext =~ /GNU (Affero ?)General Public License, version
([^ ]+?)[ .]/) {
$gplver = " (v$1)";
} elsif ($licensetext =~ /either version ([^ ]+) of the License, or \(at
your option\) any later version/) {
$gplver = " (v$1 or later)";
@@ -411,6 +411,10 @@
if ($licensetext =~ /is free software.? you can redistribute it and\/or
modify it under the terms of the (GNU (Library|Lesser) General Public
License|LGPL)/i) {
$license = "LGPL$gplver$extrainfo $license";
}
+
+ if ($licensetext =~ /is free software.? you can redistribute it and\/or
modify it under the terms of the (GNU Affero General Public License|AGPL)/i) {
+ $license = "AGPL$gplver$extrainfo $license";
+ }
if ($licensetext =~ /is free software.? you (can|may) redistribute it
and\/or modify it under the terms of (?:version [^ ]+ (?:\(?only\)? )?of )?the
GNU General Public License/i) {
$license = "GPL$gplver$extrainfo $license";
--
To unsubscribe, send mail to [email protected].
