[libconfig-model-dpkg-perl] 01/02: Use "Artistic or GPL-1+" for Perl license
dod at debian.org
dod at debian.org
Thu Jul 13 18:30:06 UTC 2017
This is an automated email from the git hooks/post-receive script.
dod pushed a commit to branch master
in repository libconfig-model-dpkg-perl.
commit 8ceafe02a432f383b606e991908398095db6bc4c
Author: Dominique Dumont <dod at debian.org>
Date: Thu Jul 13 20:04:13 2017 +0200
Use "Artistic or GPL-1+" for Perl license
---
lib/Dpkg/Copyright/Scanner.pm | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/lib/Dpkg/Copyright/Scanner.pm b/lib/Dpkg/Copyright/Scanner.pm
index ec8b675..574b59c 100644
--- a/lib/Dpkg/Copyright/Scanner.pm
+++ b/lib/Dpkg/Copyright/Scanner.pm
@@ -239,11 +239,15 @@ sub scan_files ( %args ) {
$l =~ s/\bBSD \((\d) clause\)/BSD-$1-clause/g;
$l =~ s/\bpublic domain\b/public-domain/ig;
+
# deduplicate license keywords and add 'or' keyword where missing
# this is fragile. may need to change license-check to output license keyword
my %tmp_l = map { ( $_ => 1) ;} grep { $_ ne 'or' } split(/ /,$l);
$l = join(' or ', sort keys %tmp_l) ;
+ # Handle license like "under the same term as Perl"
+ $l =~ s/perl/Artistic or GPL-1+/i;
+
$c =~ s/'//g;
$c =~ s/^©\s*//;
$c =~ s/(?<=\b\d{4})\s*-\s*\d{4}(?=\s*-\s*(\d{4})\b)//g;
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libconfig-model-dpkg-perl.git
More information about the Pkg-perl-cvs-commits
mailing list