r28640 - in /trunk/libapache2-mod-perl2/debian: changelog patches/031-test-extra-args.patch patches/035-testrequest_add_credentials.patch patches/series

[gwolf at users.alioth.debian.org]

Author: gwolf
Date: Sat Dec 27 01:47:44 2008
New Revision: 28640

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=28640
Log:
Fixed FTBFS with Niko's patch, thanks!

Added:
    trunk/libapache2-mod-perl2/debian/patches/035-testrequest_add_credentials.patch
Modified:
    trunk/libapache2-mod-perl2/debian/changelog
    trunk/libapache2-mod-perl2/debian/patches/031-test-extra-args.patch
    trunk/libapache2-mod-perl2/debian/patches/series

Modified: trunk/libapache2-mod-perl2/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libapache2-mod-perl2/debian/changelog?rev=28640&op=diff
==============================================================================
--- trunk/libapache2-mod-perl2/debian/changelog (original)
+++ trunk/libapache2-mod-perl2/debian/changelog Sat Dec 27 01:47:44 2008
@@ -16,8 +16,12 @@
   [ Gunnar Wolf ]
   * Added conditional dependency on libapache2-mpm-itk (together with
     apache2). (Closes: #508910)
-
- -- Gunnar Wolf <gwolf at debian.org>  Mon, 22 Dec 2008 08:26:49 -0600
+  * Added patch which created a FTBFS with the libwww-perl 5.813 to 5.820
+    update (acknowledged upstream, will be included in next release)
+    (Closes: #509457)
+  * reordered debian/patches/series to match reality  
+
+ -- Gunnar Wolf <gwolf at debian.org>  Fri, 26 Dec 2008 19:38:28 -0600
 
 libapache2-mod-perl2 (2.0.4-4) unstable; urgency=medium
 

Modified: trunk/libapache2-mod-perl2/debian/patches/031-test-extra-args.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libapache2-mod-perl2/debian/patches/031-test-extra-args.patch?rev=28640&op=diff
==============================================================================
--- trunk/libapache2-mod-perl2/debian/patches/031-test-extra-args.patch (original)
+++ trunk/libapache2-mod-perl2/debian/patches/031-test-extra-args.patch Sat Dec 27 01:47:44 2008
@@ -1,8 +1,10 @@
 Honour $(APACHE_TEST_EXTRA_ARGS); Makefile.PL has apparently not been updated
 since this was added to Apache::Test.
---- a/Makefile.PL
-+++ b/Makefile.PL
-@@ -779,12 +779,12 @@ TEST_FILES =
+Index: libapache2-mod-perl2/Makefile.PL
+===================================================================
+--- libapache2-mod-perl2.orig/Makefile.PL	2008-12-26 19:33:34.000000000 -0600
++++ libapache2-mod-perl2/Makefile.PL	2008-12-26 19:33:37.000000000 -0600
+@@ -781,12 +781,12 @@
  
  test_clean :
  	$(FULLPERL) -I$(INST_ARCHLIB) -I$(INST_LIB) \

Added: trunk/libapache2-mod-perl2/debian/patches/035-testrequest_add_credentials.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libapache2-mod-perl2/debian/patches/035-testrequest_add_credentials.patch?rev=28640&op=file
==============================================================================
--- trunk/libapache2-mod-perl2/debian/patches/035-testrequest_add_credentials.patch (added)
+++ trunk/libapache2-mod-perl2/debian/patches/035-testrequest_add_credentials.patch Sat Dec 27 01:47:44 2008
@@ -1,0 +1,18 @@
+# Closing bug #509457 triggered by libwww-perl 5.813 to 5.820
+# transition (thanks to Niko Tyni for the patch)
+Index: libapache2-mod-perl2/Apache-Test/lib/Apache/TestRequest.pm
+===================================================================
+--- libapache2-mod-perl2.orig/Apache-Test/lib/Apache/TestRequest.pm	2008-12-26 19:31:56.000000000 -0600
++++ libapache2-mod-perl2/Apache-Test/lib/Apache/TestRequest.pm	2008-12-26 19:32:27.000000000 -0600
+@@ -256,6 +256,11 @@
+     $self;
+ }
+ 
++sub credentials {
++    my $self = shift;
++    return $self->get_basic_credentials(@_);
++}
++
+ sub get_basic_credentials {
+     my($self, $realm, $uri, $proxy) = @_;
+ 

Modified: trunk/libapache2-mod-perl2/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libapache2-mod-perl2/debian/patches/series?rev=28640&op=diff
==============================================================================
--- trunk/libapache2-mod-perl2/debian/patches/series (original)
+++ trunk/libapache2-mod-perl2/debian/patches/series Sat Dec 27 01:47:44 2008
@@ -1,7 +1,8 @@
-031-test-extra-args.patch
-030-apxs-no-prefix.patch
 001-gtop2.patch
 004-bugs-to-debian-bts.patch
 006_man_section_and_build_warnings.patch
 009-allow-parallel-build.patch
 010-doc-no-more-send_http_header.patch
+030-apxs-no-prefix.patch
+031-test-extra-args.patch
+035-testrequest_add_credentials.patch