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

[Stefan Fritsch]

The following commit has been merged in the next branch:
commit b50f7bc97e71e1218a3f8ca884f51aa3992482af
Author: Stefan Fritsch <sf at sfritsch.de>
Date:   Sun Apr 15 21:07:50 2012 +0200

    Don't ship the changelogs in the apache2-mpm-itk transitional package

diff --git a/debian/changelog b/debian/changelog
index a6d0a0a..15dcda2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+apache2 (2.4.2-2) experimental; urgency=low
+
+  * UNRELEASED
+  * Don't ship the changelogs in the apache2-mpm-itk transitional package.
+
+ -- Stefan Fritsch <sf at debian.org>  Sun, 15 Apr 2012 21:06:08 +0200
+
 apache2 (2.4.2-1) experimental; urgency=low
 
   * New upstream release
diff --git a/debian/rules b/debian/rules
index 7736dad..6a3014e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -126,7 +126,8 @@ override_dh_installdocs-indep:
 
 override_dh_installdocs-arch:
 	dh_installdocs --link-doc=apache2 -papache2 -papache2-dev -papache2-dbg \
-		-papache2-mpm-worker -papache2-mpm-prefork -papache2-mpm-event
+		-papache2-mpm-worker -papache2-mpm-prefork -papache2-mpm-event \
+		-papache2-mpm-itk
 	dh_installdocs --link-doc=apache2-suexec-pristine -papache2-suexec
 	dh_installdocs -a
 
@@ -136,7 +137,8 @@ override_dh_installchangelogs:
 	# dh_installdocs this means that changelogs are installed in a few
 	# packages only.
 	dh_installchangelogs -Napache2-suexec -Napache2-mpm-worker \
-		-Napache2-mpm-prefork -Napache2-mpm-event -Napache2-data
+		-Napache2-mpm-prefork -Napache2-mpm-event -Napache2-mpm-itk \
+		-Napache2-data
 
 override_dh_installman:
 	mv debian/tmp/usr/share/man/man8/suexec.8 debian/tmp/usr/share/man/man8/suexec-pristine.8

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