[Pkg-apache-commits] [SCM] Debian packaging for apache2 (Apache HTTPD 2.x) branch, next, updated. debian/2.2.22-3-231-gdee1b6b

[Stefan Fritsch]

The following commit has been merged in the next branch:
commit dee1b6b74eb29fe008ed0a90806de162f91a9c0c
Author: Stefan Fritsch <sf at sfritsch.de>
Date:   Sun May 6 00:08:08 2012 +0200

    Add transitional package for libapache2-mod-proxy-html
    
    Also don't ship changelogs in the apache2.2-bin transitional package.

diff --git a/debian/changelog b/debian/changelog
index a71b3fa..86c3c27 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ apache2 (2.4.2-2) experimental; urgency=low
   * Make dh_apache2 only accept shell function names as conditional, to avoid
     problems with shell and sed special characters.
   * Add Replaces for the old mpm packages to apache2-bin. Closes: #671683
+  * Add transitional package for libapache2-mod-proxy-html. Closes: #666816
+  * Don't ship changelogs in the apache2.2-bin transitional package.
 
   [ Arno Töll ]
   * Add mode lines to various configuration files and scripts. Reformat
diff --git a/debian/control b/debian/control
index 77abb0f..ad558fe 100644
--- a/debian/control
+++ b/debian/control
@@ -109,6 +109,15 @@ Description: Transitional package for apache2-bin
  This is a transitional package for apache2-bin, and can be safely removed
  after the installation is complete.
 
+Package: libapache2-mod-proxy-html
+Architecture: any
+Section: oldlibs
+Priority: extra
+Depends: ${misc:Depends}, apache2-bin (>= 2.3~)
+Description: Transitional package for apache2-bin
+ This is a transitional package for apache2-bin, and can be safely removed
+ after the installation is complete.
+
 Package: apache2-utils
 Architecture: any
 Multi-Arch: foreign
diff --git a/debian/rules b/debian/rules
index 6a3014e..a4e4671 100755
--- a/debian/rules
+++ b/debian/rules
@@ -127,7 +127,7 @@ 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-itk
+		-papache2-mpm-itk -plibapache2-mod-proxy-html -papache2.2-bin
 	dh_installdocs --link-doc=apache2-suexec-pristine -papache2-suexec
 	dh_installdocs -a
 
@@ -138,7 +138,7 @@ override_dh_installchangelogs:
 	# packages only.
 	dh_installchangelogs -Napache2-suexec -Napache2-mpm-worker \
 		-Napache2-mpm-prefork -Napache2-mpm-event -Napache2-mpm-itk \
-		-Napache2-data
+		-Napache2-data -Nlibapache2-mod-proxy-html -Napache2.2-bin
 
 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)