[SCM] Debian packaging of Apache-Singleton CPAN distribution branch, master, updated. debian/0.15-1-8-g5801ad9

[gregor herrmann]

The following commit has been merged in the master branch:
commit 5e473a3c7bcb7925b994ed89ef94b93a2957fc7b
Author: gregor herrmann <gregoa at debian.org>
Date:   Fri May 31 13:24:17 2013 +0200

    Apache 2.4 transition:
    
    - build-depend on apache2-dev
    - add a minimal debian/apache2.conf to get necessary modules for the test
      suite
    - use it in debian/rules
    
    Closes: #666800

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/control b/debian/control
index d78cd4b..929462e 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
 Uploaders: gregor herrmann <gregoa at debian.org>
 Build-Depends: debhelper (>= 8)
 Build-Depends-Indep: perl,
- apache2-threaded-dev | apache2-prefork-dev,
+ apache2-dev,
  libapache2-mod-perl2,
  netbase
 Standards-Version: 3.9.3
diff --git a/debian/rules b/debian/rules
index ef61c14..fb4cec3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,17 +8,11 @@ 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 Apache-Singleton CPAN distribution