[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 8a1f0ed8ffb21c0c55872ad797316b6771f1667d
Author: Stefan Fritsch <sf at sfritsch.de>
Date:   Sun May 6 00:01:27 2012 +0200

    Add Replaces for the old mpm packages to apache2-bin

diff --git a/debian/changelog b/debian/changelog
index 4a784f3..a71b3fa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ apache2 (2.4.2-2) experimental; urgency=low
   * Don't ship the changelogs in the apache2-mpm-itk transitional package.
   * 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
 
   [ Arno Töll ]
   * Add mode lines to various configuration files and scripts. Reformat
diff --git a/debian/control b/debian/control
index 3f52a04..77abb0f 100644
--- a/debian/control
+++ b/debian/control
@@ -50,7 +50,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
 # MODULE_MAGIC_NUMBER_MAJOR from apache2/include/ap_mmn.h
 Provides: ${apache2:API}, httpd, httpd-cgi
 Suggests: www-browser, apache2-doc, apache2-suexec-pristine | apache2-suexec-custom
-Replaces: apache2.2-bin (<< 2.3~), apache2.2-common
+Replaces: apache2.2-bin (<< 2.3~), apache2.2-common, apache2-mpm-prefork (<< 2.3~), apache2-mpm-itk (<< 2.3~), apache2-mpm-worker (<< 2.3~), apache2-mpm-event (<< 2.3~)
 Conflicts: apache2.2-bin (<< 2.3~), apache2.2-common
 Description: Apache HTTP Server (binary files and modules)
  The Apache Software Foundation's goal is to build a secure, efficient and

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