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

[Arno Töll]

The following commit has been merged in the next branch:
commit 8fbcc0dcc0ce349b034d5c4c1ba8ff6826a241f0
Author: Arno Töll <debian at toell.net>
Date:   Tue Mar 20 11:55:15 2012 +0100

    Make a new 2.4.1-2 release fixing the FTBS by shifting the convert_docs script
    to arch-indep targets only.

diff --git a/debian/changelog b/debian/changelog
index 8bdb799..03e48a2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+apache2 (2.4.1-2) experimental; urgency=low
+
+  * Shift convert_docs script to a arch-indep target only. Debhelper does not
+    build apache2-doc on binary only builds causing a FTBS on binary-only (-B)
+    builds
+  * Raise debhelper build-dependency to 8.9.7~ due to the use of arch-indep
+    targets
+
+ -- Arno Töll <debian at toell.net>  Tue, 20 Mar 2012 11:15:14 +0100
+
 apache2 (2.4.1-1) experimental; urgency=low
 
   * Package the coming up 2.4 branch of Apache by packaging the current
diff --git a/debian/control b/debian/control
index 3457bc7..7c39d0a 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,7 @@ Section: httpd
 Priority: optional
 Maintainer: Debian Apache Maintainers <debian-apache at lists.debian.org>
 Uploaders: Stefan Fritsch <sf at debian.org>, Steinar H. Gunderson <sesse at debian.org>, Arno Töll <debian at toell.net>
-#missing dependencies: autoconf
-Build-Depends: debhelper (>= 8.1.0~), lsb-release, dpkg-dev (>= 1.16.1~),
+Build-Depends: debhelper (>= 8.9.7~), 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], perl,
  liblua5.1-0-dev, libxml2-dev, autotools-dev, gawk | awk
diff --git a/debian/rules b/debian/rules
index cd161e5..49a4802 100755
--- a/debian/rules
+++ b/debian/rules
@@ -71,29 +71,35 @@ override_dh_auto_configure: prepare-custom-suexec generate-maintainer-scripts
 override_dh_install: clean-config-vars prepare-scripts
 	dh_install --list-missing
 
-override_dh_fixperms:
+override_dh_fixperms-arch:
 	# standard suexec
 	chmod 4754 debian/apache2-suexec-pristine/usr/lib/apache2/suexec-pristine
 	chgrp www-data debian/apache2-suexec-pristine/usr/lib/apache2/suexec-pristine
 	# configurable suexec
 	chmod 4754 debian/apache2-suexec-custom/usr/lib/apache2/suexec-custom
 	chgrp www-data debian/apache2-suexec-custom/usr/lib/apache2/suexec-custom
-	dh_fixperms -Xusr/lib/apache2/suexec-custom -Xusr/lib/apache2/suexec-pristine
+	dh_fixperms -a -Xusr/lib/apache2/suexec-custom -Xusr/lib/apache2/suexec-pristine
 	chown -R www-data:www-data debian/apache2/var/cache/apache2
 	chown root:adm debian/apache2/var/log/apache2
 	chmod o-rx debian/apache2/var/log/apache2
 
+override_dh_fixperms-indep:
+	dh_fixperms -i
+
 override_dh_installinit:
 	dh_installinit --no-start --no-restart-on-upgrade  -- defaults 91 09
 
 
-override_dh_installdocs:
+override_dh_installdocs-indep:
 	# TODO: So, did anyone check convert_docs needs an update? ;)
 	perl debian/convert_docs debian/apache2-doc/usr/share/doc/apache2-doc/manual
+	dh_installdocs -i
+
+override_dh_installdocs-arch:
 	dh_installdocs --link-doc=apache2 -papache2 -papache2-dev -papache2-dbg \
 		-papache2-mpm-worker -papache2-mpm-prefork -papache2-mpm-event
 	dh_installdocs --link-doc=apache2-suexec-pristine -papache2-suexec
-	dh_installdocs
+	dh_installdocs -a
 
 override_dh_installchangelogs:
 	# Do not install changelogs for transitional packages and the -data

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