[openstreetmap-carto] 01/01: Delete style.xml in prerm instead.

[Ruben Undheim]

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

rubund-guest pushed a commit to branch two_packages
in repository openstreetmap-carto.

commit 611e3cf68dd230b43f8b9411cf73bd184deb817a
Author: Ruben Undheim <ruben.undheim at gmail.com>
Date:   Sat Sep 19 19:49:07 2015 +0200

    Delete style.xml in prerm instead.
---
 debian/openstreetmap-carto.postinst |  4 +---
 debian/openstreetmap-carto.postrm   | 38 ------------------------------------
 debian/openstreetmap-carto.prerm    | 39 +++++++++++++++++++++++++++++++++++++
 3 files changed, 40 insertions(+), 41 deletions(-)

diff --git a/debian/openstreetmap-carto.postinst b/debian/openstreetmap-carto.postinst
index 16244fe..d8ac8fb 100755
--- a/debian/openstreetmap-carto.postinst
+++ b/debian/openstreetmap-carto.postinst
@@ -9,10 +9,8 @@ set -e
 case "$1" in
   configure|triggered)
 
-db_get openstreetmap-carto/database-name
-if [ "$RET" != "gis" ]; then
+    db_get openstreetmap-carto/database-name
     sed -e"s/\[gis\]/\[$RET\]/" /usr/share/openstreetmap-carto-common/style.xml > /usr/share/openstreetmap-carto/style.xml
-fi
 
   ;;
 
diff --git a/debian/openstreetmap-carto.postrm b/debian/openstreetmap-carto.postrm
deleted file mode 100644
index 9c5bb71..0000000
--- a/debian/openstreetmap-carto.postrm
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/sh
-# postrm script for test
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <postrm> `remove'
-#        * <postrm> `purge'
-#        * <old-postrm> `upgrade' <new-version>
-#        * <new-postrm> `failed-upgrade' <old-version>
-#        * <new-postrm> `abort-install'
-#        * <new-postrm> `abort-install' <old-version>
-#        * <new-postrm> `abort-upgrade' <old-version>
-#        * <disappearer's-postrm> `disappear' <overwriter>
-#          <overwriter-version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
-case "$1" in
-    purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
-       rm -f /usr/share/openstreetmap-carto/style.xml
-    ;;
-
-    *)
-        echo "postrm called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/openstreetmap-carto.prerm b/debian/openstreetmap-carto.prerm
new file mode 100644
index 0000000..3f1af85
--- /dev/null
+++ b/debian/openstreetmap-carto.prerm
@@ -0,0 +1,39 @@
+#!/bin/sh
+# prerm script for tull
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <prerm> `remove'
+#        * <old-prerm> `upgrade' <new-version>
+#        * <new-prerm> `failed-upgrade' <old-version>
+#        * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
+#        * <deconfigured's-prerm> `deconfigure' `in-favour'
+#          <package-being-installed> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see https://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    remove|upgrade|deconfigure)
+       rm -f /usr/share/openstreetmap-carto/style.xml
+    ;;
+
+    failed-upgrade)
+    ;;
+
+    *)
+        echo "prerm called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0

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