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 9c3f389d6bb9ae2a19b245aa7890ef0a0cfc549c Author: Ruben Undheim <ruben.undh...@gmail.com> Date: Sat Sep 19 17:16:33 2015 +0200 Split in two binary packages --- debian/control | 12 +++++- debian/install | 3 -- .../{config => openstreetmap-carto-common.config} | 3 -- debian/{docs => openstreetmap-carto-common.docs} | 0 debian/openstreetmap-carto-common.install | 3 ++ debian/openstreetmap-carto-common.postinst | 13 +++++++ ...plates => openstreetmap-carto-common.templates} | 6 --- debian/{config => openstreetmap-carto.config} | 3 -- debian/openstreetmap-carto.dirs | 1 + debian/openstreetmap-carto.links | 2 + debian/openstreetmap-carto.postinst | 32 ++++++++++++++++ debian/openstreetmap-carto.templates | 6 +++ debian/openstreetmap-carto.triggers | 1 + debian/po/POTFILES.in | 3 +- debian/po/templates.pot | 43 +++++++++++----------- debian/postinst | 18 --------- 16 files changed, 92 insertions(+), 57 deletions(-) diff --git a/debian/control b/debian/control index 18fd8c6..1125c7e 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,7 @@ Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/openstreetmap-carto.git Vcs-Git: git://anonscm.debian.org/pkg-grass/openstreetmap-carto.git Homepage: https://github.com/gravitystorm/openstreetmap-carto -Package: openstreetmap-carto +Package: openstreetmap-carto-common Architecture: all Depends: ${misc:Depends}, ttf-dejavu, @@ -28,3 +28,13 @@ Description: standard OpenStreetMap Mapnik stylesheet to download the necessary shapefiles. . This package does not provide a tileserver, or perform tile rendering. + +Package: openstreetmap-carto +Architecture: all +Depends: ${misc:Depends}, + openstreetmap-carto-common +Description: Setup for standard OpenStreetMap Mapnik stylesheet + This package provides configuration of the database info for + openstreetmap-carto. + . + This package does not provide a tileserver, or perform tile rendering. diff --git a/debian/install b/debian/install deleted file mode 100644 index 091e4bf..0000000 --- a/debian/install +++ /dev/null @@ -1,3 +0,0 @@ -get-shapefiles.sh usr/share/openstreetmap-carto/ -symbols usr/share/openstreetmap-carto -style.xml usr/share/openstreetmap-carto/ diff --git a/debian/config b/debian/openstreetmap-carto-common.config similarity index 68% copy from debian/config copy to debian/openstreetmap-carto-common.config index a9f7b3d..b513cb7 100755 --- a/debian/config +++ b/debian/openstreetmap-carto-common.config @@ -7,6 +7,3 @@ set -e db_input high openstreetmap-carto/fetch-data || true db_go - -db_input high openstreetmap-carto/database-name || true -db_go diff --git a/debian/docs b/debian/openstreetmap-carto-common.docs similarity index 100% rename from debian/docs rename to debian/openstreetmap-carto-common.docs diff --git a/debian/openstreetmap-carto-common.install b/debian/openstreetmap-carto-common.install new file mode 100644 index 0000000..23384f5 --- /dev/null +++ b/debian/openstreetmap-carto-common.install @@ -0,0 +1,3 @@ +get-shapefiles.sh usr/share/openstreetmap-carto-common/ +symbols usr/share/openstreetmap-carto-common +style.xml usr/share/openstreetmap-carto-common/ diff --git a/debian/openstreetmap-carto-common.postinst b/debian/openstreetmap-carto-common.postinst new file mode 100755 index 0000000..06bf8ce --- /dev/null +++ b/debian/openstreetmap-carto-common.postinst @@ -0,0 +1,13 @@ +#!/bin/sh + +set -e + +# Source debconf library. +. /usr/share/debconf/confmodule + +db_get openstreetmap-carto/fetch-data +if [ "$RET" = "true" ]; then + cd /usr/share/openstreetmap-carto-common/ && ./get-shapefiles.sh +fi + +#DEBHELPER# diff --git a/debian/templates b/debian/openstreetmap-carto-common.templates similarity index 55% rename from debian/templates rename to debian/openstreetmap-carto-common.templates index 83040fc..969e943 100644 --- a/debian/templates +++ b/debian/openstreetmap-carto-common.templates @@ -6,9 +6,3 @@ _Description: Fetch data files from the web? by running the get-shapefiles.sh script in the /usr/share/openstreetmap-carto directory. -Template: openstreetmap-carto/database-name -Type: string -Default: gis -_Description: Name of the postgresql database: - The stylesheet describes how to render OpenStreetMap data contained within a - postgresql database. The name of the database is by default debian-osm-carto. diff --git a/debian/config b/debian/openstreetmap-carto.config similarity index 70% rename from debian/config rename to debian/openstreetmap-carto.config index a9f7b3d..887451b 100755 --- a/debian/config +++ b/debian/openstreetmap-carto.config @@ -5,8 +5,5 @@ set -e # Source debconf library. . /usr/share/debconf/confmodule -db_input high openstreetmap-carto/fetch-data || true -db_go - db_input high openstreetmap-carto/database-name || true db_go diff --git a/debian/openstreetmap-carto.dirs b/debian/openstreetmap-carto.dirs new file mode 100644 index 0000000..7706cb1 --- /dev/null +++ b/debian/openstreetmap-carto.dirs @@ -0,0 +1 @@ +/usr/share/openstreetmap-carto diff --git a/debian/openstreetmap-carto.links b/debian/openstreetmap-carto.links new file mode 100644 index 0000000..eba3fc0 --- /dev/null +++ b/debian/openstreetmap-carto.links @@ -0,0 +1,2 @@ +/usr/share/openstreetmap-carto-common/data /usr/share/openstreetmap-carto/data +/usr/share/openstreetmap-carto-common/symbols /usr/share/openstreetmap-carto/symbols diff --git a/debian/openstreetmap-carto.postinst b/debian/openstreetmap-carto.postinst new file mode 100755 index 0000000..16244fe --- /dev/null +++ b/debian/openstreetmap-carto.postinst @@ -0,0 +1,32 @@ +#!/bin/sh + +set -e + +# Source debconf library. +. /usr/share/debconf/confmodule + + +case "$1" in + configure|triggered) + +db_get openstreetmap-carto/database-name +if [ "$RET" != "gis" ]; then + sed -e"s/\[gis\]/\[$RET\]/" /usr/share/openstreetmap-carto-common/style.xml > /usr/share/openstreetmap-carto/style.xml +fi + + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; + +esac + +#DEBHELPER# + + +exit 0 diff --git a/debian/openstreetmap-carto.templates b/debian/openstreetmap-carto.templates new file mode 100644 index 0000000..e05b2c7 --- /dev/null +++ b/debian/openstreetmap-carto.templates @@ -0,0 +1,6 @@ +Template: openstreetmap-carto/database-name +Type: string +Default: gis +_Description: Name of the postgresql database: + The stylesheet describes how to render OpenStreetMap data contained within a + postgresql database. The name of the database is by default debian-osm-carto. diff --git a/debian/openstreetmap-carto.triggers b/debian/openstreetmap-carto.triggers new file mode 100644 index 0000000..dab090e --- /dev/null +++ b/debian/openstreetmap-carto.triggers @@ -0,0 +1 @@ +interest-noawait /usr/share/openstreetmap-carto-common/style.xml diff --git a/debian/po/POTFILES.in b/debian/po/POTFILES.in index cef83a3..e580142 100644 --- a/debian/po/POTFILES.in +++ b/debian/po/POTFILES.in @@ -1 +1,2 @@ -[type: gettext/rfc822deb] templates +[type: gettext/rfc822deb] openstreetmap-carto.templates +[type: gettext/rfc822deb] openstreetmap-carto-common.templates diff --git a/debian/po/templates.pot b/debian/po/templates.pot index b2ccec4..694f63f 100644 --- a/debian/po/templates.pot +++ b/debian/po/templates.pot @@ -1,15 +1,14 @@ -# openstreetmap-carto debconf templates. -# Copyright (C) 2014 Christopher Baines <m...@cbaines.net> -# This file is distributed under the same license as the openstreetmap-carto -# package. -# Christopher Baines <m...@cbaines.net>, 2014. +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the openstreetmap-carto package. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. # #, fuzzy msgid "" msgstr "" "Project-Id-Version: openstreetmap-carto\n" "Report-Msgid-Bugs-To: openstreetmap-ca...@packages.debian.org\n" -"POT-Creation-Date: 2014-04-15 10:23+0100\n" +"POT-Creation-Date: 2015-09-19 19:10+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <l...@li.org>\n" @@ -18,32 +17,32 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#. Type: boolean +#. Type: string #. Description -#: ../templates:1001 -msgid "Fetch data files from the web?" +#: ../openstreetmap-carto.templates:1001 +msgid "Name of the postgresql database:" msgstr "" -#. Type: boolean +#. Type: string #. Description -#: ../templates:1001 +#: ../openstreetmap-carto.templates:1001 msgid "" -"The openstreetmap-carto stylesheet uses several datafiles, this package " -"includes a script to fetch these from the web. This can be done manually " -"later by running the get-shapefiles.sh script in the /usr/share/" -"openstreetmap-carto directory." +"The stylesheet describes how to render OpenStreetMap data contained within a " +"postgresql database. The name of the database is by default debian-osm-carto." msgstr "" -#. Type: string +#. Type: boolean #. Description -#: ../templates:2001 -msgid "Name of the postgresql database:" +#: ../openstreetmap-carto-common.templates:1001 +msgid "Fetch data files from the web?" msgstr "" -#. Type: string +#. Type: boolean #. Description -#: ../templates:2001 +#: ../openstreetmap-carto-common.templates:1001 msgid "" -"The stylesheet describes how to render OpenStreetMap data contained within a " -"postgresql database. The name of the database is by default debian-osm-carto." +"The openstreetmap-carto stylesheet uses several datafiles, this package " +"includes a script to fetch these from the web. This can be done manually " +"later by running the get-shapefiles.sh script in the /usr/share/" +"openstreetmap-carto directory." msgstr "" diff --git a/debian/postinst b/debian/postinst deleted file mode 100755 index 5487b49..0000000 --- a/debian/postinst +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh - -set -e - -# Source debconf library. -. /usr/share/debconf/confmodule - -db_get openstreetmap-carto/fetch-data -if [ "$RET" = "true" ]; then - cd /usr/share/openstreetmap-carto/ && ./get-shapefiles.sh -fi - -db_get openstreetmap-carto/database-name -if [ "$RET" != "gis" ]; then - sed -i -e"s/\[gis\]/\[$RET\]/" /usr/share/openstreetmap-carto/style.xml -fi - -#DEBHELPER# -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/openstreetmap-carto.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