r24923 - /trunk/dh-make-perl/dh-make-perl
gregoa at users.alioth.debian.org
gregoa at users.alioth.debian.org
Mon Sep 8 19:02:25 UTC 2008
Author: gregoa
Date: Mon Sep 8 19:02:22 2008
New Revision: 24923
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=24923
Log:
less code duplication in d/copyright generation
Modified:
trunk/dh-make-perl/dh-make-perl
Modified: trunk/dh-make-perl/dh-make-perl
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/dh-make-perl?rev=24923&op=diff
==============================================================================
--- trunk/dh-make-perl/dh-make-perl (original)
+++ trunk/dh-make-perl/dh-make-perl Mon Sep 8 19:02:22 2008
@@ -1175,28 +1175,20 @@
push @res, "License: " . join(' | ', keys %licenses);
- # debian/* files information - We default to the module being
- # licensed as the superset of the module and Perl itself.
- $licenses{'Artistic'} = $licenses{'GPL-1+'} = 1;
- $year = (localtime)[5]+1900;
- push(@res, "", "Files: debian/*", "Copyright: $year, $maintainer");
- push @res, "License: ". join(' | ', keys %licenses);
-
- map {$texts{$_} && push(@res, '', "License: $_", $texts{$_})}
- keys %licenses;
} else {
push @res, "License: ";
-
- # debian/* again
- $licenses{'Artistic'} = $licenses{'GPL-1+'} = 1;
- $year = (localtime)[5]+1900;
- push(@res, "", "Files: debian/*", "Copyright: $year, $maintainer");
- push @res, "License: ". join(' | ', keys %licenses);
- map {$texts{$_} && push(@res, '', "License: $_", $texts{$_})}
- keys %licenses;
-
push @incomplete, 'No licensing information found';
}
+
+ # debian/* files information - We default to the module being
+ # licensed as the superset of the module and Perl itself.
+ $licenses{'Artistic'} = $licenses{'GPL-1+'} = 1;
+ $year = (localtime)[5]+1900;
+ push(@res, "", "Files: debian/*", "Copyright: $year, $maintainer");
+ push @res, "License: ". join(' | ', keys %licenses);
+
+ map {$texts{$_} && push(@res, '', "License: $_", $texts{$_})}
+ keys %licenses;
$fh->print(join("\n", @res, ''));
$fh->close;
More information about the Pkg-perl-cvs-commits
mailing list