[SCM] Debian packaging for apache2 branch, next, updated. debian/2.4.4-2-11-g3770f98

[Arno Töll]

The following commit has been merged in the next branch:
commit 3770f98bf3ec81f8061d111c9c0b7859829b2350
Author: Arno Töll <arno at debian.org>
Date:   Sun May 12 16:20:55 2013 +0200

    Move postrm script to prerm to fix 681546

diff --git a/debian/apache2-dev.install b/debian/apache2-dev.install
index 785dd5b..2f628cd 100644
--- a/debian/apache2-dev.install
+++ b/debian/apache2-dev.install
@@ -4,4 +4,4 @@
 debian/debhelper/dh_apache2		/usr/bin
 debian/debhelper/apache2.pm		/usr/share/perl5/Debian/Debhelper/Sequence/
 debian/debhelper/postinst-apache2	/usr/share/debhelper/autoscripts/
-debian/debhelper/postrm-apache2		/usr/share/debhelper/autoscripts/
+debian/debhelper/prerm-apache2		/usr/share/debhelper/autoscripts/
diff --git a/debian/changelog b/debian/changelog
index 4bd0c52..2a8be5c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,7 +7,11 @@ apache2 (2.4.4-3) UNRELEASED; urgency=low
   * Fix "typo in mpm_event.load" by applying the patch provided by Bastian
     Triller. Thanks (Closes: #704639)
   * Replace some occurrences of "Squeeze" in our scripts. It's Wheezy time.
-  * Add -e|--noenable option to dh_apache2 (Closes: #681544)
+  * Changes in dh_apache2:
+    + Add -e|--noenable option to dh_apache2 (Closes: #681544)
+    + Disable scripts in prerm, not postrm (Closes: #681546)
+    + Call the postinst code always, not only during configure
+      (Closes: #681545)
   * Fix "don't assume apache2 is running 24 hours a day when rotating
     logs": Only restart the webserver when it was previously running
     (Closes: #707892)
@@ -24,7 +28,7 @@ apache2 (2.4.4-3) UNRELEASED; urgency=low
     fixed in 2.4.
   * Enable mod_authn_core when upgrading from wheezy (Closes: #702866)
 
- -- Arno Töll <arno at debian.org>  Sun, 12 May 2013 15:50:15 +0200
+ -- Arno Töll <arno at debian.org>  Sun, 12 May 2013 17:06:18 +0200
 
 apache2 (2.4.4-2) experimental; urgency=low
 
diff --git a/debian/debhelper/dh_apache2.in b/debian/debhelper/dh_apache2.in
index 1716901..18f78bd 100755
--- a/debian/debhelper/dh_apache2.in
+++ b/debian/debhelper/dh_apache2.in
@@ -82,7 +82,7 @@ B<dh_apache2> [S<I<debhelper options>>] [S<B<--conditional>>=I<expression>] [B<-
 =head1 DESCRIPTION
 
 B<dh_apache2> is a debhelper program that is responsible for correctly installing
-Apache2 configuration snippets and setting postinst, postrm and dependencies in
+Apache2 configuration snippets and setting postinst, prerm and dependencies in
 Apache2 web server modules and web applications.
 
 It supports the following configuration types
@@ -498,7 +498,7 @@ foreach my $package ((@{$dh{DOPACKAGES}}))
 	{
 		foreach my $ref (@postinst_autoscripts)
 		{
-			for my $script_type (qw/postinst postrm/)
+			for my $script_type (qw/postinst prerm/)
 			{
 				if ($script_type eq "postinst" &&  $dh{NOENABLE})
 				{
@@ -513,7 +513,7 @@ foreach my $package ((@{$dh{DOPACKAGES}}))
 					ACTION => $dh{RESTART},
 				);
 
-				if ($script_type eq "postrm")
+				if ($script_type eq "prerm")
 				{
 					$replacements{'HELPER'} =~ s/en/dis/;
 				}
diff --git a/debian/debhelper/postinst-apache2 b/debian/debhelper/postinst-apache2
index b833cbf..a944514 100644
--- a/debian/debhelper/postinst-apache2
+++ b/debian/debhelper/postinst-apache2
@@ -1,4 +1,4 @@
-if [ "$1" = "configure" ] && #CONDITIONAL_VARIABLE#; then
+if #CONDITIONAL_VARIABLE#; then
 	if [ -e /usr/share/apache2/apache2-maintscript-helper ] ; then
 		. /usr/share/apache2/apache2-maintscript-helper
 		for conf in #NAMES# ; do
diff --git a/debian/debhelper/postrm-apache2 b/debian/debhelper/prerm-apache2
similarity index 81%
rename from debian/debhelper/postrm-apache2
rename to debian/debhelper/prerm-apache2
index f489eb9..d71d36b 100644
--- a/debian/debhelper/postrm-apache2
+++ b/debian/debhelper/prerm-apache2
@@ -1,4 +1,4 @@
-if [ "$1" = "purge" ] || [ "$1" = "remove" ] ; then
+if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ] ; then
 	if #CONDITIONAL_VARIABLE#; then
 		if [ -e /usr/share/apache2/apache2-maintscript-helper ] ; then
 			. /usr/share/apache2/apache2-maintscript-helper

-- 
Debian packaging for apache2