[devscripts] 01/01: Resolved failure to find license from Software::License generated files from Artistic licenses

[Nicholas Bamber]

This is an automated email from the git hooks/post-receive script.

periapt pushed a commit to branch master
in repository devscripts.

commit af2a56792492eb8bf6d248bb5518433ffc2b7920
Author: Nicholas Bamber <nicholas at periapt.co.uk>
Date:   Sat Nov 28 12:48:06 2015 +0000

    Resolved failure to find license from Software::License generated files from Artistic licenses
---
 debian/changelog          | 2 ++
 scripts/licensecheck.pl   | 2 +-
 test/test_licensecheck_SL | 4 ++--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fa6cad5..c34579a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,8 @@ devscripts (2.15.10) UNRELEASED; urgency=medium
     - Tweaked parselicense to capture 'and or' as well as
       'and/or' in GPL licenses (Closes: #559429)
     - Added test for licensecheck versus Software::License
+    - Resolved failure to find license from Software::License generated
+      files from Artistic licenses
 
   [ Dominique Dumont ]
   * licensecheck:
diff --git a/scripts/licensecheck.pl b/scripts/licensecheck.pl
index e84a171..2109818 100755
--- a/scripts/licensecheck.pl
+++ b/scripts/licensecheck.pl
@@ -600,7 +600,7 @@ sub parselicense {
 	$license = "MPL (v$2) $license";
     }
 
-    if ($licensetext =~ /Released under the terms of the Artistic License ([^ ]+)/) {
+    if ($licensetext =~ /(?:This is free software, licensed|Released) under (?:the terms of )?[Tt]he Artistic License ([^ ]+)/) {
 	$license = "Artistic (v$1) $license";
     }
 
diff --git a/test/test_licensecheck_SL b/test/test_licensecheck_SL
index da42ee3..ddf3613 100755
--- a/test/test_licensecheck_SL
+++ b/test/test_licensecheck_SL
@@ -24,8 +24,8 @@ my %LICENSES = (
     Zlib=>'zlib/libpng',
     CC0_1_0=>'UNKNOWN',
     GFDL_1_3=>'UNKNOWN',
-    Artistic_1_0=>'UNKNOWN',
-    Artistic_2_0=>'UNKNOWN',
+    Artistic_1_0=>'Artistic (v1.0)',
+    Artistic_2_0=>'Artistic (v2.0)',
     Mozilla_1_0=>'UNKNOWN',
     None=>'UNKNOWN',
     PostgreSQL=>'UNKNOWN',

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/devscripts.git