The following commit has been merged in the master branch:
commit f479668c0c397fa53d14110fe07fa3310b9a6872
Author: Ville Skyttä <[email protected]>
Date: Sun Dec 18 23:41:34 2011 +0200
Recognize GPL version in notices without "of the License".
Signed-off-by: James McCoy <[email protected]>
diff --git a/scripts/licensecheck.pl b/scripts/licensecheck.pl
index 9ab1b59..9f5de0c 100755
--- a/scripts/licensecheck.pl
+++ b/scripts/licensecheck.pl
@@ -394,7 +394,7 @@ sub parselicense($) {
$gplver = " (v$1)";
} 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/) {
+ } elsif ($licensetext =~ /either version ([^ ]+)(?: of the License)?, or
\(at your option\) any later version/) {
$gplver = " (v$1 or later)";
}
--
Git repository for devscripts
--
To unsubscribe, send mail to [email protected].
