This is an automated email from the git hooks/post-receive script.
ntyni pushed a commit to branch master
in repository libapache2-mod-perl2.
commit 9b05727779b9d2ee36997a790b4bb087497864bb
Author: Niko Tyni <nt...@debian.org>
Date: Thu Aug 7 18:22:09 2014 +0300
Drop 300-http-headers-version.patch in favour of the upstream fix.
---
debian/changelog | 1 +
debian/patches/300-http-headers-version.patch | 36 ---------------------------
debian/patches/series | 1 -
3 files changed, 1 insertion(+), 37 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 25ab3ef..060ec59 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,7 @@ libapache2-mod-perl2 (2.0.9~1604013-1) UNRELEASED;
urgency=medium
in lib/Apache2/compat.pm.
* Mark failing tests in t/perl/ithreads3.t as TODO for now; they are
not a regression from previous releases.
+ * Drop 300-http-headers-version.patch in favour of the upstream fix.
-- gregor herrmann <gre...@debian.org> Sat, 15 Feb 2014 20:25:47 +0100
diff --git a/debian/patches/300-http-headers-version.patch
b/debian/patches/300-http-headers-version.patch
deleted file mode 100644
index eb008a8..0000000
--- a/debian/patches/300-http-headers-version.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Description: adjust the version check for HTTP::Headers
-Origin: vendor
-Bug-Debian: http://bugs.debian.org/710873
-Forwarded: no
-Author: gregor herrmann <gre...@debian.org>
-Last-Update: 2013-06-03
-
---- a/t/api/err_headers_out.t
-+++ b/t/api/err_headers_out.t
-@@ -6,6 +6,8 @@ use Apache::Test;
- use Apache::TestRequest;
- use Apache::TestUtil;
-
-+use version;
-+
- plan tests => 6, need 'HTML::HeadParser';
-
- my $location = '/TestAPI__err_headers_out';
-@@ -26,7 +28,7 @@ my $location = '/TestAPI__err_headers_ou
- local $HTTP::Headers::TRANSLATE_UNDERSCORE=
- $HTTP::Headers::TRANSLATE_UNDERSCORE;
- undef $HTTP::Headers::TRANSLATE_UNDERSCORE
-- if defined HTTP::Headers->VERSION and HTTP::Headers->VERSION >= 6.00;
-+ if defined HTTP::Headers->VERSION and
version->parse(HTTP::Headers->VERSION) >= version->parse(6.00);
-
- ok t_cmp $res->header('X-err_headers_out'), "err_headers_out",
- "X-err_headers_out: made it";
-@@ -51,7 +53,7 @@ my $location = '/TestAPI__err_headers_ou
- local $HTTP::Headers::TRANSLATE_UNDERSCORE=
- $HTTP::Headers::TRANSLATE_UNDERSCORE;
- undef $HTTP::Headers::TRANSLATE_UNDERSCORE
-- if defined HTTP::Headers->VERSION and HTTP::Headers->VERSION >= 6.00;
-+ if defined HTTP::Headers->VERSION and
version->parse(HTTP::Headers->VERSION) >= version->parse(6.00);
-
- ok t_cmp $res->header('X-err_headers_out'), "err_headers_out",
- "X-err_headers_out: made it";
diff --git a/debian/patches/series b/debian/patches/series
index 64bde70..5549d42 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,7 +9,6 @@ avoid-db-linkage.patch
210_fix-pod-errors.patch
220_fix-bad-whatis-entry.patch
260_fix_pipelined_response_deadlock.patch
-300-http-headers-version.patch
310-defaultruntimedir.patch
#330-mod_authz_core.patch
340-rewrite-2.4.patch
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-perl/packages/libapache2-mod-perl2.git
_______________________________________________
Pkg-perl-cvs-commits mailing list
Pkg-perl-cvs-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-perl-cvs-commits
