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 5d98b8ecf36f3150f02b5cee25ed9230fa549409 Author: Ruben Undheim <ruben.undh...@gmail.com> Date: Mon Oct 12 23:05:50 2015 +0200 Make sure /usr/share/openstreetmap-carto/symbols is removed if it is a directory. --- debian/changelog | 7 +++++-- debian/openstreetmap-carto.postinst | 9 +++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index bf41e1b..8b2d1a0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,11 +4,14 @@ openstreetmap-carto (2.35.0-3) UNRELEASED; urgency=medium * debian/po/*.po: - Fixed path to get-shapefiles.sh in translations * Robustified transition from one binary to two binaries: + - debian/openstreetmap-carto.postinst: + - Make sure /usr/share/openstreetmap-carto/symbols is removed if it + is a directory and replaced by symbolic link - debian/openstreetmap-carto.preinst: - Check that data dir is not a symbolic link before moving + - Check that data dir is not a symbolic link before moving to data.old - debian/openstreetmap-carto-common.postinst: - Move data.old from /usr/share/openstreetmap-carto to + - Move data.old from /usr/share/openstreetmap-carto to /usr/share/openstreetmap-carto-common to make it unnecessary to download data files again if they have already been downloaded before the upgrade. diff --git a/debian/openstreetmap-carto.postinst b/debian/openstreetmap-carto.postinst index d8ac8fb..ff3335c 100755 --- a/debian/openstreetmap-carto.postinst +++ b/debian/openstreetmap-carto.postinst @@ -9,9 +9,18 @@ set -e case "$1" in configure|triggered) + # Generate style.xml from "template" in openstreetmap-carto-common db_get openstreetmap-carto/database-name sed -e"s/\[gis\]/\[$RET\]/" /usr/share/openstreetmap-carto-common/style.xml > /usr/share/openstreetmap-carto/style.xml + + # This is necessary to change the dir to a symbolic link since a dir will never be + # replaced by a symbolic link during upgrade if not done in maintainer scripts. + if [ -d /usr/share/openstreetmap-carto/symbols ] && [ ! -L /usr/share/openstreetmap-carto/symbols ] ; then + rmdir /usr/share/openstreetmap-carto/symbols + ln -sf ../openstreetmap-carto-common/symbols /usr/share/openstreetmap-carto/symbols + fi + ;; abort-upgrade|abort-remove|abort-deconfigure) -- 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