[dh-make-perl] 02/09: drop usage of experimental given/when in Packaging.pm
Damyan Ivanov
dmn at alioth.debian.org
Fri Aug 16 12:32:49 UTC 2013
This is an automated email from the git hooks/post-receive script.
dmn pushed a commit to branch master
in repository dh-make-perl.
commit 8f24bcff9b334ed323cb7ee3436a41de062fc431
Author: Damyan Ivanov <dmn at debian.org>
Date: Fri Aug 16 10:14:54 2013 +0200
drop usage of experimental given/when in Packaging.pm
---
lib/DhMakePerl/Command/Packaging.pm | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/lib/DhMakePerl/Command/Packaging.pm b/lib/DhMakePerl/Command/Packaging.pm
index 2c0284c..0da1d10 100644
--- a/lib/DhMakePerl/Command/Packaging.pm
+++ b/lib/DhMakePerl/Command/Packaging.pm
@@ -1076,21 +1076,21 @@ sub create_copyright {
# templates (i.e. you must add the author name and some
# information within the licensing text as such).
if ( $self->meta->{license} ) {
- foreach ( @{ $self->meta->{license} }) {
- given ($_) {
- when (/apache_2_0/) { $licenses{'Apache-2.0'} = 1; }
- when (/artistic_1/) { $licenses{'Artistic'} = 1; }
- when (/artistic_2/) { $licenses{'Artistic-2.0'} = 1; }
- # EU::MM and M::B converts the 'gpl' without a version to gpl_1.
- # As GPL without a version means *any* GPL, I think it's safe to use GPL-1+ here
- when (/gpl_1/) { $licenses{'GPL-1+'} = 1; }
-
- when (/perl_5/) {
- $licenses{'GPL-1+'} = 1;
- $licenses{'Artistic'} = 1;
- }
+ foreach ( @{ $self->meta->{license} } ) {
+ if (/apache_2_0/) { $licenses{'Apache-2.0'} = 1; next; }
+ if (/artistic_1/) { $licenses{'Artistic'} = 1; next; }
+ if (/artistic_2/) { $licenses{'Artistic-2.0'} = 1; next; }
+
+ # EU::MM and M::B converts the 'gpl' without a version to gpl_1.
+ # As GPL without a version means *any* GPL, I think it's safe to use GPL-1+ here
+ if (/gpl_1/) { $licenses{'GPL-1+'} = 1; next; }
+
+ if (/perl_5/) {
+ $licenses{'GPL-1+'} = 1;
+ $licenses{'Artistic'} = 1;
+ next;
}
- }
+ }
}
else {
if ( $mangle_cprt =~ /terms\s*as\s*Perl\s*itself/is ) {
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/dh-make-perl.git
More information about the Pkg-perl-cvs-commits
mailing list