[SCM] Git repository for devscripts branch, master, updated. v2.12.4-169-g4d71afa

Benjamin Drung bdrung at debian.org
Tue Feb 19 16:24:25 UTC 2013


The following commit has been merged in the master branch:
commit b61b22f8a659b8043178ae2c85c80cccb2884351
Author: Laurent Rineau <laurent.rineau at cgal.org>
Date:   Tue Feb 19 15:14:54 2013 +0100

    Fix the detection of (L|A)GPL.
    
    The wording can be about files (plural) instead of a software (singular).

diff --git a/scripts/licensecheck.pl b/scripts/licensecheck.pl
index 8d31626..f2c076b 100755
--- a/scripts/licensecheck.pl
+++ b/scripts/licensecheck.pl
@@ -450,15 +450,15 @@ sub parselicense {
 	$license = "GENERATED FILE";
     }
 
-    if ($licensetext =~ /((is free software.? )?you can redistribute it and\/or modify it|is licensed) under the terms of (version [^ ]+ of )?the (GNU (Library |Lesser )General Public License|LGPL)/i) {
+    if ($licensetext =~ /((is free software.? )?you can redistribute (it|them) and\/or modify (it|them)|is licensed) under the terms of (version [^ ]+ 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) {
+    if ($licensetext =~ /is free software.? you can redistribute (it|them) and\/or modify (it|them) 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) {
+    if ($licensetext =~ /(is free software.? )?you (can|may) redistribute (it|them) and\/or modify (it|them) under the terms of (?:version [^ ]+ (?:\(?only\)? )?of )?the GNU General Public License/i) {
 	$license = "GPL$gplver$extrainfo $license";
     }
 

-- 
Git repository for devscripts



More information about the devscripts-devel mailing list