r17366 - in /trunk/libapache2-mod-perl2/debian: changelog patches/030-apxs-no-prefix.patch patches/series rules

[ntyni at users.alioth.debian.org]

Author: ntyni
Date: Wed Mar 12 21:45:16 2008
New Revision: 17366

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=17366
Log:
* debian/rules: Improve the test suite coverage by setting
  APACHE_TEST_EXTRA_ARGS="-httpd_conf /etc/apache2/apache2.conf"
  so that Apache::Test parses the right apache2 configuration file.
* debian/patches/030-apxs-no-prefix.patch: fix a resulting warning
  from apxs2 looking for CFG_PREFIX, which is not set on Debian.

Added:
    trunk/libapache2-mod-perl2/debian/patches/030-apxs-no-prefix.patch
Modified:
    trunk/libapache2-mod-perl2/debian/changelog
    trunk/libapache2-mod-perl2/debian/patches/series
    trunk/libapache2-mod-perl2/debian/rules

Modified: trunk/libapache2-mod-perl2/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libapache2-mod-perl2/debian/changelog?rev=17366&op=diff
==============================================================================
--- trunk/libapache2-mod-perl2/debian/changelog (original)
+++ trunk/libapache2-mod-perl2/debian/changelog Wed Mar 12 21:45:16 2008
@@ -1,3 +1,13 @@
+libapache2-mod-perl2 (2.0.3-5) UNRELEASED; urgency=low
+
+  * debian/rules: Improve the test suite coverage by setting
+    APACHE_TEST_EXTRA_ARGS="-httpd_conf /etc/apache2/apache2.conf"
+    so that Apache::Test parses the right apache2 configuration file.
+  * debian/patches/030-apxs-no-prefix.patch: fix a resulting warning
+    from apxs2 looking for CFG_PREFIX, which is not set on Debian.
+
+ -- Niko Tyni <ntyni at debian.org>  Wed, 12 Mar 2008 23:15:59 +0200
+
 libapache2-mod-perl2 (2.0.3-4) unstable; urgency=low
 
   * debian/patches/015-nonvoid-return.patch: make modperl_thx_interp_get()

Added: trunk/libapache2-mod-perl2/debian/patches/030-apxs-no-prefix.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libapache2-mod-perl2/debian/patches/030-apxs-no-prefix.patch?rev=17366&op=file
==============================================================================
--- trunk/libapache2-mod-perl2/debian/patches/030-apxs-no-prefix.patch (added)
+++ trunk/libapache2-mod-perl2/debian/patches/030-apxs-no-prefix.patch Wed Mar 12 21:45:16 2008
@@ -1,0 +1,14 @@
+As a comment inside apxs2 indicates:
+# Debian doesn't have a CFG_PREFIX [...]
+so use SYSCONFDIR instead to shut up apxs warnings.
+--- libapache2-mod-perl2.orig/Apache-Test/lib/Apache/TestConfigParse.pm
++++ libapache2-mod-perl2/Apache-Test/lib/Apache/TestConfigParse.pm
+@@ -86,7 +86,7 @@
+                        'user-supplied $base' ],
+                  [ $self->{inherit_config}->{ServerRoot},
+                        'httpd.conf inherited ServerRoot' ],
+-                 [ $self->apxs('PREFIX'),
++                 [ $self->apxs('SYSCONFDIR'),
+                        'apxs-derived ServerRoot' ]);
+ 
+     # remove surrounding quotes if any

Modified: trunk/libapache2-mod-perl2/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libapache2-mod-perl2/debian/patches/series?rev=17366&op=diff
==============================================================================
--- trunk/libapache2-mod-perl2/debian/patches/series (original)
+++ trunk/libapache2-mod-perl2/debian/patches/series Wed Mar 12 21:45:16 2008
@@ -1,3 +1,4 @@
+030-apxs-no-prefix.patch
 001-gtop2.patch
 004-bugs-to-debian-bts.patch
 005-regex-DoS-bug-433549.patch

Modified: trunk/libapache2-mod-perl2/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libapache2-mod-perl2/debian/rules?rev=17366&op=diff
==============================================================================
--- trunk/libapache2-mod-perl2/debian/rules (original)
+++ trunk/libapache2-mod-perl2/debian/rules Wed Mar 12 21:45:16 2008
@@ -43,7 +43,7 @@
 		MP_APXS=/usr/bin/apxs2 \
 		MP_INCLUDE_DIR=/usr/include/apr-1.0
 	$(MAKE) OPTIMIZE="$(CFLAGS)" LD_RUN_PATH=""
-	LANG=C $(MAKE) test
+	APACHE_TEST_EXTRA_ARGS="-httpd_conf /etc/apache2/apache2.conf" LANG=C $(MAKE) test
 
 	touch $@