[libapache2-mod-perl2] 04/05: drop 280-ignore-sysconf-for-defines.patch, applied upstream

[Damyan Ivanov]

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

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

commit 7bc23248bf8b8508174518f2f25b882d18118d36
Author: Damyan Ivanov <dmn at debian.org>
Date:   Thu Jun 19 20:19:31 2014 +0000

    drop 280-ignore-sysconf-for-defines.patch, applied upstream
---
 .../patches/280-ignore-sysconf-for-defines.patch   | 29 ----------------------
 debian/patches/series                              |  1 -
 2 files changed, 30 deletions(-)

diff --git a/debian/patches/280-ignore-sysconf-for-defines.patch b/debian/patches/280-ignore-sysconf-for-defines.patch
deleted file mode 100644
index a0b4823..0000000
--- a/debian/patches/280-ignore-sysconf-for-defines.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From ce60ebed111b66381b639c51363cb685fb07fd09 Mon Sep 17 00:00:00 2001
-From: Niko Tyni <ntyni at debian.org>
-Date: Fri, 24 May 2013 15:30:29 +0300
-Subject: [PATCH] Run "httpd -V" with the test config and server root if
- available
-
-The system configuration may not be available to the user
-building mod_perl, or may depend on special environment variables
-or the like, so try to bypass the system configuration altogether.
----
- Apache-Test/lib/Apache/TestConfigParse.pm |    7 +++++++
- 1 file changed, 7 insertions(+)
-
---- libapache2-mod-perl2.orig/Apache-Test/lib/Apache/TestConfigParse.pm
-+++ libapache2-mod-perl2/Apache-Test/lib/Apache/TestConfigParse.pm
-@@ -458,6 +458,13 @@
- 
-     $httpd = shell_ready($httpd);
-     my $cmd = "$httpd -V";
-+
-+    my $httpdconf = $self->{vars}->{httpd_conf};
-+    $cmd .= " -f $httpdconf" if $httpdconf;
-+
-+    my $serverroot = $self->{vars}->{serverroot};
-+    $cmd .= " -d $serverroot" if $serverroot;
-+
-     my $proc = $self->open_cmd($cmd);
- 
-     while (<$proc>) {
diff --git a/debian/patches/series b/debian/patches/series
index ef953a9..e9336f7 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
-280-ignore-sysconf-for-defines.patch
 290-httpd-transition-test-todo.patch
 300-http-headers-version.patch
 310-defaultruntimedir.patch

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