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

[gregor herrmann]

The following commit has been merged in the master branch:
commit 07331e76087ed2f7c61d05be21a048c88baa059f
Author: gregor herrmann <gregoa at debian.org>
Date:   Tue Jun 4 19:00:55 2013 +0200

    improve debian/patches/310-defaultruntimedir.patch (ntyni++)
    
    Git-Dch: Ignore

diff --git a/debian/patches/310-defaultruntimedir.patch b/debian/patches/310-defaultruntimedir.patch
index 70d277f..651f1f8 100644
--- a/debian/patches/310-defaultruntimedir.patch
+++ b/debian/patches/310-defaultruntimedir.patch
@@ -1,19 +1,33 @@
 Description: Since Apache 2.4, DefaultRuntimeDir needs to be set,
  otherwise mod_auth_digest tries to write to /var/run and fails (depending
  on permissions). Set DefaultRuntimeDir in the generated httpd.conf of
- Apache::Test.
+ Apache::Test conditionally.
+ This also means we don't need the extra DefaultRuntimeDir in t/conf/extra.conf.in.
 Origin: vendor
 Forwarded: no
-Author: gregor herrmann <gregoa at debian.org>
+Author: gregor herrmann <gregoa at debian.org>,
+ Niko Tyni <ntyni at debian.org>
 Last-Update: 2013-06-04
 
 --- a/Apache-Test/lib/Apache/TestConfig.pm
 +++ b/Apache-Test/lib/Apache/TestConfig.pm
-@@ -2142,6 +2142,7 @@
- Listen     0.0.0.0:@Port@
+@@ -2148,6 +2148,10 @@
+ ErrorLog    @t_logs@/error_log
+ LogLevel    debug
  
- ServerRoot   "@ServerRoot@"
-+DefaultRuntimeDir "@ServerRoot@/run"
- DocumentRoot "@DocumentRoot@"
++<IfVersion > 2.4.1>
++    DefaultRunTimeDir "@t_logs@"
++</IfVersion>
++
+ <IfModule mod_log_config.c>
+     TransferLog @t_logs@/access_log
+ </IfModule>
+--- a/t/conf/extra.conf.in
++++ b/t/conf/extra.conf.in
+@@ -1,6 +1,5 @@
+ # needed to test $r->psignature
+ ServerSignature On
+-DefaultRuntimeDir run/
  
- PidFile     @t_pid_file@
+ # The following tests require more than one interpreter during the
+ # same request:

-- 
Debian packaging of libapache2-mod-perl2