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

[gregor herrmann]

The following commit has been merged in the master branch:
commit 702096bf629954523f1f7a10908fa814864eda72
Author: gregor herrmann <gregoa at debian.org>
Date:   Fri Jun 21 18:11:22 2013 +0200

    Add patch from Jorge Manuel B. S. Vicetto to handle mod_rewrite changes
    
    in apache 2.4. Load rewrite_module in debian/apache2.conf.

diff --git a/debian/apache2.conf b/debian/apache2.conf
index 60bb009..cfb95a3 100644
--- a/debian/apache2.conf
+++ b/debian/apache2.conf
@@ -18,7 +18,4 @@ LoadModule env_module /usr/lib/apache2/modules/mod_env.so
 LoadModule mime_module /usr/lib/apache2/modules/mod_mime.so
 LoadModule dir_module /usr/lib/apache2/modules/mod_dir.so
 LoadModule cgi_module /usr/lib/apache2/modules/mod_cgi.so
-# LoadModule rewrite_module /usr/lib/apache2/modules/mod_rewrite.so
-# commented out because:
-# .AH00526: Syntax error on line 233 of /home/niko/libapache2-mod-perl2/ModPerl-Registry/t/conf/extra.conf:
-# Invalid command 'RewriteLogLevel', perhaps misspelled or defined by a module not included in the server configuration
+LoadModule rewrite_module /usr/lib/apache2/modules/mod_rewrite.so
diff --git a/debian/patches/340-rewrite-2.4.patch b/debian/patches/340-rewrite-2.4.patch
new file mode 100644
index 0000000..3a21f2c
--- /dev/null
+++ b/debian/patches/340-rewrite-2.4.patch
@@ -0,0 +1,20 @@
+Description: adjust test to mod_rewrite changes in 2.4
+Origin: Gentoo
+Forwarded: no
+Author: Jorge Manuel B. S. Vicetto
+Reviewed-by: gregor herrmann <gregoa at debian.org>
+Last-Update: 2013-06-21
+
+--- a/ModPerl-Registry/t/conf/extra.conf.in
++++ b/ModPerl-Registry/t/conf/extra.conf.in
+@@ -218,8 +218,8 @@
+ <IfModule mod_rewrite.c>
+ 
+     RewriteEngine On
+-    RewriteLogLevel 9
+-    RewriteLog @ServerRoot@/logs/rewrite_log
++    LogLevel rewrite:trace8
++    ErrorLog @ServerRoot@/logs/rewrite_log
+     RewriteRule /rewritetest /rewrite_env/env_val.pl?REWRITE_TEST [E=REWRITE_TEST:GOTCHA,PT,NS,L]
+ 
+     <Location /rewrite_env>
diff --git a/debian/patches/series b/debian/patches/series
index 2983932..f61a07a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -15,3 +15,4 @@ avoid-db-linkage.patch
 310-defaultruntimedir.patch
 320-cleanup-authn-authz-providers.patch
 #330-proxy-test-auth.patch
+340-rewrite-2.4.patch

-- 
Debian packaging of libapache2-mod-perl2