[routino] 02/03: Don't use apache2-mainscript-helper in postrm.

[Sebastiaan Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository routino.

commit a6a85c1182f332726d4835059119bec0d9f49b20
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Jul 31 19:31:55 2015 +0200

    Don't use apache2-mainscript-helper in postrm.
---
 debian/changelog          | 2 ++
 debian/routino-www.postrm | 9 ++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2351c95..7945afc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 routino (2.7.3-3) UNRELEASED; urgency=medium
 
   * Use which instead of path to test for invoke-rc.d.
+  * Don't use apache2-mainscript-helper in postrm.
+    (closes: #793859)
 
  -- Bas Couwenberg <sebastic at debian.org>  Fri, 31 Jul 2015 18:03:32 +0200
 
diff --git a/debian/routino-www.postrm b/debian/routino-www.postrm
index ad92f09..65cf71d 100644
--- a/debian/routino-www.postrm
+++ b/debian/routino-www.postrm
@@ -10,17 +10,16 @@ fi
 apache_uninstall() {
         COMMON_STATE=$(dpkg-query -f '${Status}' -W 'apache2.2-common' 2>/dev/null | awk '{print $3}' || true)
 
-        if [ -e /usr/share/apache2/apache2-maintscript-helper ] ; then
-                . /usr/share/apache2/apache2-maintscript-helper
-                apache2_invoke disconf routino-www || exit $?
-        elif [ "$COMMON_STATE" = "installed" ] || [ "$COMMON_STATE" = "unpacked" ] ; then
+        if [ "$COMMON_STATE" = "installed" ] || [ "$COMMON_STATE" = "unpacked" ] ; then
                 [ ! -L /etc/apache2/conf.d/routino-www.conf ] || rm /etc/apache2/conf.d/routino-www.conf
         fi
 
         rm -f /etc/apache2/conf-available/routino-www.conf
+        rm -f /etc/apache2/conf-enabled/routino-www.conf
+        rm -f /var/lib/apache2/conf/enabled_by_maint/routino-www
 }
 
-if [ "$1" = "purge" ]; then
+if [ "$1" = "remove" -o "$1" = "purge" ]; then
 	apache_uninstall
 
 	rm -rf /var/lib/routino/results

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/routino.git