From: Ben Hutchings <ben@decadent.org.uk>
Date: Mon, 20 Aug 2007 21:31:41 +0000 (+0000)
Subject: Added patch to make apache_mvc test work with Apache2 modules.
X-Git-Tag: 2.11+2.111-1~12
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=ea5f13786b12c5e802196b6efa8282e1b7cc72c5;p=maypole.git

Added patch to make apache_mvc test work with Apache2 modules.
---

diff --git a/debian/patches/102_fix-apache_mvc-test.diff b/debian/patches/102_fix-apache_mvc-test.diff
new file mode 100644
index 0000000..db9a4fa
--- /dev/null
+++ b/debian/patches/102_fix-apache_mvc-test.diff
@@ -0,0 +1,18 @@
+--- maypole.orig/t/apache_mvc.t
++++ maypole/t/apache_mvc.t
+@@ -2,10 +2,13 @@
+ use strict;
+ use Test::More;
+ BEGIN {
+-    if (eval { require Apache::Request }) {
++    if (eval { require Apache2::RequestRec }) {
++	$ENV{MOD_PERL_API_VERSION} = 2;
++        plan tests => 3;
++    } elsif (eval { require Apache::Request }) {
+         plan tests => 3;
+     } else {
+-        Test::More->import(skip_all =>"Apache::Request is not installed: $@");
++        Test::More->import(skip_all =>"Neither Apache2::RequestRec nor Apache::Request is installed: $@");
+     }
+ }
+ 
diff --git a/debian/patches/series b/debian/patches/series
index f4daffd..1b38d8c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 101_fix-extension-mime-type.diff
+102_fix-apache_mvc-test.diff
 201_no-file-mmagic-xs.diff