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

[Stefan Fritsch]

The following commit has been merged in the next branch:
commit f0d204d8b611c0d14f2f22add256998f8ac2c451
Author: Stefan Fritsch <sf at sfritsch.de>
Date:   Sun Mar 18 22:55:24 2012 +0100

    Don't build apache2.2-bin transitional package
    
    We don't need it and it may even create trouble if
    the config included in gnome-user-share doesn't work
    with 2.4

diff --git a/debian/control b/debian/control
index cbb423b..3457bc7 100644
--- a/debian/control
+++ b/debian/control
@@ -92,15 +92,6 @@ Description: transitional event MPM package for apache2
 
 #XXX: apache2-mpm-itk transitional?
 
-Package: apache2.2-bin
-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
 Depends: ${misc:Depends}, ${shlibs:Depends}, ${perl:Depends}
diff --git a/debian/rules b/debian/rules
index a48a268..cd161e5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -92,7 +92,6 @@ override_dh_installdocs:
 	perl debian/convert_docs debian/apache2-doc/usr/share/doc/apache2-doc/manual
 	dh_installdocs --link-doc=apache2 -papache2 -papache2-dev -papache2-dbg \
 		-papache2-mpm-worker -papache2-mpm-prefork -papache2-mpm-event
-	dh_installdocs --link-doc=apache2-bin -papache2.2-bin
 	dh_installdocs --link-doc=apache2-suexec-pristine -papache2-suexec
 	dh_installdocs
 
@@ -101,7 +100,7 @@ override_dh_installchangelogs:
 	# package not to trash the disk at the installation site. Together with
 	# dh_installdocs this means that changelogs are installed in a few
 	# packages only.
-	dh_installchangelogs -Napache2.2-bin -Napache2-suexec -Napache2-mpm-worker \
+	dh_installchangelogs -Napache2-suexec -Napache2-mpm-worker \
 		-Napache2-mpm-prefork -Napache2-mpm-event -Napache2-data
 
 override_dh_installman:

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