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

[Arno Töll]

The following commit has been merged in the next branch:
commit 46d19a30101c286cde7c958751a5de703d976a31
Author: Arno Töll <debian at toell.net>
Date:   Tue Mar 27 16:51:55 2012 +0200

    Bring back the apache2.2-bin transitional package (this reverts
    f0d204d8b611c0d14f2f22add256998f8ac2c451).

diff --git a/debian/changelog b/debian/changelog
index 8cdaa15..4c8ac9b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,12 +22,14 @@ apache2 (2.4.1-3) experimental; urgency=low
     + Break APIs: apache2_invoke accepts a single configuration file argument
       only now. However, other than dh_apache2 no users of this feature were
       known.
+  * Build the apache2.2-bin transitional package again, without it updates from
+    Squeeze are broken from some use cases
 
   [ Stefan Fritsch ]
   * Move /usr/share/doc alias to separate config file and don't enable it
     by default.
 
- -- Arno Töll <debian at toell.net>  Mon, 26 Mar 2012 00:43:38 +0200
+ -- Arno Töll <debian at toell.net>  Tue, 27 Mar 2012 16:52:46 +0200
 
 apache2 (2.4.1-2) experimental; urgency=low
 
diff --git a/debian/control b/debian/control
index e227224..35ae7ae 100644
--- a/debian/control
+++ b/debian/control
@@ -91,6 +91,15 @@ 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}

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