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

[Arno Töll]

The following commit has been merged in the next branch:
commit fe499ed87dd14a5a7f2a6137f7abba81e3c1661c
Author: Arno Töll <arno at debian.org>
Date:   Mon May 20 14:20:42 2013 +0200

    Restart the web-server during upgrades

diff --git a/debian/a2enmod b/debian/a2enmod
index dd953e0..123b646 100755
--- a/debian/a2enmod
+++ b/debian/a2enmod
@@ -155,6 +155,7 @@ sub doit {
                     info("removing dangling symlink $conflink\n");
                     unlink($conflink);
                 }
+
                 return 1;
             }
             else {
@@ -162,6 +163,10 @@ sub doit {
             }
         }
 
+        if ( $purge ) {
+            switch_marker( $obj, $act, $acton );
+        }
+
         error("$name $acton does not exist!\n");
         return 0;
     }
diff --git a/debian/changelog b/debian/changelog
index c58bc4b..a82f10c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,8 @@ apache2 (2.4.4-3) UNRELEASED; urgency=low
     + However, still hook into postrm and purge state when required
     + Call the postinst code always, not only during configure
       (Closes: #681545)
+    + Fix "dh_apache2 postinst code needs to reload more" and reload the
+      web-server in postinst when upgrading (Closes: #702929)
   * Let a2enmod purge state when calling -p for already disabled
     configurations.
   * Fix "don't assume apache2 is running 24 hours a day when rotating
@@ -33,7 +35,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>  Mon, 20 May 2013 13:14:12 +0200
+ -- Arno Töll <arno at debian.org>  Mon, 20 May 2013 14:19:22 +0200
 
 apache2 (2.4.4-2) experimental; urgency=low
 
diff --git a/debian/debhelper/apache2-maintscript-helper b/debian/debhelper/apache2-maintscript-helper
index 14a8908..87572f2 100644
--- a/debian/debhelper/apache2-maintscript-helper
+++ b/debian/debhelper/apache2-maintscript-helper
@@ -347,20 +347,20 @@ apache2_invoke()
 			a2query $check_switch "$CONF" > /dev/null 2>&1 || a2query_ret=$?
 			if [ "$a2query_ret" -eq 0 ] ; then
 				# configuration is already enabled
-				apache2_msg "info" "apache2_invoke $CONF: No action required"
-				return 0
+				apache2_msg "info" "apache2_invoke $CONF: already enabled"
+				APACHE2_NEED_ACTION=1
 			elif [ "$a2query_ret" -eq 32	 ] ; then
 				# the maintainer disabled the module
 				apache2_msg "info" "apache2_invoke $CONF: no action - $invoke_string was disabled by maintainer"
 				return 0
+			else
+				# coming here either means:
+				# a) we have no clue about the module (e.g. for upgrades prior to maintscript-helper
+				# b) it's a fresh install
+				APACHE2_NEED_ACTION=1
+				a2$CMD -m -q "$CONF" > /dev/null 2>&1 || return 1
+				apache2_msg "info" "apache2_invoke: Enable $invoke_string $CONF"
 			fi
-
-			# coming here either means:
-			# a) we have no clue about the module (e.g. for upgrades prior to maintscript-helper
-			# b) it's a fresh install
-			APACHE2_NEED_ACTION=1
-			a2$CMD -m -q "$CONF" > /dev/null 2>&1 || return 1
-			apache2_msg "info" "apache2_invoke: Enable $invoke_string $CONF"
 			;;
 		disconf|dismod|dissite)
 			local a2query_ret=0
@@ -383,8 +383,8 @@ apache2_invoke()
 			elif [ "$a2query_ret" -eq 33 ] ; then
 				if [ "$APACHE2_MAINTSCRIPT_NAME" = 'postrm' ] && [ "$APACHE2_MAINTSCRIPT_METHOD" = "purge" ] ; then
 					apache2_msg "info" "apache2_invoke $APACHE2_MAINTSCRIPT_NAME: Purging state for $CONF"
-					a2$CMD -p -f -q "$CONF" || return 1
-					APACHE2_NEED_ACTION=0
+					# this will return RC=1
+					( a2$CMD -p -f -q "$CONF" > /dev/null 2>&1 )
 				fi
 			else
 				apache2_msg "info" "apache2_invoke $CONF $APACHE2_MAINTSCRIPT_NAME: No action required"

-- 
Debian packaging for apache2