[SCM] Git repository for devscripts branch, master, updated. v2.11.7-47-g3b44148

[Benjamin Drung]

The following commit has been merged in the master branch:
commit bfc3debf7cc5741838ddc0f9c297060a0165cff8
Author: Kees Cook <kees at debian.org>
Date:   Thu May 31 14:43:29 2012 +0200

    licensecheck: Catch LGPL more robustly.
    
    Closes: #623283
    Signed-off-by: Benjamin Drung <bdrung at debian.org>

diff --git a/debian/changelog b/debian/changelog
index c8c78ca..978f015 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -54,6 +54,9 @@ devscripts (2.11.8) UNRELEASED; urgency=low
   [ Raphael Geissert ]
   * dget: ignore duplicate repository URLs. (Closes: #675258)
 
+  [ Kees Cook ]
+  * licensecheck: Catch LGPL more robustly. (Closes: #623283)
+
  -- Benjamin Drung <bdrung at debian.org>  Mon, 28 May 2012 17:14:12 +0200
 
 devscripts (2.11.7) unstable; urgency=low
diff --git a/scripts/licensecheck.pl b/scripts/licensecheck.pl
index 9f5de0c..0780b27 100755
--- a/scripts/licensecheck.pl
+++ b/scripts/licensecheck.pl
@@ -388,11 +388,11 @@ sub parselicense($) {
     my $extrainfo = "";
     my $license = "";
 
-    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) {
+    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 ?)General Public License, version ([^ ]+?)[ .]/) {
+    } elsif ($licensetext =~ /GNU (?:Affero )?(?:Lesser |Library )?General Public License, version (\d+(?:\.\d+)?)[ \.]/) {
 	$gplver = " (v$1)";
     } elsif ($licensetext =~ /either version ([^ ]+)(?: of the License)?, or \(at your option\) any later version/) {
 	$gplver = " (v$1 or later)";
@@ -410,7 +410,7 @@ sub parselicense($) {
 	$license = "GENERATED FILE";
     }
 
-    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) {
+    if ($licensetext =~ /is (free software.? you can redistribute it and\/or modify it|licensed) under the terms of (version [^ ]+ of )?the (GNU (Library |Lesser )General Public License|LGPL)/i) {
 	$license = "LGPL$gplver$extrainfo $license";
     }
 

-- 
Git repository for devscripts