[Pkg-apache-commits] [SCM] Debian packaging for apache2 (Apache HTTPD 2.x) branch, next, updated. 3cf842b8894366d4b19bc82f5d30d536e7f62017

[Arno Töll]

The following commit has been merged in the next branch:
commit 3cf842b8894366d4b19bc82f5d30d536e7f62017
Author: Arno Töll <debian at toell.net>
Date:   Sun Mar 18 00:56:33 2012 +0100

    Install manpages for dh_apache2 being generated by pod2man

diff --git a/debian/clean b/debian/clean
index c828586..45e073c 100644
--- a/debian/clean
+++ b/debian/clean
@@ -11,5 +11,6 @@ debian/apache2-suexec-pristine.links
 debian/apache2-suexec-pristine.dirs
 debian/apache2-suexec-pristine.lintian-overrides
 debian/a2query
+debian/manpages/dh_apache2.1
 support/suexec-custom.c
 config.nice
diff --git a/debian/control b/debian/control
index 7332ac3..3b5188a 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Stefan Fritsch <sf at debian.org>, Steinar H. Gunderson <sesse at debian.or
 #missing dependencies: autoconf
 Build-Depends: debhelper (>= 8.1.0~), lsb-release, dpkg-dev (>= 1.16.1~),
  libaprutil1-dev (>= 1.4.0), libapr1-dev, libpcre3-dev, zlib1g-dev,
- libssl-dev (>= 0.9.8m), libcap-dev [linux-any],
+ libssl-dev (>= 0.9.8m), libcap-dev [linux-any], perl,
  liblua5.1-0-dev, libxml2-dev, autotools-dev, gawk | awk
 Build-Conflicts: autoconf2.13
 Standards-Version: 3.9.3
diff --git a/debian/dh-apache2.manpages b/debian/dh-apache2.manpages
new file mode 100644
index 0000000..50d1a54
--- /dev/null
+++ b/debian/dh-apache2.manpages
@@ -0,0 +1 @@
+debian/manpages/dh_apache2.1
diff --git a/debian/rules b/debian/rules
index 0328846..545e7ca 100755
--- a/debian/rules
+++ b/debian/rules
@@ -103,6 +103,7 @@ override_dh_installchangelogs:
 
 override_dh_installman:
 	mv debian/tmp/usr/share/man/man8/suexec.8 debian/tmp/usr/share/man/man8/suexec-pristine.8
+	pod2man debian/debhelper/dh_apache2 > debian/manpages/dh_apache2.1
 	dh_installman
 
 override_dh_strip:

-- 
Debian packaging for apache2 (Apache HTTPD 2.x)