diff -Nru libdebian-copyright-perl-0.2/debian/changelog libdebian-copyright-perl-0.2/debian/changelog --- libdebian-copyright-perl-0.2/debian/changelog 2015-06-07 08:02:28.000000000 +0000 +++ libdebian-copyright-perl-0.2/debian/changelog 2015-10-29 20:48:00.000000000 +0000 @@ -1,3 +1,14 @@ +libdebian-copyright-perl (0.2-3) unstable; urgency=medium + + * Team upload. + * Add patch to produce reproducible copyright files. + Thanks to Reiner Herrmann for the bug report and patch. + (Closes: #803340) + * Add debian/upstream/metadata. + * Bump debhelper compatibility level to 9. + + -- gregor herrmann Thu, 29 Oct 2015 21:47:57 +0100 + libdebian-copyright-perl (0.2-2) unstable; urgency=medium * Team upload. diff -Nru libdebian-copyright-perl-0.2/debian/compat libdebian-copyright-perl-0.2/debian/compat --- libdebian-copyright-perl-0.2/debian/compat 2015-06-07 08:02:28.000000000 +0000 +++ libdebian-copyright-perl-0.2/debian/compat 2015-10-29 20:48:00.000000000 +0000 @@ -1 +1 @@ -8 +9 diff -Nru libdebian-copyright-perl-0.2/debian/control libdebian-copyright-perl-0.2/debian/control --- libdebian-copyright-perl-0.2/debian/control 2015-06-07 08:02:28.000000000 +0000 +++ libdebian-copyright-perl-0.2/debian/control 2015-10-29 20:48:00.000000000 +0000 @@ -4,7 +4,7 @@ Section: perl Testsuite: autopkgtest-pkg-perl Priority: optional -Build-Depends: debhelper (>= 8), +Build-Depends: debhelper (>= 9), libmodule-build-perl Build-Depends-Indep: libarray-unique-perl, libclass-accessor-perl, diff -Nru libdebian-copyright-perl-0.2/debian/patches/reproducible-copyright.patch libdebian-copyright-perl-0.2/debian/patches/reproducible-copyright.patch --- libdebian-copyright-perl-0.2/debian/patches/reproducible-copyright.patch 1970-01-01 00:00:00.000000000 +0000 +++ libdebian-copyright-perl-0.2/debian/patches/reproducible-copyright.patch 2015-10-29 20:48:00.000000000 +0000 @@ -0,0 +1,52 @@ +Description: produce reproducible copyright files + This patches fixes the reproducibility issues this by sorting Files + sections by path, License sections by name, and "x or y" listings. +Origin: vendor +Bug-Debian: https://bugs.debian.org/803340 +Author: Reiner Herrmann +Reviewed-by: gregor herrmann +Last-Update: 2015-10-29 +Forwarded: https://rt.cpan.org/Ticket/Display.html?id=108121 +Bug: https://rt.cpan.org/Ticket/Display.html?id=108121 + +--- a/lib/Debian/Copyright.pm ++++ b/lib/Debian/Copyright.pm +@@ -161,6 +161,9 @@ + sub write { + my ( $self, $file ) = @_; + ++ $self->files->SortByKey; ++ $self->licenses->SortByKey; ++ + my @stanzas = ( + $self->header, + $self->files->Values, +--- a/lib/Debian/Copyright/Stanza/OrSeparated.pm ++++ b/lib/Debian/Copyright/Stanza/OrSeparated.pm +@@ -82,7 +82,7 @@ + { + my $self = shift; + my $body = exists $self->{body} ? "\n$self->{body}" : ""; +- return join( ' or ', @{ $self->{list} } ).$body; ++ return join( ' or ', sort @{ $self->{list} } ).$body; + } + + =head2 equals +--- a/t/01.basic.t ++++ b/t/01.basic.t +@@ -1,4 +1,4 @@ +-use Test::More tests => 36; ++use Test::More tests => 37; + + use Debian::Copyright; + +@@ -61,7 +61,8 @@ + like($copyright->licenses->Values(0)->License, qr/\AArtistic\s+This\sprogram/xms, 'licenses(0)->Files'); + is($copyright->files->Keys(2), 'test/*', 'key files(2)'); + is($copyright->files->Values(2)->Files, 'test/*', 'files(2)->Files'); +-is($copyright->licenses->Keys(2), 'BSD', 'key licenses(2)'); ++is($copyright->licenses->Keys(1), 'BSD', 'key licenses(1)'); ++is($copyright->licenses->Keys(2), 'GPL-2+', 'key licenses(2)'); + + my $copyright3 = Debian::Copyright->new; + isa_ok($copyright3, 'Debian::Copyright'); diff -Nru libdebian-copyright-perl-0.2/debian/patches/series libdebian-copyright-perl-0.2/debian/patches/series --- libdebian-copyright-perl-0.2/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ libdebian-copyright-perl-0.2/debian/patches/series 2015-10-29 20:48:00.000000000 +0000 @@ -0,0 +1 @@ +reproducible-copyright.patch diff -Nru libdebian-copyright-perl-0.2/debian/upstream/metadata libdebian-copyright-perl-0.2/debian/upstream/metadata --- libdebian-copyright-perl-0.2/debian/upstream/metadata 1970-01-01 00:00:00.000000000 +0000 +++ libdebian-copyright-perl-0.2/debian/upstream/metadata 2015-10-29 20:48:00.000000000 +0000 @@ -0,0 +1,5 @@ +--- +Archive: CPAN +Contact: Nicholas Bamber +Name: Debian-Copyright +Repository: https://github.com/periapt/Debian-Copyright.git