[SCM] Git repository for devscripts branch, master, updated. v2.12.0-7-g6f7561c

[Benjamin Drung]

The following commit has been merged in the master branch:
commit 6f7561c64273e2b0d0fdebff990cf99e814e3b7c
Author: Benjamin Drung <bdrung at debian.org>
Date:   Thu Jul 26 12:19:57 2012 +0200

    licensecheck: Don't truncate other licenses on Public domain or WTFPL presence.
    
    Thanks to Garrett Holmstrom from Fedora for the patch.

diff --git a/debian/changelog b/debian/changelog
index 33d84a6..cda95c7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+devscripts (2.12.2) UNRELEASED; urgency=low
+
+  * licensecheck: Don't truncate other licenses on Public domain or WTFPL
+    presence. Thanks to Garrett Holmstrom from Fedora for the patch.
+
+ -- Benjamin Drung <bdrung at debian.org>  Thu, 26 Jul 2012 12:17:51 +0200
+
 devscripts (2.12.1) unstable; urgency=low
 
   * debchange:
diff --git a/scripts/licensecheck.pl b/scripts/licensecheck.pl
index e9a1d77..92892b0 100755
--- a/scripts/licensecheck.pl
+++ b/scripts/licensecheck.pl
@@ -502,7 +502,7 @@ sub parselicense($) {
     }
 
     if ($licensetext =~ /is in the public domain/i) {
-	$license = "Public domain";
+	$license = "Public domain $license";
     }
 
     if ($licensetext =~ /terms of the Common Development and Distribution License(, Version ([^(]+))? \(the License\)/) {
@@ -530,15 +530,15 @@ sub parselicense($) {
     }
 
     if ($licensetext =~ /Do What The Fuck You Want To Public License, Version ([^, ]+)/i) {
-        $license = "WTFPL (v$1)";
+        $license = "WTFPL (v$1) $license";
     }
 
     if ($licensetext =~ /Do what The Fuck You Want To Public License/i) {
-        $license = "WTFPL";
+        $license = "WTFPL $license";
     }
 
     if ($licensetext =~ /(License WTFPL|Under (the|a) WTFPL)/i) {
-        $license = "WTFPL";
+        $license = "WTFPL $license";
     }
 
     $license = "UNKNOWN" if (!length($license));
diff --git a/test/licensecheck/dual.c b/test/licensecheck/dual.c
new file mode 100644
index 0000000..39df96b
--- /dev/null
+++ b/test/licensecheck/dual.c
@@ -0,0 +1,21 @@
+/*************************************************************************
+ * Copyright 2012 Devscripts developers
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see http://www.gnu.org/licenses/.
+ *
+ * This file may incorporate work that is in the public domain and/or
+ * covered under the following copyright and permission notice:
+ *
+ *   Written by devscripts developers and released to the public domain,
+ *   as explained at http://creativecommons.org/publicdomain/zero/1.0/
+ ************************************************************************/
diff --git a/test/test_licensecheck b/test/test_licensecheck
index cbd6acd..db652a8 100755
--- a/test/test_licensecheck
+++ b/test/test_licensecheck
@@ -37,4 +37,8 @@ testGPL() {
     license "gpl-2" "GPL (v2)"
 }
 
+testDual() {
+    license "dual.c" "Public domain GPL (v3)"
+}
+
 . shunit2

-- 
Git repository for devscripts