[SCM] Debian packaging for apache2 branch, next, updated. debian/2.4.2-2-27-g159fcdc

Arno Töll arno at debian.org
Mon Jul 2 11:45:10 UTC 2012


The following commit has been merged in the next branch:
commit 159fcdc581c6baf217ac0d40ae992432be9768f2
Author: Arno Töll <arno at debian.org>
Date:   Mon Jul 2 13:44:17 2012 +0200

    Shift Stefans changes to the upcoming upload. Apparently I was forgetting to
    merge his changes before uploading 2.4.2-2. I'm sorry.

diff --git a/debian/changelog b/debian/changelog
index 0b2bb1a..8d65670 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,12 +3,17 @@ apache2 (2.4.2-3) UNRELEASED; urgency=low
   [ Stefan Fritsch ]
   * Add examples for X-Content-Type-Options and X-Frame-Options to
     security.conf.
+  * 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 ]
   * Rewrite most parts of the init script to make it more readable and improve
     visual feedback when fancy output is in use.
 
- -- Arno Töll <arno at debian.org>  Tue, 12 Jun 2012 00:01:02 +0200
+ -- Arno Töll <arno at debian.org>  Mon, 02 Jul 2012 13:44:02 +0200
 
 apache2 (2.4.2-2) experimental; urgency=low
 
@@ -17,11 +22,6 @@ apache2 (2.4.2-2) experimental; urgency=low
     not pulled in by any of the enabled modules, but we need it in any case
     for apache2.conf. Closes: #669876
   * 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
-  * 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

-- 
Debian packaging for apache2



More information about the Pkg-apache-commits mailing list