[devscripts] 01/01: licensecheck: tweaked to parse Artistic 2.0 license file

[dod at debian.org]

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

dod pushed a commit to branch master
in repository devscripts.

commit b6a75ce86adf3ad7f943943078b12b54da00ddbc
Author: Dominique Dumont <dod at debian.org>
Date:   Sat Dec 19 18:45:30 2015 +0100

    licensecheck: tweaked to parse Artistic 2.0 license file
---
 debian/changelog        | 1 +
 scripts/licensecheck.pl | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 32c085a..074ff7a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -53,6 +53,7 @@ devscripts (2.15.10) UNRELEASED; urgency=medium
     + parse .lisp file (part of #806424)
     + added LLGPL license (part of #806424)
     + also parse last 5kb of a file
+    * tweaked to parse Artistic 2.0 license file
 
   [ Osamu Aoki ]
   * uscan:
diff --git a/scripts/licensecheck.pl b/scripts/licensecheck.pl
index b71443b..221cb87 100755
--- a/scripts/licensecheck.pl
+++ b/scripts/licensecheck.pl
@@ -666,7 +666,7 @@ sub parselicense {
         $license = "MPL (v$1) $license";
     }
 
-    if ($licensetext =~ /(?:This is free software, licensed|Released) under (?:the terms of )?[Tt]he Artistic License ([^ ]+)/) {
+    if ($licensetext =~ /(?:^|(?:This is free software, licensed|Released) under (?:the terms of )?)?[Tt]he Artistic License ([v\d.]+)/) {
 	$license = "Artistic (v$1) $license";
     }
 

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