tags 560634 + patch
tags 584943 + patch
thanks

Dear maintainer,

Ansgar has prepared an NMU for libparse-debianchangelog-perl
(versioned as 1.1.1-2.1) and I've uploaded it to DELAYED/2. Please
feel free to tell me if I should delay it longer.

Regards.

-- 
 .''`.   http://info.comodo.priv.at/ -- GPG key IDs: 0x8649AA06, 0x00F3CFE4
 : :' :  Debian GNU/Linux user, admin, & developer - http://www.debian.org/
 `. `'   Member of VIBE!AT & SPI, fellow of Free Software Foundation Europe
   `-    BOFH excuse #85:  Windows 95 undocumented "feature" 
diff -u libparse-debianchangelog-perl-1.1.1/debian/control libparse-debianchangelog-perl-1.1.1/debian/control
--- libparse-debianchangelog-perl-1.1.1/debian/control
+++ libparse-debianchangelog-perl-1.1.1/debian/control
@@ -2,7 +2,7 @@
 Section: perl
 Priority: optional
 Build-Depends: debhelper (>= 5)
-Build-Depends-Indep: perl (>= 5.8.0-7), po4a, libtimedate-perl, libhtml-parser-perl, libhtml-template-perl, libclass-accessor-perl, liblocale-gettext-perl, tidy, libxml-simple-perl, libio-string-perl, libmodule-build-perl, libtest-pod-perl, libtest-pod-coverage-perl
+Build-Depends-Indep: perl (>= 5.8.0-7), po4a, libtimedate-perl, libhtml-parser-perl, libhtml-template-perl, libclass-accessor-perl, liblocale-gettext-perl, tidy, libxml-simple-perl, libio-string-perl, libmodule-build-perl, libtest-pod-perl, libtest-pod-coverage-perl, perl (>= 5.10.1) | libtest-simple-perl (>= 0.88), libtest-exception-perl
 Maintainer: Frank Lichtenheld <dj...@debian.org>
 Standards-Version: 3.7.3
 Vcs-git: git://source.djpig.de/git/Parse-DebianChangelog.git
diff -u libparse-debianchangelog-perl-1.1.1/debian/changelog libparse-debianchangelog-perl-1.1.1/debian/changelog
--- libparse-debianchangelog-perl-1.1.1/debian/changelog
+++ libparse-debianchangelog-perl-1.1.1/debian/changelog
@@ -1,3 +1,13 @@
+libparse-debianchangelog-perl (1.1.1-2.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Filter duplicate bug numbers in Closes field. (Closes: #560634)
+  * Localize $_ in for loop. (Closes: #584943)
+    - Add build-dep on perl (>= 5.10.1) | libtest-simple-perl (>= 0.88)
+      and libtest-exception-perl for new test.
+
+ -- Ansgar Burchardt <ans...@43-1.org>  Fri, 30 Jul 2010 19:01:12 +0900
+
 libparse-debianchangelog-perl (1.1.1-2) unstable; urgency=low
 
   * Add liblocale-gettext-perl to Build-Depends-Indep: Fix FTBFS (LP:
only in patch2:
unchanged:
--- libparse-debianchangelog-perl-1.1.1.orig/lib/Parse/DebianChangelog.pm
+++ libparse-debianchangelog-perl-1.1.1/lib/Parse/DebianChangelog.pm
@@ -309,6 +309,7 @@
     my $blanklines = 0;
     my $unknowncounter = 1; # to make version unique, e.g. for using as id
 
+    local $_;
     while (<$fh>) {
 	s/\s*\n$//;
 #	printf(STDERR "%-39.39s %-39.39s\n",$expect,$_);
@@ -709,7 +710,7 @@
     }
 
     $f{Changes} = get_dpkg_changes( $data->[0] );
-    $f{Closes} = [ @{$data->[0]{Closes}} ];
+    my %closes = map { $_ => 1 } @{$data->[0]{Closes}};
 
     my $first = 1; my $urg_comment = '';
     foreach my $entry (@$data) {
@@ -723,10 +724,10 @@
 	$urg_comment .= $entry->{Urgency_Comment};
 
 	$f{Changes} .= "\n .".get_dpkg_changes( $entry );
-	push @{$f{Closes}}, @{$entry->{Closes}};
+	$closes{ $_ } = 1 for @{$entry->{Closes}};
     }
 
-    $f{Closes} = join " ", sort { $a <=> $b } @{$f{Closes}};
+    $f{Closes} = join " ", sort { $a <=> $b } keys %closes;
     $f{Urgency} .= $urg_comment;
 
     return %f if wantarray;
only in patch2:
unchanged:
--- libparse-debianchangelog-perl-1.1.1.orig/t/parse-in-for-loop.t
+++ libparse-debianchangelog-perl-1.1.1/t/parse-in-for-loop.t
@@ -0,0 +1,33 @@
+#! /usr/bin/perl
+
+use strict;
+use warnings;
+
+use Test::More 0.88;
+use Test::Exception;
+
+use Parse::DebianChangelog;
+
+my $data = <<'EOT';
+package (1.2-1) unstable; urgency=low
+
+  * Initial release.
+
+ -- Ex A. Mple <e...@example.com>  Tue, 08 Jun 2010 01:50:16 +0900
+EOT
+
+{
+  my $parser = Parse::DebianChangelog->init;
+  for my $x ("") {
+    lives_ok { $parser->parse({ instring => $data }); } 'parse in for my $x (...) works';
+  }
+}
+
+{
+  my $parser = Parse::DebianChangelog->init;
+  for ("") {
+    lives_ok { $parser->parse({ instring => $data }); } 'parse in for (...) works';
+  }
+}
+
+done_testing;

Attachment: signature.asc
Description: Digital signature

Reply via email to