[SCM] Git repository for devscripts branch, master, updated. v2.12.0-21-gcbc235e

[Benjamin Drung]

The following commit has been merged in the master branch:
commit 5a5c3bb36796944b22adde2e04f571c27c7fdcc3
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Tue Jun 26 23:40:18 2012 +0300

    licensecheck: Trim trailing comma from some GPL notices' versions.
    
    For example: ...the GNU General Public License, version 2, as published by...

diff --git a/scripts/licensecheck.pl b/scripts/licensecheck.pl
index a865c8d..ec3dc1c 100755
--- a/scripts/licensecheck.pl
+++ b/scripts/licensecheck.pl
@@ -405,8 +405,8 @@ sub parselicense($) {
     my $extrainfo = "";
     my $license = "";
 
-    if ($licensetext =~ /version ([^ ]+) (?:\(?only\)?.? )?(?:of the GNU (Affero )?(Lesser |Library )?General Public License )?(as )?published by the Free Software Foundation/i or
-	$licensetext =~ /GNU (?:Affero )?(?:Lesser |Library )?General Public License (?:as )?published by the Free Software Foundation; version ([^ ]+) /i) {
+    if ($licensetext =~ /version ([^, ]+),? (?:\(?only\)?.? )?(?:of the GNU (Affero )?(Lesser |Library )?General Public License )?(as )?published by the Free Software Foundation/i or
+	$licensetext =~ /GNU (?:Affero )?(?:Lesser |Library )?General Public License (?:as )?published by the Free Software Foundation; version ([^, ]+),? /i) {
 
 	$gplver = " (v$1)";
     } elsif ($licensetext =~ /GNU (?:Affero )?(?:Lesser |Library )?General Public License, version (\d+(?:\.\d+)?)[ \.]/) {

-- 
Git repository for devscripts