[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 dca08e27c2d61712b55d4f8519dd5344bcd93c7a
Author: Niko Tyni <ntyni at debian.org>
Date:   Sat Jun 15 00:13:23 2013 +0300

    update 030-apxs-no-prefix.patch to fall back to SYSCONFDIR when PREFIX fails

diff --git a/debian/changelog b/debian/changelog
index 6d8cf09..3cc35e6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,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'
+  * Update debian/patches/030-apxs-no-prefix.patch to fall back to
+    SYSCONFDIR when PREFIX fails.
 
  -- Niko Tyni <ntyni at debian.org>  Wed, 19 Jun 2013 22:10:37 +0300
 
diff --git a/debian/patches/030-apxs-no-prefix.patch b/debian/patches/030-apxs-no-prefix.patch
index 130ba07..ddeffcf 100644
--- a/debian/patches/030-apxs-no-prefix.patch
+++ b/debian/patches/030-apxs-no-prefix.patch
@@ -1,19 +1,26 @@
 Author: Niko Tyni <ntyni at debian.org>
-Subject: Help apxs find the correct directory
- As a comment inside apxs2 indicates:
- # Debian doesn't have a CFG_PREFIX [...]
- so use SYSCONFDIR instead to shut up apxs warnings.
-Forwarded: not-needed
-Last-Update: 2011-03-22
-Reviewed-by: Nicholas Bamber <nicholas at periapt.co.uk>
---- a/Apache-Test/lib/Apache/TestConfigParse.pm
-+++ b/Apache-Test/lib/Apache/TestConfigParse.pm
-@@ -87,7 +87,7 @@ sub server_file_rel2abs {
+Subject: [PATCH] Apache-Test: Fall back to SYSCONFDIR if PREFIX is not set
+Forwarded: http://www.gossamer-threads.com/lists/modperl/dev/105353
+
+Debian and Ubuntu packaged versions of Apache2 don't define PREFIX,
+so the build is filled with warnings like
+ APXS (/usr/bin/apxs2) query for PREFIX failed
+
+Falling back to SYSCONFDIR (which is /etc/apache2 on Debian)
+should be better than failing altogether.
+
+--- libapache2-mod-perl2.orig/Apache-Test/lib/Apache/TestConfigParse.pm
++++ libapache2-mod-perl2/Apache-Test/lib/Apache/TestConfigParse.pm
+@@ -87,8 +87,10 @@
                         'user-supplied $base' ],
                   [ $self->{inherit_config}->{ServerRoot},
                         'httpd.conf inherited ServerRoot' ],
 -                 [ $self->apxs('PREFIX'),
+-                       'apxs-derived ServerRoot' ]);
++                 [ $self->apxs('PREFIX', 1), # ok_fail => 1
++                       'apxs-derived ServerRoot based on PREFIX' ],
 +                 [ $self->apxs('SYSCONFDIR'),
-                        'apxs-derived ServerRoot' ]);
++                       'apxs-derived ServerRoot based on SYSCONFDIR' ]);
  
      # remove surrounding quotes if any
+     # e.g. Include "/tmp/foo.html"

-- 
Debian packaging of libapache2-mod-perl2