[SCM] Git repository for devscripts branch, master, updated. v2.12.4-158-g9c50b74

[Benjamin Drung]

The following commit has been merged in the master branch:
commit 9c50b743db7701558f11f04b72851462575c824f
Author: Benjamin Drung <bdrung at debian.org>
Date:   Sun Feb 17 18:33:24 2013 +0100

    licensecheck: detect (L)GPL licenses more permissively.
    
    Thanks: Laurent Rineau
    Closes: #659231

diff --git a/debian/changelog b/debian/changelog
index d7bb513..c5c3596 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -48,6 +48,8 @@ devscripts (2.13.0) UNRELEASED; urgency=low
   * wrap-and-sort:
     + Put special entries (variables and placeholders) at the end of the list.
     + Sort debian/control*.in files too.
+  * licensecheck: detect (L)GPL licenses more permissively. Thanks to
+    Laurent Rineau for the patch. (Closes: #659231)
 
   [ Cyril Brulebois ]
   * Don't auto reverse diffs when DEBDIFF_AUTO_VER_SORT is set to yes, and
diff --git a/scripts/licensecheck.pl b/scripts/licensecheck.pl
index 2758031..1a209e7 100755
--- a/scripts/licensecheck.pl
+++ b/scripts/licensecheck.pl
@@ -450,7 +450,7 @@ sub parselicense {
 	$license = "GENERATED FILE";
     }
 
-    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) {
+    if ($licensetext =~ /((is free software.? )?[Yy]ou can redistribute it and\/or modify it|is licensed) under the terms of (version [^ ]+ of )?the (GNU (Library |Lesser )General Public License|LGPL)/i) {
 	$license = "LGPL$gplver$extrainfo $license";
     }
 
@@ -458,7 +458,7 @@ sub parselicense {
 	$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 and\/or modify it under the terms of (?:version [^ ]+ (?:\(?only\)? )?of )?the GNU General Public License/i) {
 	$license = "GPL$gplver$extrainfo $license";
     }
 
@@ -473,7 +473,7 @@ sub parselicense {
 
     if ($licensetext =~ /This file is part of the .*Qt GUI Toolkit. This file may be distributed under the terms of the Q Public License as defined/) {
 	$license = "QPL (part of Qt) $license";
-    } elsif ($licensetext =~ /may be distributed under the terms of the Q Public License as defined/) {
+    } elsif ($licensetext =~ /may (be distributed|redistribute it) under the terms of the Q Public License/) {
 	$license = "QPL $license";
     }
 
diff --git a/test/licensecheck/gpl-variation.c b/test/licensecheck/gpl-variation.c
new file mode 100644
index 0000000..c0b82d6
--- /dev/null
+++ b/test/licensecheck/gpl-variation.c
@@ -0,0 +1,13 @@
+// Copyright (c) 2013 Devscripts developers
+// All rights reserved.
+//
+// This file is part of Devscripts.
+// You can redistribute it and/or modify it under the terms of the GNU
+// General Public License as published by the Free Software Foundation,
+// either version 3 of the License, or (at your option) any later version.
+//
+// Licensees holding a valid commercial license may use this file in
+// accordance with the commercial license agreement provided with the software.
+//
+// This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+// WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
diff --git a/test/licensecheck/lgpl-variation.c b/test/licensecheck/lgpl-variation.c
new file mode 100644
index 0000000..80ba416
--- /dev/null
+++ b/test/licensecheck/lgpl-variation.c
@@ -0,0 +1,12 @@
+// Copyright (c) 2013 Devscripts developers. All rights reserved.
+//
+// This file is part of Devscripts; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public License as
+// published by the Free Software Foundation; either version 3 of the License,
+// or (at your option) any later version.
+//
+// Licensees holding a valid commercial license may use this file in
+// accordance with the commercial license agreement provided with the software.
+//
+// This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+// WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
diff --git a/test/test_licensecheck b/test/test_licensecheck
index f289fbe..c965413 100755
--- a/test/test_licensecheck
+++ b/test/test_licensecheck
@@ -47,6 +47,7 @@ testLGPL() {
     license "lgpl-2.1.c" "LGPL (v2.1)"
     license "lgpl-2.1.h" "LGPL (v2.1)"
     license "lgpl-2.s" "LGPL (v2)"
+    license "lgpl-variation.c" "LGPL (v3 or later)"
 }
 
 testGPL() {
@@ -59,6 +60,7 @@ testGPL() {
     license "gpl-3.sh" "GPL (v3)"
     license "gpl-3+" "GPL (v3 or later)"
     license "gpl-3-only.c" "GPL (v3)"
+    license "gpl-variation.c" "GPL (v3 or later)"
 }
 
 testDual() {

-- 
Git repository for devscripts