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

[Arno Töll]

The following commit has been merged in the next branch:
commit 378e1104cf8bfffb4ba32bdf2699fe884267dfe8
Author: Arno Töll <debian at toell.net>
Date:   Sun Mar 25 20:27:53 2012 +0200

    Disable set -x again, update changelog

diff --git a/debian/changelog b/debian/changelog
index 93b2884..83941f7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,12 +9,18 @@ apache2 (2.4.1-3) experimental; urgency=low
   * Update PACKAGING hints and cope several questions raised among the
     discussions with packagers. Thus, invokation of apache2-maintscript-helper
     in maintainer scripts are covered now.
+  * Changes in dh_apache2:
+    + Invoke the maintscript helper postrm action for simple package removals, too.
+    + Fix a bug which accidentally called "en{mod,site,conf}" instead of "di{mod,site,conf}"
+  * Changes in apache2_maintscript_helper
+    + Provide apache2_is_upgrade and apache2_is_fresh_installation functions
+    + Parse maintainer script arguments to find out which script called us
 
   [ 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>  Sun, 25 Mar 2012 13:42:49 +0200
+ -- Arno Töll <debian at toell.net>  Sun, 25 Mar 2012 20:26:37 +0200
 
 apache2 (2.4.1-2) experimental; urgency=low
 
diff --git a/debian/debhelper/apache2-maintscript-helper b/debian/debhelper/apache2-maintscript-helper
index 7864f5f..df92ed9 100644
--- a/debian/debhelper/apache2-maintscript-helper
+++ b/debian/debhelper/apache2-maintscript-helper
@@ -18,7 +18,8 @@
 # IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-set -x 
+#XXX: Remove me later
+# set -x
 
 if [ -n "${EXPORT_APACHE2_MAINTSCRIPT_HELPER:-}" ] ; then
 	return

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