[osm-tile-server] 82/117: Don't remove files before postrm

[Ruben Undheim]

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

rubund-guest pushed a commit to branch master
in repository osm-tile-server.

commit bf25a1e062010cba9ba42beed5f32339097c4485
Author: Ruben Undheim <ruben.undheim at gmail.com>
Date:   Tue Sep 8 17:12:43 2015 +0200

    Don't remove files before postrm
---
 ...-server-tilelite.postrm => osm-tile-server-base.postrm} | 14 +++++++-------
 debian/osm-tile-server-base.prerm                          |  4 ----
 debian/osm-tile-server-tilelite.postrm                     | 11 ++++-------
 debian/osm-tile-server-tilelite.prerm                      |  1 -
 4 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/debian/osm-tile-server-tilelite.postrm b/debian/osm-tile-server-base.postrm
similarity index 64%
copy from debian/osm-tile-server-tilelite.postrm
copy to debian/osm-tile-server-base.postrm
index 7559b1b..140eee4 100644
--- a/debian/osm-tile-server-tilelite.postrm
+++ b/debian/osm-tile-server-base.postrm
@@ -1,5 +1,5 @@
 #!/bin/sh
-# postrm script for bilder-ru
+# postrm script for test
 #
 # see: dh_installdeb(1)
 
@@ -15,16 +15,16 @@ set -e
 #        * <new-postrm> `abort-upgrade' <old-version>
 #        * <disappearer's-postrm> `disappear' <overwriter>
 #          <overwriter-version>
-# for details, see https://www.debian.org/doc/debian-policy/ or
+# for details, see http://www.debian.org/doc/debian-policy/ or
 # the debian-policy package
 
 
 case "$1" in
-    remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
-    ;;
-
-    purge)
-        rm -rf /var/cache/osm-tile-server-tilelite
+    purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+       rm -f /usr/share/openstreetmap-carto/style-osm-tile-server.xml 
+       rm -f /var/lib/osm-tile-server-base/selected_region.txt
+       rm -f /var/lib/osm-tile-server-base/status.txt
+       rm -f /var/cache/osm-tile-server-base/downloaded.osm.pbf
     ;;
 
     *)
diff --git a/debian/osm-tile-server-base.prerm b/debian/osm-tile-server-base.prerm
index d2c4473..2abf7bf 100644
--- a/debian/osm-tile-server-base.prerm
+++ b/debian/osm-tile-server-base.prerm
@@ -19,10 +19,6 @@ set -e
 
 case "$1" in
     remove|upgrade|deconfigure)
-       rm -f /usr/share/openstreetmap-carto/style-osm-tile-server.xml 
-       rm -f /var/lib/osm-tile-server-base/selected_region.txt
-       rm -f /var/lib/osm-tile-server-base/status.txt
-       rm -f /var/cache/osm-tile-server-base/downloaded.osm.pbf
     ;;
 
     failed-upgrade)
diff --git a/debian/osm-tile-server-tilelite.postrm b/debian/osm-tile-server-tilelite.postrm
index 7559b1b..6a620ce 100644
--- a/debian/osm-tile-server-tilelite.postrm
+++ b/debian/osm-tile-server-tilelite.postrm
@@ -1,5 +1,5 @@
 #!/bin/sh
-# postrm script for bilder-ru
+# postrm script for test
 #
 # see: dh_installdeb(1)
 
@@ -15,16 +15,13 @@ set -e
 #        * <new-postrm> `abort-upgrade' <old-version>
 #        * <disappearer's-postrm> `disappear' <overwriter>
 #          <overwriter-version>
-# for details, see https://www.debian.org/doc/debian-policy/ or
+# for details, see http://www.debian.org/doc/debian-policy/ or
 # the debian-policy package
 
 
 case "$1" in
-    remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
-    ;;
-
-    purge)
-        rm -rf /var/cache/osm-tile-server-tilelite
+    purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+        rm -f /etc/apache2/sites-available/osm-tile-server-tilelite.conf
     ;;
 
     *)
diff --git a/debian/osm-tile-server-tilelite.prerm b/debian/osm-tile-server-tilelite.prerm
index e66f681..8a1c241 100644
--- a/debian/osm-tile-server-tilelite.prerm
+++ b/debian/osm-tile-server-tilelite.prerm
@@ -20,7 +20,6 @@ set -e
 case "$1" in
     remove|upgrade|deconfigure)
         a2dissite osm-tile-server-tilelite.conf
-        rm -f /etc/apache2/sites-available/osm-tile-server-tilelite.conf
     ;;
 
     failed-upgrade)

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