[SCM] Debian packaging of libapache2-mod-perl2 branch, master, updated. debian/2.0.8+httpd24-r1449661-2-5-g27d95a8

gregor herrmann gregoa at debian.org
Mon Jun 3 18:43:48 UTC 2013


The following commit has been merged in the master branch:
commit 0e3cb328b60e296a7881cd2abe4a8537aa44569a
Author: gregor herrmann <gregoa at debian.org>
Date:   Mon Jun 3 19:30:36 2013 +0200

    Add a patch to handle a test failure with newer HTTP::Headers.
    
    Closes: #710873
    Thanks: Niko Tyni for the analysis.

diff --git a/debian/patches/300-http-headers-version.patch b/debian/patches/300-http-headers-version.patch
new file mode 100644
index 0000000..5f4dd82
--- /dev/null
+++ b/debian/patches/300-http-headers-version.patch
@@ -0,0 +1,36 @@
+Description: adjust the version check for HTTP::Headers
+Origin: vendor
+Bug-Debian: http://bugs.debian.org/710873
+Forwarded: no
+Author: gregor herrmann <gregoa at debian.org>
+Last-Update: 2013-06-03
+
+--- a/t/api/err_headers_out.t
++++ b/t/api/err_headers_out.t
+@@ -5,6 +5,8 @@
+ use Apache::TestRequest;
+ use Apache::TestUtil;
+ 
++use version;
++
+ plan tests => 6, need 'HTML::HeadParser';
+ 
+ my $location = '/TestAPI__err_headers_out';
+@@ -25,7 +27,7 @@
+     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";
+@@ -50,7 +52,7 @@
+     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 c0f4c95..7cb5793 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,3 +11,4 @@ avoid-db-linkage.patch
 260_fix_pipelined_response_deadlock.patch
 280-ignore-sysconf-for-defines.patch
 290-httpd-transition-test-todo.patch
+300-http-headers-version.patch

-- 
Debian packaging of libapache2-mod-perl2



More information about the Pkg-perl-cvs-commits mailing list