[dh-make-perl] 07/09: sort a couple of hash key walks breaking tests with perl 5.18
Damyan Ivanov
dmn at alioth.debian.org
Fri Aug 16 12:32:51 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 aa80359a97782bed005ea5a00aa6c1495c6e34f8
Author: Damyan Ivanov <dmn at debian.org>
Date: Fri Aug 16 13:56:57 2013 +0200
sort a couple of hash key walks breaking tests with perl 5.18
---
lib/DhMakePerl/Command/Packaging.pm | 8 ++++----
.../wanted-debian--refresh--source-format=3.0_quilt/copyright | 2 +-
t/dists/Strange-0.1/wanted-debian--refresh-email/copyright | 2 +-
t/dists/Strange-0.1/wanted-debian--refresh/copyright | 2 +-
t/dists/Strange-0.1/wanted-debian/copyright | 2 +-
.../wanted-debian--refresh--source-format=3.0_quilt/copyright | 2 +-
t/dists/Strange-2.1/wanted-debian--refresh-email/copyright | 2 +-
t/dists/Strange-2.1/wanted-debian--refresh/copyright | 2 +-
t/dists/Strange-2.1/wanted-debian/copyright | 2 +-
9 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/lib/DhMakePerl/Command/Packaging.pm b/lib/DhMakePerl/Command/Packaging.pm
index 6caab79..63c6962 100644
--- a/lib/DhMakePerl/Command/Packaging.pm
+++ b/lib/DhMakePerl/Command/Packaging.pm
@@ -954,7 +954,7 @@ sub create_copyright {
'Upstream-Contact' => $cprt_author,
'Source' => $self->upsurl
);
- for my $key ( keys %fields ) {
+ for my $key ( sort keys %fields ) {
my $full = "$key";
if ( $fields{$key} ) {
push @res, "$full: $fields{$key}";
@@ -1141,7 +1141,7 @@ sub create_copyright {
}
}
- push @res, "License: " . join( ' or ', keys %licenses );
+ push @res, "License: " . join( ' or ', sort keys %licenses );
}
else {
@@ -1163,10 +1163,10 @@ sub create_copyright {
else {
push @res, "Copyright: $year, " . $self->get_developer;
}
- push @res, "License: " . join( ' or ', keys %licenses );
+ push @res, "License: " . join( ' or ', sort keys %licenses );
map { $texts{$_} && push( @res, '', "License: $_", $texts{$_} ) }
- keys %licenses;
+ sort keys %licenses;
$fh->print( join( "\n", @res, '' ) );
$fh->close;
diff --git a/t/dists/Strange-0.1/wanted-debian--refresh--source-format=3.0_quilt/copyright b/t/dists/Strange-0.1/wanted-debian--refresh--source-format=3.0_quilt/copyright
index 94c675d..9f67fe6 100644
--- a/t/dists/Strange-0.1/wanted-debian--refresh--source-format=3.0_quilt/copyright
+++ b/t/dists/Strange-0.1/wanted-debian--refresh--source-format=3.0_quilt/copyright
@@ -1,7 +1,7 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: Strange
Source: https://metacpan.org/release/Strange
Upstream-Contact: A. U. Thor, a.u.thor at a.galaxy.far.far.away
+Upstream-Name: Strange
DISCLAIMER: This copyright info was automatically extracted
from the perl module. It may not be accurate, so you better
check the module sources in order to ensure the module for its
diff --git a/t/dists/Strange-0.1/wanted-debian--refresh-email/copyright b/t/dists/Strange-0.1/wanted-debian--refresh-email/copyright
index 3b73eb0..8471c58 100644
--- a/t/dists/Strange-0.1/wanted-debian--refresh-email/copyright
+++ b/t/dists/Strange-0.1/wanted-debian--refresh-email/copyright
@@ -1,7 +1,7 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: Strange
Source: https://metacpan.org/release/Strange
Upstream-Contact: A. U. Thor, a.u.thor at a.galaxy.far.far.away
+Upstream-Name: Strange
DISCLAIMER: This copyright info was automatically extracted
from the perl module. It may not be accurate, so you better
check the module sources in order to ensure the module for its
diff --git a/t/dists/Strange-0.1/wanted-debian--refresh/copyright b/t/dists/Strange-0.1/wanted-debian--refresh/copyright
index 94c675d..9f67fe6 100644
--- a/t/dists/Strange-0.1/wanted-debian--refresh/copyright
+++ b/t/dists/Strange-0.1/wanted-debian--refresh/copyright
@@ -1,7 +1,7 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: Strange
Source: https://metacpan.org/release/Strange
Upstream-Contact: A. U. Thor, a.u.thor at a.galaxy.far.far.away
+Upstream-Name: Strange
DISCLAIMER: This copyright info was automatically extracted
from the perl module. It may not be accurate, so you better
check the module sources in order to ensure the module for its
diff --git a/t/dists/Strange-0.1/wanted-debian/copyright b/t/dists/Strange-0.1/wanted-debian/copyright
index 94c675d..9f67fe6 100644
--- a/t/dists/Strange-0.1/wanted-debian/copyright
+++ b/t/dists/Strange-0.1/wanted-debian/copyright
@@ -1,7 +1,7 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: Strange
Source: https://metacpan.org/release/Strange
Upstream-Contact: A. U. Thor, a.u.thor at a.galaxy.far.far.away
+Upstream-Name: Strange
DISCLAIMER: This copyright info was automatically extracted
from the perl module. It may not be accurate, so you better
check the module sources in order to ensure the module for its
diff --git a/t/dists/Strange-2.1/wanted-debian--refresh--source-format=3.0_quilt/copyright b/t/dists/Strange-2.1/wanted-debian--refresh--source-format=3.0_quilt/copyright
index 94c675d..9f67fe6 100644
--- a/t/dists/Strange-2.1/wanted-debian--refresh--source-format=3.0_quilt/copyright
+++ b/t/dists/Strange-2.1/wanted-debian--refresh--source-format=3.0_quilt/copyright
@@ -1,7 +1,7 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: Strange
Source: https://metacpan.org/release/Strange
Upstream-Contact: A. U. Thor, a.u.thor at a.galaxy.far.far.away
+Upstream-Name: Strange
DISCLAIMER: This copyright info was automatically extracted
from the perl module. It may not be accurate, so you better
check the module sources in order to ensure the module for its
diff --git a/t/dists/Strange-2.1/wanted-debian--refresh-email/copyright b/t/dists/Strange-2.1/wanted-debian--refresh-email/copyright
index 3b73eb0..8471c58 100644
--- a/t/dists/Strange-2.1/wanted-debian--refresh-email/copyright
+++ b/t/dists/Strange-2.1/wanted-debian--refresh-email/copyright
@@ -1,7 +1,7 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: Strange
Source: https://metacpan.org/release/Strange
Upstream-Contact: A. U. Thor, a.u.thor at a.galaxy.far.far.away
+Upstream-Name: Strange
DISCLAIMER: This copyright info was automatically extracted
from the perl module. It may not be accurate, so you better
check the module sources in order to ensure the module for its
diff --git a/t/dists/Strange-2.1/wanted-debian--refresh/copyright b/t/dists/Strange-2.1/wanted-debian--refresh/copyright
index 94c675d..9f67fe6 100644
--- a/t/dists/Strange-2.1/wanted-debian--refresh/copyright
+++ b/t/dists/Strange-2.1/wanted-debian--refresh/copyright
@@ -1,7 +1,7 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: Strange
Source: https://metacpan.org/release/Strange
Upstream-Contact: A. U. Thor, a.u.thor at a.galaxy.far.far.away
+Upstream-Name: Strange
DISCLAIMER: This copyright info was automatically extracted
from the perl module. It may not be accurate, so you better
check the module sources in order to ensure the module for its
diff --git a/t/dists/Strange-2.1/wanted-debian/copyright b/t/dists/Strange-2.1/wanted-debian/copyright
index 94c675d..9f67fe6 100644
--- a/t/dists/Strange-2.1/wanted-debian/copyright
+++ b/t/dists/Strange-2.1/wanted-debian/copyright
@@ -1,7 +1,7 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: Strange
Source: https://metacpan.org/release/Strange
Upstream-Contact: A. U. Thor, a.u.thor at a.galaxy.far.far.away
+Upstream-Name: Strange
DISCLAIMER: This copyright info was automatically extracted
from the perl module. It may not be accurate, so you better
check the module sources in order to ensure the module for its
--
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