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 db9506b909e68c535977af9c7692011278b2c0c0
Author: Ruben Undheim <ruben.undh...@gmail.com>
Date:   Wed Oct 14 13:24:05 2015 +0200

    If data dir already in /usr/share/openstreetmap-carto-common, delete 
data.old
---
 debian/changelog                   |  4 +++-
 debian/openstreetmap-carto.preinst | 11 +++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 3a8df84..c1b9678 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,8 @@ openstreetmap-carto (2.35.0-3) unstable; urgency=medium
       - Use "dpkg-maintscript-helper dir_to_symlink"
       - Remove files that have accidentally been left there due
         to a previous not perfectly done package upgrade.
+      - If data dir already in /usr/share/openstreetmap-carto-common,
+        delete data.old
     - debian/openstreetmap-carto.prerm:
       - Use "dpkg-maintscript-helper dir_to_symlink"
     - debian/openstreetmap-carto-common.postinst:
@@ -30,7 +32,7 @@ openstreetmap-carto (2.35.0-3) unstable; urgency=medium
   * debian/copyright:
     - Added myself to the list of copyright holders for debian/*
 
- -- Ruben Undheim <ruben.undh...@gmail.com>  Tue, 13 Oct 2015 17:16:41 +0200
+ -- Ruben Undheim <ruben.undh...@gmail.com>  Wed, 14 Oct 2015 13:24:54 +0200
 
 openstreetmap-carto (2.35.0-2) unstable; urgency=low
 
diff --git a/debian/openstreetmap-carto.preinst 
b/debian/openstreetmap-carto.preinst
index 3747931..3040963 100644
--- a/debian/openstreetmap-carto.preinst
+++ b/debian/openstreetmap-carto.preinst
@@ -30,6 +30,17 @@ case "$1" in
         if [ -L /usr/share/openstreetmap-carto/symbols/symbols ] ; then
             rm -f /usr/share/openstreetmap-carto/symbols/symbols
         fi
+
+        # If data directory exists in openstreetmap-carto-common, it
+        # is safe to delete data.old in openstreetmap-carto:
+        if [ -d /usr/share/openstreetmap-carto/data.old ] && \
+           [ ! -L /usr/share/openstreetmap-carto/data.old ] && \
+           [ -d /usr/share/openstreetmap-carto-common/data ] && \
+           [ ! -L /usr/share/openstreetmap-carto-common/data ]
+        then
+            rm -rf /usr/share/openstreetmap-carto/data.old
+        fi
+
     ;;
 
     abort-upgrade)

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

_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

Reply via email to