This is an automated email from the git hooks/post-receive script. intrigeri pushed a commit to branch master in repository libparse-debianchangelog-perl.
commit dd2e48f39a5e148e92041078ee2192dd1b33af24 Merge: b8b768c 80680fa Author: Thijs Kinkhorst <[email protected]> Date: Thu Sep 11 18:12:43 2014 +0000 Imported Debian patch 1.2.0-1.1 .gitignore | 12 -- MANIFEST | 35 ++++ META.yml | 40 ++++ debian/changelog | 17 ++ debian/control | 2 +- .../0001_P-DC-Support-open-handles-as-input.patch | 149 ++++++++++++++ debian/patches/0001_cve_format.patch | 12 ++ debian/patches/0001_de.po.patch | 222 +++++++++++++++++++++ debian/patches/0001_ftbfs_changes_line.patch | 15 ++ debian/patches/series | 4 + debian/source/local-options | 1 - 11 files changed, 495 insertions(+), 14 deletions(-) diff --cc debian/changelog index f55faec,0000000..48c8096 mode 100644,000000..100644 --- a/debian/changelog +++ b/debian/changelog @@@ -1,113 -1,0 +1,130 @@@ ++libparse-debianchangelog-perl (1.2.0-1.1) unstable; urgency=medium ++ ++ * Non-maintainer upload. ++ * 0001_ftbfs_changes_line.patch: fix test failures due to changed Changes ++ field, patch by Jordan Metzmeier (closes: #753034). ++ * 0001_cve_format.patch: Fix CVE parsing for new format (closes: #731436). ++ * 0001_de.po.patch: Updated German translations, thanks Hendrik Knackstedt ++ (closes: #709626). ++ * 0001_P-DC-Support-open-handles-as-input.patch: support open handles as ++ input, patch by Niels Thykier (closes: #722896). ++ * Merge ubuntu patch: downgrade libhtml-parser-perl, libhtml-template-perl, ++ and libxml-simple-perl from Recommends to Suggests. This package is ++ installed in minimal systems due to aptitude's (reasonable) dependency ++ on it, but aptitude only uses rfc822 output. ++ ++ -- Thijs Kinkhorst <[email protected]> Thu, 11 Sep 2014 18:12:43 +0000 ++ +libparse-debianchangelog-perl (1.2.0-1) unstable; urgency=low + + * New upstream release: + - Don't use $& or $` (Closes: #515018) + - Allow '.' and '+' in distribution names. Patch by John Wright. + (Closes: #565238) + - Add Danish translation of bin.pot by Joe Dalton (Closes: #605820) + - ChangesFilters: + + Fix conversion of <http://something/> (Closes: #603341) + + Allow to omit # before closed bug numbers (Closes: 446798 ;) + * Bump Standards-Version to 3.9.1 (no changes) + * Convert debian/rules to debhelper 7 + + -- Frank Lichtenheld <[email protected]> Sun, 03 Apr 2011 23:25:41 +0200 + +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 <[email protected]> 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: + #179599). From Marco Rodrigues. + * Remove XS- prefix from Vcs-* fields. dpkg supports them now. + * Bump Standards-Version to 3.7.3 (no changes) + * Build.PL: set create_packlist to 0 to avoid .packlist installation + + -- Frank Lichtenheld <[email protected]> Fri, 11 Jan 2008 11:48:05 +0100 + +libparse-debianchangelog-perl (1.1.1-1) unstable; urgency=low + + * New upstream release + - Fixes handling of dates equal to the epoch (Closes: #440116) + + -- Frank Lichtenheld <[email protected]> Sat, 01 Sep 2007 03:25:06 +0200 + +libparse-debianchangelog-perl (1.1-1) unstable; urgency=low + + * New upstream release + - Update Build-Depends-Indep + * Bump debhelper compat level to 5 + * Bump Standards-Version to 3.7.2 (no changes) + * Add XS-Vcs-{git,Browser} + + -- Frank Lichtenheld <[email protected]> Mon, 16 Jul 2007 04:18:36 +0200 + +libparse-debianchangelog-perl (1.0-1) unstable; urgency=low + + * New upstream release + - Update Build-Depends-Indep and Depends + + -- Frank Lichtenheld <[email protected]> Wed, 12 Oct 2005 17:13:34 +0200 + +libparse-debianchangelog-perl (0.9-1) unstable; urgency=low + + * New upstream release + + -- Frank Lichtenheld <[email protected]> Tue, 4 Oct 2005 04:47:28 +0200 + +libparse-debianchangelog-perl (0.8-1) unstable; urgency=low + + * New upstream release + - Update Depends + - Update description and reformat it a bit to make it more readable + + -- Frank Lichtenheld <[email protected]> Mon, 3 Oct 2005 14:12:00 +0200 + +libparse-debianchangelog-perl (0.7-1) unstable; urgency=low + + * New upstream release + - Update the description + - Update Depends + + -- Frank Lichtenheld <[email protected]> Tue, 16 Aug 2005 02:40:39 +0200 + +libparse-debianchangelog-perl (0.6-1) unstable; urgency=low + + * New upstream release + + -- Frank Lichtenheld <[email protected]> Wed, 3 Aug 2005 14:02:26 +0200 + +libparse-debianchangelog-perl (0.5-1) unstable; urgency=low + + * New upstream release + - Update the description + + -- Frank Lichtenheld <[email protected]> Tue, 5 Jul 2005 04:26:12 +0200 + +libparse-debianchangelog-perl (0.4-1) unstable; urgency=low + + * New upstream release + - adapt Build-Depends-Indep and Recommends to new requirements + - install new TODO file + - install templates and CSS files to + /usr/share/libparse-debianchangelog-perl/ and adapt the default + paths in the module + - fix some problems in the test scripts (ignore stderr garbage + issued by dpkg-parsechangelog in pbuilder environment) + + -- Frank Lichtenheld <[email protected]> Tue, 5 Jul 2005 03:28:10 +0200 + +libparse-debianchangelog-perl (0.3a-1) unstable; urgency=low + + * Initial Release (Closes: #314559). + + -- Frank Lichtenheld <[email protected]> Fri, 1 Jul 2005 22:35:31 +0200 + diff --cc debian/control index 3f5d31d,0000000..a5195c4 mode 100644,000000..100644 --- a/debian/control +++ b/debian/control @@@ -1,23 -1,0 +1,23 @@@ +Source: libparse-debianchangelog-perl +Section: perl +Priority: optional +Build-Depends: debhelper (>= 7) +Build-Depends-Indep: 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 <[email protected]> +Standards-Version: 3.9.1 +Vcs-git: git://source.djpig.de/git/Parse-DebianChangelog.git +Vcs-Browser: http://source.djpig.de/git/?p=Parse-DebianChangelog.git;a=summary + +Package: libparse-debianchangelog-perl +Architecture: all +Depends: ${perl:Depends}, ${misc:Depends}, libtimedate-perl, libclass-accessor-perl, liblocale-gettext-perl, libio-string-perl - Recommends: libhtml-parser-perl, libhtml-template-perl, libxml-simple-perl ++Suggests: libhtml-parser-perl, libhtml-template-perl, libxml-simple-perl +Description: parse Debian changelogs and output them in other formats + Replacement for the very limited dpkg-parsechangelog. Accessible + either via the parsechangelog command line script or as Perl module. + . + Currently supported output formats: + * original dpkg-parsechangelog output format + * similar format with multiple stanzas instead of one + * XML + * HTML (customizable via HTML::Template templates). diff --cc debian/patches/0001_P-DC-Support-open-handles-as-input.patch index 0000000,0000000..f783edc new file mode 100644 --- /dev/null +++ b/debian/patches/0001_P-DC-Support-open-handles-as-input.patch @@@ -1,0 -1,0 +1,149 @@@ ++>From df4d8784680fee1c3d593aee32d7a2e782cfabbc Mon Sep 17 00:00:00 2001 ++From: Niels Thykier <[email protected]> ++Date: Sat, 14 Sep 2013 11:55:01 +0200 ++Subject: [PATCH] P::DC: Support open handles as input ++ ++Signed-off-by: Niels Thykier <[email protected]> ++--- ++ bin/parsechangelog | 3 +-- ++ lib/Parse/DebianChangelog.pm | 31 ++++++++++++++++++++++++------- ++ t/Parse-DebianChangelog.t | 39 +++++++++++++++++++++++++-------------- ++ 3 files changed, 50 insertions(+), 23 deletions(-) ++ ++diff --git a/bin/parsechangelog b/bin/parsechangelog ++index 7bff43d..3398900 100644 ++--- a/bin/parsechangelog +++++ b/bin/parsechangelog ++@@ -216,8 +216,7 @@ my $changes = Parse::DebianChangelog->init(); ++ ++ $file ||= $default_file; ++ if ($file eq '-') { ++- my @input = <STDIN>; ++- $changes->parse({ instring => join('', @input) }) +++ $changes->parse({ handle => \*STDIN, handlename => '<stdin>' }) ++ or die sprintf( gettext('fatal error occured while parsing %s')."\n", ++ 'input' ); ++ } else { ++diff --git a/lib/Parse/DebianChangelog.pm b/lib/Parse/DebianChangelog.pm ++index dbb1531..bec10f9 100644 ++--- a/lib/Parse/DebianChangelog.pm +++++ b/lib/Parse/DebianChangelog.pm ++@@ -115,10 +115,10 @@ There are currently no supported general configuration options, but ++ see the other methods for more specific configuration options which ++ can also specified to C<init>. ++ ++-If C<infile> or C<instring> are specified (see L<parse>), C<parse()> ++-is called from C<init>. If a fatal error is encountered during parsing ++-(e.g. the file can't be opened), C<init> will not return a ++-valid object but C<undef>! +++If C<infile>, C<instring> or C<handle> are specified (see L<parse>), +++C<parse()> is called from C<init>. If a fatal error is encountered +++during parsing (e.g. the file can't be opened), C<init> will not +++return a valid object but C<undef>! ++ ++ =cut ++ ++@@ -134,7 +134,8 @@ sub init { ++ $self->init_filters; ++ $self->reset_parse_errors; ++ ++- if ($self->{config}{infile} || $self->{config}{instring}) { +++ if ($self->{config}{infile} || $self->{config}{instring} +++ || $self->{config}{handle}) { ++ defined($self->parse) or return undef; ++ } ++ ++@@ -250,8 +251,10 @@ sub get_error { ++ ++ =head3 parse ++ ++-Parses either the file named in configuration item C<infile> or the string ++-saved in configuration item C<instring>. +++Parses either the file named in configuration item C<infile>, the string +++saved in configuration item C<instring> or the open file handle saved +++in the configuration item C<handle>. In the latter case, the handle can +++be named by using the optional configuration item C<handlename>. ++ Accepts a hash ref as optional argument which can contain configuration ++ items. ++ ++@@ -294,6 +297,20 @@ sub parse { ++ } ++ $fh = IO::String->new( $string ); ++ $file = 'String'; +++ } elsif ($fh = $self->{config}{handle}) { +++ # Scalar::Util is in perlcore, so we can rely on its presence. +++ # (also, if it is broken, then most of perl is as well). +++ require Scalar::Util; +++ if (not Scalar::Util::openhandle($fh)) { +++ $self->_do_fatal_error( __g('handle is not open')); +++ return undef; +++ } +++ +++ $file = $self->{config}{handlename}; +++ if (not defined($file)) { +++ $file = '<unnamed-handle>'; +++ $file = '<stdin>' if (fileno($fh)//-1) == 0; +++ } ++ } else { ++ $self->_do_fatal_error( __g( 'no changelog file specified' )); ++ return undef; ++diff --git a/t/Parse-DebianChangelog.t b/t/Parse-DebianChangelog.t ++index f3b8270..fe10f6e 100644 ++--- a/t/Parse-DebianChangelog.t +++++ b/t/Parse-DebianChangelog.t ++@@ -17,7 +17,7 @@ BEGIN { ++ my $no_err_examples = 1; ++ my $no_tests = $no_examples * 13 ++ + $no_err_examples * 2 ++- + 49; +++ + 51; ++ ++ require Test::More; ++ import Test::More tests => $no_tests, ; ++@@ -225,19 +225,30 @@ foreach my $file (qw(Changes t/examples/countme t/examples/shadow)) { ++ ++ } ++ ++-open CHANGES, '<', 't/examples/countme'; ++-my $string = join('',<CHANGES>); ++- ++-my $str_changes = Parse::DebianChangelog->init( { instring => $string, ++- quiet => 1 } ); ++-my $errors = $str_changes->get_parse_errors(); ++-ok( !$errors, ++- "Parse example changelog t/examples/countme without errors from string" ); ++- ++-my $str_data = $str_changes->rfc822_str({ all => 1 }); ++-is( $str_data, $save_data, ++- "Compare result of parse from string with result of parse from file" ); ++- +++for my $i (0..1) { +++ open my $fh, '<', 't/examples/countme' or die "open t/examples/countme: $!"; +++ my $str_changes; +++ my $type; +++ if ($i == 0) { +++ my $string = join('', <$fh>); +++ +++ $str_changes = Parse::DebianChangelog->init( { instring => $string, +++ quiet => 1 } ); +++ $type = 'string'; +++ } else { +++ $str_changes = Parse::DebianChangelog->init( { handle => $fh, +++ quiet => 1 } ); +++ $type = 'handle'; +++ } +++ my $errors = $str_changes->get_parse_errors(); +++ ok( !$errors, +++ "Parse example changelog t/examples/countme without errors from $type" ); +++ +++ my $str_data = $str_changes->rfc822_str({ all => 1 }); +++ is( $str_data, $save_data, +++ "Compare result of parse from $type with result of parse from file" ); +++ close $fh; +++} ++ ++ foreach my $test (( [ 't/examples/misplaced-tz', 6 ])) { ++ ++-- ++1.8.4.rc3 ++ diff --cc debian/patches/0001_cve_format.patch index 0000000,0000000..d7a3ba8 new file mode 100644 --- /dev/null +++ b/debian/patches/0001_cve_format.patch @@@ -1,0 -1,0 +1,12 @@@ ++diff -Nur libparse-debianchangelog-perl-1.2.0.orig/lib/Parse/DebianChangelog/ChangesFilters.pm libparse-debianchangelog-perl-1.2.0/lib/Parse/DebianChangelog/ChangesFilters.pm ++--- libparse-debianchangelog-perl-1.2.0.orig/lib/Parse/DebianChangelog/ChangesFilters.pm 2011-04-04 18:41:06.000000000 +0200 +++++ libparse-debianchangelog-perl-1.2.0/lib/Parse/DebianChangelog/ChangesFilters.pm 2013-12-05 14:09:47.643913682 +0100 ++@@ -105,7 +105,7 @@ ++ sub cve_to_mitre { ++ my ($text, $cgi) = @_; ++ ++- $text =~ s!\b((?:CVE|CAN)-\d{4}-\d{4})\b +++ $text =~ s!\b((?:CVE|CAN)-\d{4}-\d{4,})\b ++ !$cgi->a({ -href=>"http://cve.mitre.org/cgi-bin/cvename.cgi?name=$1"; }, $1) ++ !xego; ++ return $text; diff --cc debian/patches/0001_de.po.patch index 0000000,0000000..c2018b9 new file mode 100644 --- /dev/null +++ b/debian/patches/0001_de.po.patch @@@ -1,0 -1,0 +1,222 @@@ ++--- a/po/bin.de.po 2014-09-11 18:38:20.000000000 +0000 +++++ b/po/bin.de.po 2014-09-11 18:25:16.000000000 +0000 ++@@ -6,9 +6,10 @@ ++ "Project-Id-Version: Parse::DebianChangelog 1.0\n" ++ "Report-Msgid-Bugs-To: [email protected]\n" ++ "POT-Creation-Date: 2005-10-13 02:10+0200\n" ++-"PO-Revision-Date: 2005-10-13 01:57+0200\n" ++-"Last-Translator: Frank Lichtenheld <[email protected]>\n" +++"PO-Revision-Date: 2013-05-24 13:42+0000\n" +++"Last-Translator: Hendrik Knackstedt <[email protected]>\n" ++ "Language-Team: German <[email protected]>\n" +++"Language: de\n" ++ "MIME-Version: 1.0\n" ++ "Content-Type: text/plain; charset=UTF-8\n" ++ "Content-Transfer-Encoding: 8bit\n" ++@@ -16,42 +17,42 @@ ++ #: ../bin/parsechangelog:146 ++ #, perl-format ++ msgid "changelog format %s not supported" ++-msgstr "Changelog-Format %s wird nicht unterstützt" +++msgstr "Format %s für das Änderungsprotokoll wird nicht unterstützt" ++ ++ #: ../bin/parsechangelog:151 ++ msgid "ignored option -L" ++-msgstr "ignoriere Option -L" +++msgstr "Option -L wurde ignoriert" ++ ++ #: ../bin/parsechangelog:159 ++ #, perl-format ++ msgid "output format %s not supported" ++-msgstr "Ausgabeformat %s wird nicht unterstützt" +++msgstr "Das Ausgabeformat %s wird nicht unterstützt" ++ ++ #: ../bin/parsechangelog:168 ++ msgid "Copyright (C) 2005 by Frank Lichtenheld\n" ++-msgstr "Copyright (C) 2005 Frank Lichtenheld\n" +++msgstr "Copyright © 2005 von Frank Lichtenheld\n" ++ ++ #: ../bin/parsechangelog:169 ++ msgid "" ++ "This is free software; see the GNU General Public Licence version 2 or later " ++ "for copying conditions. There is NO warranty." ++ msgstr "" ++-"Dieses Programm ist freie Software. Siehe die GNU General Public License, " ++-"Version 2 oder später für die Kopierbedingungen. Es gibt KEINE Garantie." +++"Dieses Programm ist freie Software, die unter der GNU General Public Licence " +++"Version 2 oder neueren Versionen lizenziert wird. Es gibt KEINE Garantie." ++ ++ #: ../bin/parsechangelog:200 ++ msgid "too many arguments" ++-msgstr "zu viele Argumente" +++msgstr "Zu viele Argumente." ++ ++ #: ../bin/parsechangelog:204 ++ #, perl-format ++ msgid "more than one file specified (%s and %s)" ++-msgstr "mehr als eine Datei angegeben (%s und %s)" +++msgstr "Mehr als eine Datei angegeben (%s und %s)." ++ ++ #: ../bin/parsechangelog:216 ../bin/parsechangelog:220 ++ #, perl-format ++ msgid "fatal error occured while parsing %s" ++-msgstr "beim Parsen von %s ist ein schwerwiegender Fehler aufgetreten" +++msgstr "Fataler Fehler beim Auswerten von %s" ++ ++ #: ../lib/Parse/DebianChangelog.pm:219 ++ #, perl-format ++@@ -70,126 +71,126 @@ ++ #: ../lib/Parse/DebianChangelog.pm:232 ++ #, perl-format ++ msgid "FATAL: %s" ++-msgstr "FATAL: %s" +++msgstr "FEHLER: %s" ++ ++ #: ../lib/Parse/DebianChangelog.pm:279 ++ #, perl-format ++ msgid "can't open file %s: %s" ++-msgstr "Kann Datei %s nicht öffnen: %s" +++msgstr "Datei %s kann nicht geöffnet werden: %s" ++ ++ #: ../lib/Parse/DebianChangelog.pm:284 ++ #, perl-format ++ msgid "can't lock file %s: %s" ++-msgstr "Kann Datei %s nicht sperren: %s" +++msgstr "Datei %s kann nicht gesperrt werden: %s" ++ ++ #: ../lib/Parse/DebianChangelog.pm:291 ++ #, perl-format ++ msgid "can't load IO::String: %s" ++-msgstr "kann IO::String nicht laden: %s" +++msgstr "IO::String kann nicht geladen werden: %s" ++ ++ #: ../lib/Parse/DebianChangelog.pm:298 ++ msgid "no changelog file specified" ++-msgstr "keine Changelog-Datei angegeben" +++msgstr "Keine Änderungsprotokolldatei angegeben" ++ ++ #: ../lib/Parse/DebianChangelog.pm:319 ++ #, perl-format ++ msgid "found start of entry where expected %s" ++-msgstr "Anfang eines Eintrags gefunden, obwohl %s erwartet wurde" +++msgstr "Beginn eines Eintrags gefunden, wo %s erwartet wurde" ++ ++ #: ../lib/Parse/DebianChangelog.pm:343 ++ #, perl-format ++ msgid "bad key-value after `;': `%s'" ++-msgstr "Fehlerhafter Schlüssel-Wert nach »;«: »%s«" +++msgstr "ungültiger Schlüsselwert nach »;«: %s" ++ ++ #: ../lib/Parse/DebianChangelog.pm:347 ++ #, perl-format ++ msgid "repeated key-value %s" ++-msgstr "Wiederholter Schlüssel-Wert %s" +++msgstr "wiederholter Schlüsselwert %s" ++ ++ #: ../lib/Parse/DebianChangelog.pm:351 ++ msgid "badly formatted urgency value" ++-msgstr "Fehlerhaft formatierter Dringlichkeitswert" +++msgstr "falsch formatierter Dringlichkeitswert" ++ ++ #: ../lib/Parse/DebianChangelog.pm:362 ++ #, perl-format ++ msgid "unknown key-value key %s - copying to XS-%s" ++-msgstr "Unbekannter Schlüssel-Wert Schlüssel %s - kopiert nach XS-%s" +++msgstr "unbekannter Schlüssel %s – wird nach XS-%s kopiert" ++ ++ #: ../lib/Parse/DebianChangelog.pm:393 ++ msgid "badly formatted heading line" ++-msgstr "Fehlerhaft formatierter Header" +++msgstr "falsch formatierte Kopfzeile" ++ ++ #: ../lib/Parse/DebianChangelog.pm:397 ++ #, perl-format ++ msgid "found trailer where expected %s" ++-msgstr "Habe Trailer gefunden, obwohl %s erwartet wurde" +++msgstr "Nachspann gefunden, aber %s erwartet" ++ ++ #: ../lib/Parse/DebianChangelog.pm:401 ../lib/Parse/DebianChangelog.pm:416 ++ msgid "badly formatted trailer line" ++-msgstr "Fehlerhaft formatierter Trailer" +++msgstr "ungültig formatierte Zeile im Nachspann" ++ ++ #: ../lib/Parse/DebianChangelog.pm:410 ++ #, perl-format ++ msgid "couldn't parse date %s" ++-msgstr "Konnte Datum %s nicht parsen" +++msgstr "Datum %s konnte nicht ausgewertet werden" ++ ++ #: ../lib/Parse/DebianChangelog.pm:425 ../lib/Parse/DebianChangelog.pm:440 ++ #, perl-format ++ msgid "found change data where expected %s" ++-msgstr "Teil eines Eintrag gefunden, obwohl %s erwartet wurde" +++msgstr "Änderungsdaten statt des erwarteten %s gefunden" ++ ++ #: ../lib/Parse/DebianChangelog.pm:458 ++ #, perl-format ++ msgid "found blank line where expected %s" ++-msgstr "Leerzeile gefunden, obwohl %s erwartet wurde" +++msgstr "Leerzeile statt des erwarten %s gefunden" ++ ++ #: ../lib/Parse/DebianChangelog.pm:462 ../lib/Parse/DebianChangelog.pm:477 ++ msgid "unrecognised line" ++-msgstr "Unbekannte Zeile" +++msgstr "Zeile nicht erkannt" ++ ++ #: ../lib/Parse/DebianChangelog.pm:486 ++ #, perl-format ++ msgid "found eof where expected %s" ++-msgstr "Habe Ende der Datei erreicht, obwohl %s erwartet wurde" +++msgstr "EOF gefunden, wo %s erwartet wurde" ++ ++ #: ../lib/Parse/DebianChangelog.pm:497 ++ #, perl-format ++ msgid "can't close file %s: %s" ++-msgstr "Kann Datei %s nicht schließen: %s" +++msgstr "Datei %s kann nicht geschlossen werden: %s" ++ ++ #: ../lib/Parse/DebianChangelog.pm:541 ++ msgid "you can't combine 'count' or 'offset' with any other range option" ++ msgstr "" ++-"Sie können 'count' oder 'offset' nicht mit anderen Bereichsauswahloptionen " ++-"kombinieren" +++"Sie können »count« oder »offset« nicht mit einer anderen Bereichsoption " +++"kombinieren." ++ ++ #: ../lib/Parse/DebianChangelog.pm:545 ++ msgid "you can only specify one of 'from' and 'since'" ++-msgstr "Sie können nur eine Option von 'from' und 'since' angeben" +++msgstr "Sie können nur entweder »from« oder »since« angeben" ++ ++ #: ../lib/Parse/DebianChangelog.pm:549 ++ msgid "you can only specify one of 'to' and 'until'" ++-msgstr "Sie können nur eine Option von 'to' und 'until' angeben" +++msgstr "Sie können nur entweder »to« oder »until« angeben" ++ ++ #: ../lib/Parse/DebianChangelog.pm:553 ++ msgid "'since' option specifies most recent version" ++-msgstr "'since'-Option gibt neueste Version an" +++msgstr "Die Option »since« legt die neueste Version fest" ++ ++ #: ../lib/Parse/DebianChangelog.pm:557 ++ msgid "'until' option specifies oldest version" ++-msgstr "'until'-Option gibt älteste Version an" +++msgstr "Die Option »until« legt die älteste Version fest" ++ ++ #: ../lib/Parse/DebianChangelog/Util.pm:100 ++ #, perl-format ++ msgid "field %s has newline then non whitespace >%s<" ++-msgstr "" +++msgstr "Feld %s hat einen Zeilenumbruch und dann ein nicht-Leerzeichen »%s«" ++ ++ #: ../lib/Parse/DebianChangelog/Util.pm:102 ++ #, perl-format ++ msgid "field %s has blank lines >%s<" ++-msgstr "" +++msgstr "Feld %s hat Leerzeilen »%s«" ++ ++ #: ../lib/Parse/DebianChangelog/Util.pm:104 ++ #, perl-format ++ msgid "field %s has trailing newline >%s<" ++-msgstr "" +++msgstr "Feld %s hat einen abschließenden Zeilenumbruch »%s«" diff --cc debian/patches/0001_ftbfs_changes_line.patch index 0000000,0000000..6e15541 new file mode 100644 --- /dev/null +++ b/debian/patches/0001_ftbfs_changes_line.patch @@@ -1,0 -1,0 +1,15 @@@ ++--- a/lib/Parse/DebianChangelog/Util.pm +++++ b/lib/Parse/DebianChangelog/Util.pm ++@@ -104,7 +104,11 @@ ++ $v =~ m/\n$/o && warn(__g("field %s has trailing newline >%s<", ++ $f, $v )); ++ $v =~ s/\$\{\}/\$/go; ++- $rfc822_str .= "$f: $v\n"; +++ # the changes have a space followed by a newline which was resulting +++ # in a trailing space on "Changes: ". This caused the library to not +++ # match the output of dpkg-parsechangelog +++ $v = ' ' . $v if $v !~ m/^\s+/; +++ $rfc822_str .= "$f:$v\n"; ++ } ++ ++ return $rfc822_str; diff --cc debian/patches/series index 0000000,0000000..e8b221e new file mode 100644 --- /dev/null +++ b/debian/patches/series @@@ -1,0 -1,0 +1,4 @@@ ++0001_cve_format.patch ++0001_de.po.patch ++0001_ftbfs_changes_line.patch ++0001_P-DC-Support-open-handles-as-input.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libparse-debianchangelog-perl.git _______________________________________________ Pkg-perl-cvs-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-perl-cvs-commits
