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

[Arno Töll]

The following commit has been merged in the next branch:
commit fdb6503c66bbafea8e92a86c26fa2653ee503253
Author: Arno Töll <debian at toell.net>
Date:   Sat Feb 25 03:09:27 2012 +0100

    Drop -common transitional package, add MPM transitional packages
    
    * Minor tweaks in debian/changelog
    * Drop Pre-Depends in apache2 - we do conffile transitions ourselves, no need to
      pre-depend on dpkg anymore
    * Move MPM conflicts to the MPM transitional package

diff --git a/debian/changelog b/debian/changelog
index 593de05..fd72530 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
 apache2 (2.4.1-1) experimental; urgency=low
 
   * Package the coming up 2.4 branch of Apache by packaging the current
-    release candidate 2.4.1.
+    GA release 2.4.1.
     + Fix "IndexIgnore only allowes to add in vhost context, not replace"
      (Closes: #296886)
     + Fix "mod_status stats are wrong." (Closes: #519322)
@@ -111,7 +111,7 @@ apache2 (2.4.1-1) experimental; urgency=low
 
   * Update bash completion functions to reflect the new site setup.
 
- -- Arno Töll <debian at toell.net>  Sat, 25 Feb 2012 00:47:39 +0100
+ -- Arno Töll <debian at toell.net>  Sat, 25 Feb 2012 03:07:24 +0100
 
 apache2 (2.2.22-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index df896d1..f027935 100644
--- a/debian/control
+++ b/debian/control
@@ -19,10 +19,8 @@ Architecture: any
 Depends: ${misc:Depends}, lsb-base, procps [!hurd-i386],
  perl, mime-support, apache2-bin (= ${binary:Version}),
  apache2-data (= ${source:Version})
-Pre-Depends: ${misc:Pre-Depends}
 Replaces: apache2.2-common (<< 2.3~)
 Breaks: apache2.2-common (<< 2.3~)
-Provides: apache2.2-common
 Recommends: ssl-cert
 Suggests: www-browser, apache2-doc, apache2-suexec-pristine | apache2-suexec-custom
 Description: Apache HTTP Server
@@ -53,9 +51,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}
 Provides: apache2-api-20111203
 Suggests: www-browser, apache2-doc, apache2-suexec-pristine | apache2-suexec-custom
 Replaces: apache2.2-bin (<< 2.3~), apache2.2-common (<< 2.3~),
- apache2-mpm-worker, apache2-mpm-prefork, apache2-mpm-event
 Breaks: apache2.2-bin (<< 2.3~), apache2.2-common (<< 2.3~),
- apache2-mpm-worker, apache2-mpm-prefork, apache2-mpm-event, apache2-mpm-itk
 Description: Apache HTTP Server common binary files
  The Apache Software Foundation's goal is to build a secure, efficient and
  extensible HTTP server as standards-compliant open source software. The
@@ -66,11 +62,14 @@ Description: Apache HTTP Server common binary files
  instance. Do not install this package unless you want to set-up the Apache
  HTTP server entirely on your own.
 
-Package: apache2.2-common
+Package: apache2-mpm-worker
+Provides: apache2-mpm-prefork, apache2-mpm-event
+Replaces: apache2-mpm-worker (<< 2.3~), apache2-mpm-prefork (<< 2.3~), apache2-mpm-event (<< 2.3~)
+Breaks: apache2-mpm-worker (<< 2.3~), apache2-mpm-prefork (<< 2.3~), apache2-mpm-event (<< 2.3~), apache2-mpm-itk (<< 2.3~)
 Architecture: any
 Section: oldlibs
 Priority: extra
-Depends: ${shlibs:Depends}, ${misc:Depends}, apache2 (>= 2.3~)
+Depends: ${shlibs:Depends}, ${misc:Depends}, apache2 (= ${binary:Version})
 Description: Transitional package for apache2
  This is a transitional package for apache2, and can be safely removed
  after the installation is complete.

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