[SCM] Debian packaging of libapache2-reload-perl branch, master, updated. debian/0.12-1-9-gf9ec89c

[gregor herrmann]

The following commit has been merged in the master branch:
commit 222fa2d8c3c6a6573338e18e544d5105c4687256
Author: gregor herrmann <gregoa at debian.org>
Date:   Sat Jun 1 01:47:15 2013 +0200

    Apache 2.4: add a minimal debian/apache2.conf and use it in debian/rules
    
    for the test suite.

diff --git a/debian/apache2.conf b/debian/apache2.conf
new file mode 100644
index 0000000..cff2a42
--- /dev/null
+++ b/debian/apache2.conf
@@ -0,0 +1,3 @@
+LoadModule mpm_worker_module "/usr/lib/apache2/modules/mod_mpm_worker.so"
+LoadModule authn_core_module "/usr/lib/apache2/modules/mod_authn_core.so"
+LoadModule authz_core_module "/usr/lib/apache2/modules/mod_authz_core.so"
diff --git a/debian/rules b/debian/rules
index b525395..ba08bfb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,18 +10,12 @@ BUILDHOME := $(CURDIR)/debian/build
 override_dh_clean:
 	dh_clean
 	rm -rf $(BUILDHOME)
-
-override_dh_auto_configure:
-	APACHE_TEST_HTTPD=/usr/sbin/apache2 \
-		APACHE_TEST_APXS=/usr/bin/apxs2 \
-		APACHE_TEST_USER=www-data \
-		dh_auto_configure
+	rm -rf $(CURDIR)/t/logs
 
 override_dh_auto_test:
 	mkdir -p $(BUILDHOME)
-	APACHE_TEST_HTTPD=/usr/sbin/apache2 \
-		APACHE_TEST_APXS=/usr/bin/apxs2 \
-		APACHE_TEST_USER=www-data \
+	mkdir -p $(CURDIR)/t/logs
+	APACHE_TEST_EXTRA_ARGS="-httpd_conf $(CURDIR)/debian/apache2.conf" \
 		HOME=$(BUILDHOME) \
 		dh_auto_test
 

-- 
Debian packaging of libapache2-reload-perl