[SCM] Debian packaging of libapache2-mod-perl2 branch, master, updated. debian/2.0.8+httpd24-r1449661-4-6-g20b70d9

[Niko Tyni]

The following commit has been merged in the master branch:
commit de9cdf63245983e4af3615e3312667885294f88a
Author: Niko Tyni <ntyni at debian.org>
Date:   Fri Jun 14 15:44:39 2013 +0300

    No need to for explicit parameters when running "apache2 -l"
    
    As of Apache 2.4, "apache2 -l" doesn't need to read the
    configuration but "apache2 -V" does.

diff --git a/debian/changelog b/debian/changelog
index e392e6e..6d8cf09 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 libapache2-mod-perl2 (2.0.8+httpd24-r1449661-5) UNRELEASED; urgency=low
 
-  * 
+  * Update debian/patches/280-ignore-sysconf-for-defines.patch not
+    to unnecessarily use explicit configuration file and server root
+    for running 'apache2 -l'
 
  -- Niko Tyni <ntyni at debian.org>  Wed, 19 Jun 2013 22:10:37 +0300
 
diff --git a/debian/patches/280-ignore-sysconf-for-defines.patch b/debian/patches/280-ignore-sysconf-for-defines.patch
index ea08462..0ccfc9a 100644
--- a/debian/patches/280-ignore-sysconf-for-defines.patch
+++ b/debian/patches/280-ignore-sysconf-for-defines.patch
@@ -13,21 +13,7 @@ or the like, so try to bypass the system configuration altogether.
 
 --- libapache2-mod-perl2.orig/Apache-Test/lib/Apache/TestConfigParse.pm
 +++ libapache2-mod-perl2/Apache-Test/lib/Apache/TestConfigParse.pm
-@@ -435,6 +435,13 @@
- 
-     $httpd = shell_ready($httpd);
-     my $cmd = "$httpd -l";
-+
-+    my $httpdconf = $self->{vars}->{httpd_conf};
-+    $cmd .= " -f $httpdconf" if $httpdconf;
-+
-+    my $serverroot = $self->{vars}->{serverroot};
-+    $cmd .= " -d $serverroot" if $serverroot;
-+
-     my $list = $self->open_cmd($cmd);
- 
-     while (<$list>) {
-@@ -456,6 +463,13 @@
+@@ -456,6 +456,13 @@
  
      $httpd = shell_ready($httpd);
      my $cmd = "$httpd -V";

-- 
Debian packaging of libapache2-mod-perl2