[libapache2-mod-perl2] 06/12: Drop 310-defaultruntimedir.patch, applied upstream.

[Niko Tyni]

This is an automated email from the git hooks/post-receive script.

ntyni pushed a commit to branch master
in repository libapache2-mod-perl2.

commit 424a26fa01829880e499077fc5f8ee2b283f2f51
Author: Niko Tyni <ntyni at debian.org>
Date:   Thu Aug 7 18:26:45 2014 +0300

    Drop 310-defaultruntimedir.patch, applied upstream.
---
 debian/changelog                           |  1 +
 debian/patches/310-defaultruntimedir.patch | 24 ------------------------
 debian/patches/series                      |  1 -
 3 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 060ec59..14e0a59 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,6 +24,7 @@ libapache2-mod-perl2 (2.0.9~1604013-1) UNRELEASED; urgency=medium
   * Mark failing tests in t/perl/ithreads3.t as TODO for now; they are
     not a regression from previous releases.
   * Drop 300-http-headers-version.patch in favour of the upstream fix.
+  * Drop 310-defaultruntimedir.patch, applied upstream.
 
  -- gregor herrmann <gregoa at debian.org>  Sat, 15 Feb 2014 20:25:47 +0100
 
diff --git a/debian/patches/310-defaultruntimedir.patch b/debian/patches/310-defaultruntimedir.patch
deleted file mode 100644
index e440108..0000000
--- a/debian/patches/310-defaultruntimedir.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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 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>,
- 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
-@@ -2154,6 +2154,10 @@ LogLevel    debug
- </IfVersion>
- </IfModule>
- 
-+<IfVersion > 2.4.1>
-+    DefaultRunTimeDir "@t_logs@"
-+</IfVersion>
-+
- <IfModule mod_log_config.c>
-     TransferLog @t_logs@/access_log
- </IfModule>
diff --git a/debian/patches/series b/debian/patches/series
index 5549d42..e856785 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,7 +9,6 @@ avoid-db-linkage.patch
 210_fix-pod-errors.patch
 220_fix-bad-whatis-entry.patch
 260_fix_pipelined_response_deadlock.patch
-310-defaultruntimedir.patch
 #330-mod_authz_core.patch
 340-rewrite-2.4.patch
 350-ap-test-apache24-define.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libapache2-mod-perl2.git