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

[Arno Töll]

The following commit has been merged in the next branch:
commit 6fb499b246d9eb66260710ad53e80ad90bec6852
Author: Arno Töll <arno at debian.org>
Date:   Sun Jul 29 21:58:53 2012 +0200

    Properly check return code of a2query in apache2_invoke

diff --git a/debian/changelog b/debian/changelog
index 54a2a52..72a389d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,8 +18,11 @@ apache2 (2.4.2-3) UNRELEASED; urgency=low
     with ext3" by changing the default to more moderate values. Note, some file
     systems have a hard limit of supported subdirectories (Closes: #682840).
     Ported from our 2.2 tree targeted for Wheezy.
+  * Properly check return code of a2query in the apache2_invoke library
+    function. This caused reverse dependencies to fail for newly installed
+    modules previously.
 
- -- Arno Töll <arno at debian.org>  Mon, 23 Jul 2012 23:47:12 +0200
+ -- Arno Töll <arno at debian.org>  Sun, 29 Jul 2012 21:57:38 +0200
 
 apache2 (2.4.2-2) experimental; urgency=low
 
diff --git a/debian/debhelper/apache2-maintscript-helper b/debian/debhelper/apache2-maintscript-helper
index d130d35..8ec3b79 100644
--- a/debian/debhelper/apache2-maintscript-helper
+++ b/debian/debhelper/apache2-maintscript-helper
@@ -343,8 +343,8 @@ apache2_invoke()
 
 	case "$CMD" in
 		enconf|enmod|ensite)
-			(a2query $check_switch "$CONF" > /dev/null 2>&1)
-			local a2query_ret=$?
+			local a2query_ret=0
+			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"

-- 
Debian packaging for apache2