Package: release.debian.org Severity: normal Tags: wheezy User: release.debian....@packages.debian.org Usertags: pu
Hi Release Team In #739943 Moritz noted that libpdf-api2-perl FTBFS also in stable. I have prepared a debdiff for stable with the upstream commit [1], which is attached. Can this be considered for the next point release for wheezy? [1] https://bitbucket.org/ssimms/pdfapi2/commits/2885c70ebf0fc8a7ea3e2f608e398b7de5f53860 Regards, Salvatore
diff -Nru libpdf-api2-perl-2.019/debian/changelog libpdf-api2-perl-2.019/debian/changelog --- libpdf-api2-perl-2.019/debian/changelog 2011-03-12 14:29:21.000000000 +0100 +++ libpdf-api2-perl-2.019/debian/changelog 2014-02-25 16:01:58.000000000 +0100 @@ -1,3 +1,13 @@ +libpdf-api2-perl (2.019-1+deb7u1) wheezy; urgency=medium + + * Team upload. + * Add 739943-fix-FTBFS.patch patch. + Fixes "FTBFS in stable". The patch sorts dictionary keys during PDF + output for predictability. + Thanks to Moritz Mühlenhoff (Closes: #739943) + + -- Salvatore Bonaccorso <car...@debian.org> Mon, 24 Feb 2014 16:53:31 +0100 + libpdf-api2-perl (2.019-1) unstable; urgency=low * New upstream release diff -Nru libpdf-api2-perl-2.019/debian/patches/739943-fix-FTBFS.patch libpdf-api2-perl-2.019/debian/patches/739943-fix-FTBFS.patch --- libpdf-api2-perl-2.019/debian/patches/739943-fix-FTBFS.patch 1970-01-01 01:00:00.000000000 +0100 +++ libpdf-api2-perl-2.019/debian/patches/739943-fix-FTBFS.patch 2014-02-25 16:01:58.000000000 +0100 @@ -0,0 +1,51 @@ +Description: Sort dictionary keys during PDF output, for predictability +Origin: upstream, https://bitbucket.org/ssimms/pdfapi2/commits/2885c70ebf0fc8a7ea3e2f608e398b7de5f53860 +Bug-Debian: http://bugs.debian.org/739943 +Forwarded: not-needed +Last-Update: 2014-02-24 +Applied-Upstream: 2.020 + +diff --git a/lib/PDF/API2/Basic/PDF/Dict.pm b/lib/PDF/API2/Basic/PDF/Dict.pm +--- a/lib/PDF/API2/Basic/PDF/Dict.pm ++++ b/lib/PDF/API2/Basic/PDF/Dict.pm +@@ -122,8 +122,8 @@ + $fh->print(" "); + } + } +- while (($key, $val) = each %{$self}) +- { ++ foreach $key (sort keys %$self) { ++ $val = $self->{$key}; + next if ($key =~ m/^[\s\-]/o || $specs{$key}); + next if (($val || '') eq ''); + $key = PDF::API2::Basic::PDF::Name::string_to_name ($key, $pdf); +diff --git a/t/annotate.t b/t/annotate.t +--- a/t/annotate.t ++++ b/t/annotate.t +@@ -18,5 +18,5 @@ + # why the Contents section doesn't just have the simple text. I think + # it would be better to only use UTF-8 when necessary. + like($pdf->stringify(), +- qr{/Annot /Subtype /Text /Rect \[ 72 144 172 244 \] /Contents <FEFF005400680069007300200069007300200061006E00200061006E006E006F0074006100740069006F006E>}, ++ qr{/Annot /Subtype /Text /Border \[ 0 0 0 \] /Contents <FEFF005400680069007300200069007300200061006E00200061006E006E006F0074006100740069006F006E> /Rect \[ 72 144 172 244 \]}, + q{Text Annotation in a rectangle}); +diff --git a/t/outline.t b/t/outline.t +--- a/t/outline.t ++++ b/t/outline.t +@@ -15,5 +15,5 @@ + $outline->title('Test Outline'); + $outline->dest($page2); + +-like($pdf->stringify, qr{/Dest \[ 6 0 R /XYZ null null null \] /Title \(Test Outline\) /Parent 7 0 R}, ++like($pdf->stringify, qr{/Dest \[ 6 0 R /XYZ null null null \] /Parent 7 0 R /Title \(Test Outline\)}, + q{Basic outline test}); +diff --git a/t/pdf.t b/t/pdf.t +--- a/t/pdf.t ++++ b/t/pdf.t +@@ -97,6 +97,6 @@ + $pdf = PDF::API2->new(); + $pdf->{'forcecompress'} = 0; + $pdf->pageLabel(0, { -prefix => 'Test' }); +-like($pdf->stringify(), qr{/PageLabels << /Nums \[ 0 << /S /D /P \(Test\) >> \] >>}, ++like($pdf->stringify(), qr{/PageLabels << /Nums \[ 0 << /P \(Test\) /S /D >> \] >>}, + q{Page Numbering: Decimal Characters (implicit), with prefix}); diff -Nru libpdf-api2-perl-2.019/debian/patches/series libpdf-api2-perl-2.019/debian/patches/series --- libpdf-api2-perl-2.019/debian/patches/series 2011-01-29 17:02:48.000000000 +0100 +++ libpdf-api2-perl-2.019/debian/patches/series 2014-02-25 16:01:58.000000000 +0100 @@ -1 +1,2 @@ fix-whatis.patch +739943-fix-FTBFS.patch