[devscripts] 01/01: files from Artistic and Mozilla licenses
Nicholas Bamber
periapt at moszumanska.debian.org
Sun Nov 29 18:36:20 UTC 2015
This is an automated email from the git hooks/post-receive script.
periapt pushed a commit to branch master
in repository devscripts.
commit 0b12e267b0269421bfaf67e510a2c80a3662d922
Author: Nicholas Bamber <nicholas at periapt.co.uk>
Date: Sun Nov 29 18:36:01 2015 +0000
files from Artistic and Mozilla licenses
files from Artistic and Mozilla licenses
---
debian/changelog | 2 +-
scripts/licensecheck.pl | 7 +++++--
test/test_licensecheck_SL | 4 ++--
3 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 0026e05..373669e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,7 +25,7 @@ devscripts (2.15.10) UNRELEASED; urgency=medium
'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
+ files from Artistic and Mozilla licenses
[ Dominique Dumont ]
* licensecheck:
diff --git a/scripts/licensecheck.pl b/scripts/licensecheck.pl
index 2109818..f744abc 100755
--- a/scripts/licensecheck.pl
+++ b/scripts/licensecheck.pl
@@ -596,8 +596,11 @@ sub parselicense {
}
}
- if ($licensetext =~ /Mozilla Public License,? (Version|v\.) (\d+(?:\.\d+)?)/) {
- $license = "MPL (v$2) $license";
+ if ($licensetext =~ /Mozilla Public License,? (?:(?:Version|v\.)\s+)?(\d+(?:\.\d+)?)/) {
+ $license = "MPL (v$1) $license";
+ }
+ elsif ($licensetext =~ /Mozilla Public License,? \((?:Version|v\.) (\d+(?:\.\d+)?)\)/) {
+ $license = "MPL (v$1) $license";
}
if ($licensetext =~ /(?:This is free software, licensed|Released) under (?:the terms of )?[Tt]he Artistic License ([^ ]+)/) {
diff --git a/test/test_licensecheck_SL b/test/test_licensecheck_SL
index ddf3613..a07a28a 100755
--- a/test/test_licensecheck_SL
+++ b/test/test_licensecheck_SL
@@ -26,13 +26,13 @@ my %LICENSES = (
GFDL_1_3=>'UNKNOWN',
Artistic_1_0=>'Artistic (v1.0)',
Artistic_2_0=>'Artistic (v2.0)',
- Mozilla_1_0=>'UNKNOWN',
+ Mozilla_1_0=>'MPL (v1.0)',
None=>'UNKNOWN',
PostgreSQL=>'UNKNOWN',
AGPL_3=>'UNKNOWN',
SSLeay=>'BSD (2 clause)',
Apache_1_1=>'UNKNOWN',
- Mozilla_1_1=>'UNKNOWN',
+ Mozilla_1_1=>'MPL (v1.1)',
GFDL_1_2=>'UNKNOWN',
Sun=>'UNKNOWN',
BSD=>'UNKNOWN',
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/devscripts.git
More information about the devscripts-devel
mailing list