[SCM] Debian packaging for apache2 branch, master, updated. debian/2.4.4-6-9-gc3a667e

[Stefan Fritsch]

The following commit has been merged in the master branch:
commit c3a667edca902a28b84db7a4795a1029db89cf6d
Author: Stefan Fritsch <sf at sfritsch.de>
Date:   Sun Jul 14 21:42:46 2013 +0200

    Don't fail postinst/postrm if restart/configtest fails

diff --git a/debian/changelog b/debian/changelog
index 9a9f1be..3b51e68 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 apache2 (2.4.4-7) UNRELEASED; urgency=low
 
+  [ Arno Töll ]
   * Document our security model in our NEWS file and highlight we do not allow
     access to /srv. Thanks to joeyh for pointing this out.
   * Allow the use of apache2-maintscript-helper from a sub-function. We rely
@@ -8,6 +9,10 @@ apache2 (2.4.4-7) UNRELEASED; urgency=low
     cases.
   * Mention that the dh_apache2 conditional must be present in postrm too (Closes: #716694)
 
+  [ Stefan Fritsch ]
+  * Don't fail package upgrade or removal just because the configuration is in
+    an inconsistent state. Closes: #716921
+
  -- Arno Töll <arno at debian.org>  Sat, 13 Jul 2013 22:20:05 +0200
 
 apache2 (2.4.4-6) unstable; urgency=low
diff --git a/debian/rules b/debian/rules
index a58cae1..e31c543 100755
--- a/debian/rules
+++ b/debian/rules
@@ -124,8 +124,7 @@ override_dh_fixperms-indep:
 	dh_fixperms -i
 
 override_dh_installinit:
-	dh_installinit --restart-after-upgrade -- defaults 91 09
-
+	dh_installinit --restart-after-upgrade --error-handler=true -- defaults 91 09
 
 override_dh_installdocs-indep:
 	# TODO: So, did anyone check convert_docs needs an update? ;)

-- 
Debian packaging for apache2