[routino] 02/03: Incorporate changes from 2.7-1.2 NMU.

[Bas Couwenberg]

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

sebastic-guest pushed a commit to branch master
in repository routino.

commit 102465af946f6a4a0dd624be40d3832570feddee
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Dec 5 17:25:57 2014 +0100

    Incorporate changes from 2.7-1.2 NMU.
---
 debian/changelog          |  9 +++++++++
 debian/routino-www.postrm | 27 ++++-----------------------
 2 files changed, 13 insertions(+), 23 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b19f803..75b8ccf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,15 @@ routino (2.7.2-1) unstable; urgency=low
 
  -- Uwe Steinmann <steinm at debian.org>  Thu, 30 Oct 2014 6:45:27 +0100
 
+routino (2.7-1.2) testing-proposed-updates; urgency=medium
+
+  * Non-maintainer upload.
+  * routino-www.postrm: Don't fail on removal of a non-existing directory.
+    Don't repeat the same actions on remove and purge - only remove the
+    results directory during purge.  (Closes: #656586)
+
+ -- Andreas Beckmann <anbe at debian.org>  Wed, 03 Dec 2014 21:55:19 +0100
+
 routino (2.7-1.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff --git a/debian/routino-www.postrm b/debian/routino-www.postrm
index 9b279b6..d4640a2 100644
--- a/debian/routino-www.postrm
+++ b/debian/routino-www.postrm
@@ -7,29 +7,10 @@ if [ "$DPKG_DEBUG" = "developer" ]; then
   set -x
 fi
 
-case "$1" in
-	purge)
-		rm -rf /var/lib/routino/results
-		rmdir --ignore-fail-on-non-empty /var/lib/routino/data
-
-	;;
-	remove)
-		rm -rf /var/lib/routino/results
-		rmdir --ignore-fail-on-non-empty /var/lib/routino/data
-
-	;;
-
-  upgrade)
-
-  ;;
-
-	failed-upgrade|abort-install|abort-upgrade|disappear)
-	;;
-    *)
-        echo "postrm called with unknown argument \`$1'" >&2
-        exit 1
-
-esac
+if [ "$1" = "purge" ]; then
+	rm -rf /var/lib/routino/results
+	rmdir --ignore-fail-on-non-empty /var/lib/routino/data || true
+fi
 
 #DEBHELPER#
 

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