[osm-tile-server] 92/117: Use files from openstreetmap-carto-common instead

[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 6db439525d3c90428553e8b939187f03814a82c8
Author: Ruben Undheim <ruben.undheim at gmail.com>
Date:   Mon Sep 28 09:16:53 2015 +0400

    Use files from openstreetmap-carto-common instead
---
 debian/osm-tile-server-base.postinst | 8 ++++----
 debian/osm-tile-server-base.triggers | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/debian/osm-tile-server-base.postinst b/debian/osm-tile-server-base.postinst
index f83b8ab..fa79287 100644
--- a/debian/osm-tile-server-base.postinst
+++ b/debian/osm-tile-server-base.postinst
@@ -79,11 +79,11 @@ case "$1" in
             echo "DONE"
         fi
 
-        cp /usr/share/openstreetmap-carto/style.xml /var/lib/osm-tile-server-base/tilesets/default/style.xml
+        cp /usr/share/openstreetmap-carto-common/style.xml /var/lib/osm-tile-server-base/tilesets/default/style.xml
 
         sed -i 's/\(dbname">.*CDATA\)\[[^\]*\]/\1\['${DBNAME}'\]\]/' /var/lib/osm-tile-server-base/tilesets/default/style.xml
-        ln -sf /usr/share/openstreetmap-carto/data /var/lib/osm-tile-server-base/tilesets/default/data
-        ln -sf /usr/share/openstreetmap-carto/symbols /var/lib/osm-tile-server-base/tilesets/default/symbols
+        ln -sf /usr/share/openstreetmap-carto-common/data /var/lib/osm-tile-server-base/tilesets/default/data
+        ln -sf /usr/share/openstreetmap-carto-common/symbols /var/lib/osm-tile-server-base/tilesets/default/symbols
    
 
         sed -i 's/^DBNAME="[^"]*"/DBNAME="'${DBNAME}'"/' /etc/osm-tile-server.conf
@@ -147,7 +147,7 @@ case "$1" in
     triggered)
         db_get osm-tile-server/db-name
         DBNAME=$RET
-        cp /usr/share/openstreetmap-carto/style.xml /var/lib/osm-tile-server-base/tilesets/default/style.xml
+        cp /usr/share/openstreetmap-carto-common/style.xml /var/lib/osm-tile-server-base/tilesets/default/style.xml
 
         sed -i 's/\(dbname">.*CDATA\)\[[^\]*\]/\1\['${DBNAME}'\]\]/' /var/lib/osm-tile-server-base/tilesets/default/style.xml
     ;;
diff --git a/debian/osm-tile-server-base.triggers b/debian/osm-tile-server-base.triggers
index 5489cfd..dab090e 100644
--- a/debian/osm-tile-server-base.triggers
+++ b/debian/osm-tile-server-base.triggers
@@ -1 +1 @@
-interest-noawait /usr/share/openstreetmap-carto/style.xml
+interest-noawait /usr/share/openstreetmap-carto-common/style.xml

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