[libparse-debianchangelog-perl] 16/18: debian/patches/*: add DEP-3 headers, rename to drop numbers (that were all 0001 anyway).
Intrigeri
intrigeri at moszumanska.debian.org
Sun May 24 15:22:22 UTC 2015
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 52d4b1b94cdb7d197ab363049d3545125957d58a
Author: intrigeri <intrigeri at debian.org>
Date: Sun May 24 15:02:51 2015 +0000
debian/patches/*: add DEP-3 headers, rename to drop numbers (that were all 0001 anyway).
---
debian/patches/0001_cve_format.patch | 12 ------------
...hen-a-PO_BUILD_DATE-environment-variable-i.patch | 2 +-
debian/patches/Fix-CVE-parsing-for-new-format.patch | 21 +++++++++++++++++++++
...est-failures-due-to-changed-Changes-field.patch} | 12 +++++++++++-
...tch => P-DC-Support-open-handles-as-input.patch} | 12 +++---------
...e.po.patch => Updated-German-translations.patch} | 20 +++++++++++++++-----
debian/patches/series | 8 ++++----
7 files changed, 55 insertions(+), 32 deletions(-)
diff --git a/debian/patches/0001_cve_format.patch b/debian/patches/0001_cve_format.patch
deleted file mode 100644
index d7a3ba8..0000000
--- a/debian/patches/0001_cve_format.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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 --git a/debian/patches/Build.PL-when-a-PO_BUILD_DATE-environment-variable-i.patch b/debian/patches/Build.PL-when-a-PO_BUILD_DATE-environment-variable-i.patch
index b0d9963..70a9e67 100644
--- a/debian/patches/Build.PL-when-a-PO_BUILD_DATE-environment-variable-i.patch
+++ b/debian/patches/Build.PL-when-a-PO_BUILD_DATE-environment-variable-i.patch
@@ -16,7 +16,7 @@ and then the package can be built reproducibly.
1 file changed, 22 insertions(+), 11 deletions(-)
diff --git a/Build.PL b/Build.PL
-index 76c9fa5..ae28a95 100644
+index 76c9fa5..719cc6a 100644
--- a/Build.PL
+++ b/Build.PL
@@ -10,6 +10,8 @@ my $builder = Module::Build->subclass
diff --git a/debian/patches/Fix-CVE-parsing-for-new-format.patch b/debian/patches/Fix-CVE-parsing-for-new-format.patch
new file mode 100644
index 0000000..ba666c3
--- /dev/null
+++ b/debian/patches/Fix-CVE-parsing-for-new-format.patch
@@ -0,0 +1,21 @@
+From: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
+Date: Sun, 24 May 2015 14:56:33 +0000
+Subject: Fix CVE parsing for new format.
+Bug-Debian: https://bugs.debian.org/731436
+---
+ lib/Parse/DebianChangelog/ChangesFilters.pm | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/Parse/DebianChangelog/ChangesFilters.pm b/lib/Parse/DebianChangelog/ChangesFilters.pm
+index 46ad2aa..e84e4c5 100644
+--- a/lib/Parse/DebianChangelog/ChangesFilters.pm
++++ b/lib/Parse/DebianChangelog/ChangesFilters.pm
+@@ -105,7 +105,7 @@ sub bugs_to_bts {
+ 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 --git a/debian/patches/0001_ftbfs_changes_line.patch b/debian/patches/Fix-test-failures-due-to-changed-Changes-field.patch
similarity index 56%
rename from debian/patches/0001_ftbfs_changes_line.patch
rename to debian/patches/Fix-test-failures-due-to-changed-Changes-field.patch
index 6e15541..4a8b5d0 100644
--- a/debian/patches/0001_ftbfs_changes_line.patch
+++ b/debian/patches/Fix-test-failures-due-to-changed-Changes-field.patch
@@ -1,6 +1,16 @@
+From: Jordan Metzmeier
+Date: Sun, 24 May 2015 14:56:33 +0000
+Subject: Fix test failures due to changed Changes field.
+Bug-Debian: https://bugs.debian.org/753034
+---
+ lib/Parse/DebianChangelog/Util.pm | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/lib/Parse/DebianChangelog/Util.pm b/lib/Parse/DebianChangelog/Util.pm
+index 9086249..6f77546 100644
--- a/lib/Parse/DebianChangelog/Util.pm
+++ b/lib/Parse/DebianChangelog/Util.pm
-@@ -104,7 +104,11 @@
+@@ -104,7 +104,11 @@ sub data2rfc822 {
$v =~ m/\n$/o && warn(__g("field %s has trailing newline >%s<",
$f, $v ));
$v =~ s/\$\{\}/\$/go;
diff --git a/debian/patches/0001_P-DC-Support-open-handles-as-input.patch b/debian/patches/P-DC-Support-open-handles-as-input.patch
similarity index 94%
rename from debian/patches/0001_P-DC-Support-open-handles-as-input.patch
rename to debian/patches/P-DC-Support-open-handles-as-input.patch
index f783edc..5da7ac0 100644
--- a/debian/patches/0001_P-DC-Support-open-handles-as-input.patch
+++ b/debian/patches/P-DC-Support-open-handles-as-input.patch
@@ -1,9 +1,6 @@
->From df4d8784680fee1c3d593aee32d7a2e782cfabbc Mon Sep 17 00:00:00 2001
From: Niels Thykier <niels at thykier.net>
Date: Sat, 14 Sep 2013 11:55:01 +0200
-Subject: [PATCH] P::DC: Support open handles as input
-
-Signed-off-by: Niels Thykier <niels at thykier.net>
+Subject: P::DC: Support open handles as input
---
bin/parsechangelog | 3 +--
lib/Parse/DebianChangelog.pm | 31 ++++++++++++++++++++++++-------
@@ -11,10 +8,10 @@ Signed-off-by: Niels Thykier <niels at thykier.net>
3 files changed, 50 insertions(+), 23 deletions(-)
diff --git a/bin/parsechangelog b/bin/parsechangelog
-index 7bff43d..3398900 100644
+index 0916b44..05571bb 100644
--- a/bin/parsechangelog
+++ b/bin/parsechangelog
-@@ -216,8 +216,7 @@ my $changes = Parse::DebianChangelog->init();
+@@ -211,8 +211,7 @@ my $changes = Parse::DebianChangelog->init();
$file ||= $default_file;
if ($file eq '-') {
@@ -144,6 +141,3 @@ index f3b8270..fe10f6e 100644
foreach my $test (( [ 't/examples/misplaced-tz', 6 ])) {
---
-1.8.4.rc3
-
diff --git a/debian/patches/0001_de.po.patch b/debian/patches/Updated-German-translations.patch
similarity index 93%
rename from debian/patches/0001_de.po.patch
rename to debian/patches/Updated-German-translations.patch
index c2018b9..faf7bae 100644
--- a/debian/patches/0001_de.po.patch
+++ b/debian/patches/Updated-German-translations.patch
@@ -1,6 +1,16 @@
---- 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 @@
+From: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
+Date: Sun, 24 May 2015 14:56:33 +0000
+Subject: Updated German translations.
+Bug-Debian: https://bugs.debian.org/709626
+---
+ po/bin.de.po | 79 ++++++++++++++++++++++++++++++------------------------------
+ 1 file changed, 40 insertions(+), 39 deletions(-)
+
+diff --git a/po/bin.de.po b/po/bin.de.po
+index 661fd01..a6147e3 100644
+--- a/po/bin.de.po
++++ b/po/bin.de.po
+@@ -6,9 +6,10 @@ msgstr ""
"Project-Id-Version: Parse::DebianChangelog 1.0\n"
"Report-Msgid-Bugs-To: frank at lichtenheld.de\n"
"POT-Creation-Date: 2005-10-13 02:10+0200\n"
@@ -13,7 +23,7 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-@@ -16,42 +17,42 @@
+@@ -16,42 +17,42 @@ msgstr ""
#: ../bin/parsechangelog:146
#, perl-format
msgid "changelog format %s not supported"
@@ -65,7 +75,7 @@
#: ../lib/Parse/DebianChangelog.pm:219
#, perl-format
-@@ -70,126 +71,126 @@
+@@ -70,126 +71,126 @@ msgstr "WARNUNG: %s(l%s): %s\n"
#: ../lib/Parse/DebianChangelog.pm:232
#, perl-format
msgid "FATAL: %s"
diff --git a/debian/patches/series b/debian/patches/series
index 4213542..bbbd593 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,5 @@
-0001_cve_format.patch
-0001_de.po.patch
-0001_ftbfs_changes_line.patch
-0001_P-DC-Support-open-handles-as-input.patch
+Fix-CVE-parsing-for-new-format.patch
+Updated-German-translations.patch
+Fix-test-failures-due-to-changed-Changes-field.patch
+P-DC-Support-open-handles-as-input.patch
Build.PL-when-a-PO_BUILD_DATE-environment-variable-i.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libparse-debianchangelog-perl.git
More information about the Pkg-perl-cvs-commits
mailing list