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 e84b95187f54b9e56b8e292ee2a578ee3c2ca1b1
Author: Ruben Undheim <ruben.undh...@gmail.com>
Date: Fri Sep 4 20:10:07 2015 +0200
Get all regions into debconf
---
debian/osm-tile-server-base.config | 18 +++-
debian/osm-tile-server-base.templates | 22 ++---
debian/po/templates.pot | 158 ++++++++++++++++++++++++++++++++--
3 files changed, 177 insertions(+), 21 deletions(-)
diff --git a/debian/osm-tile-server-base.config
b/debian/osm-tile-server-base.config
index 336222a..ac3480a 100644
--- a/debian/osm-tile-server-base.config
+++ b/debian/osm-tile-server-base.config
@@ -12,6 +12,7 @@ db_input high osm-tile-server/db-name || true
db_input low osm-tile-server/action-now || true
db_go
+
db_get osm-tile-server/action-now
DONOW=$RET
if [ "$DONOW" = "true" ] ; then
@@ -19,23 +20,36 @@ if [ "$DONOW" = "true" ] ; then
db_input low osm-tile-server/continent || true
db_go
db_get osm-tile-server/continent
+ #db_fset osm-tile-server/country_europe seen false
CONTINENT=$RET
if [ "$CONTINENT" = "Asia" ] ; then
+ CHOICES=`cat /usr/share/osm-tile-server-base/regions/asia.txt | sed
':a;N;$!ba;s/\n/, /g'`
+ db_subst osm-tile-server/country_asia CHOICES $CHOICES
db_input low osm-tile-server/country_asia || true
elif [ "$CONTINENT" = "Europe" ] ; then
+ CHOICES=`cat /usr/share/osm-tile-server-base/regions/europe.txt | sed
':a;N;$!ba;s/\n/, /g'`
+ db_subst osm-tile-server/country_europe CHOICES $CHOICES
db_input low osm-tile-server/country_europe || true
elif [ "$CONTINENT" = "South America" ] ; then
+ CHOICES=`cat /usr/share/osm-tile-server-base/regions/south-america.txt
| sed ':a;N;$!ba;s/\n/, /g'`
+ db_subst osm-tile-server/country_samerica CHOICES $CHOICES
db_input low osm-tile-server/country_samerica || true
elif [ "$CONTINENT" = "North America" ] ; then
+ CHOICES=`cat /usr/share/osm-tile-server-base/regions/north-america.txt
| sed ':a;N;$!ba;s/\n/, /g'`
+ db_subst osm-tile-server/country_namerica CHOICES $CHOICES
db_input low osm-tile-server/country_namerica || true
elif [ "$CONTINENT" = "Africa" ] ; then
+ CHOICES=`cat /usr/share/osm-tile-server-base/regions/africa.txt | sed
':a;N;$!ba;s/\n/, /g'`
+ db_subst osm-tile-server/country_africa CHOICES $CHOICES
db_input low osm-tile-server/country_africa || true
elif [ "$CONTINENT" = "Australia and Oceania" ] ; then
+ CHOICES=`cat
/usr/share/osm-tile-server-base/regions/australia-oceania.txt | sed
':a;N;$!ba;s/\n/, /g'`
+ db_subst osm-tile-server/country_australia CHOICES $CHOICES
db_input low osm-tile-server/country_australia || true
elif [ "$CONTINENT" = "Central America" ] ; then
+ CHOICES=`cat
/usr/share/osm-tile-server-base/regions/central-america.txt | sed
':a;N;$!ba;s/\n/, /g'`
+ db_subst osm-tile-server/country_camerica CHOICES $CHOICES
db_input low osm-tile-server/country_camerica || true
- elif [ "$CONTINENT" = "Antarctica" ] ; then
- db_input low osm-tile-server/country_antarctica || true
fi
db_go
diff --git a/debian/osm-tile-server-base.templates
b/debian/osm-tile-server-base.templates
index dc32a3f..189c205 100644
--- a/debian/osm-tile-server-base.templates
+++ b/debian/osm-tile-server-base.templates
@@ -16,55 +16,49 @@ _Description: Do you want to select area to import now?
Template: osm-tile-server/country_europe
Type: select
-__Choices: None, Germany, Norway, Sweden
+__Choices: None, ${CHOICES}
Default: None
_Description: Select which area to download and import:
Template: osm-tile-server/country_asia
Type: select
-__Choices: None, China, India, Russia
+__Choices: None, ${CHOICES}
Default: None
_Description: Select which area to download and import:
Template: osm-tile-server/country_namerica
Type: select
-__Choices: None, Canada, USA
+__Choices: None, ${CHOICES}
Default: None
_Description: Select which area to download and import:
Template: osm-tile-server/country_samerica
Type: select
-__Choices: None, Bolivia, Venezuela
+__Choices: None, ${CHOICES}
Default: None
_Description: Select which area to download and import:
Template: osm-tile-server/country_camerica
Type: select
-__Choices: None, Costa Rica, Mexico
+__Choices: None, ${CHOICES}
Default: None
_Description: Select which area to download and import:
Template: osm-tile-server/country_africa
Type: select
-__Choices: None, Egypt, South Africa
+__Choices: None, ${CHOICES}
Default: None
_Description: Select which area to download and import:
Template: osm-tile-server/country_australia
Type: select
-__Choices: None, Australia, New Zealand
-Default: None
-_Description: Select which area to download and import:
-
-Template: osm-tile-server/country_antarctica
-Type: select
-__Choices: None
+__Choices: None, ${CHOICES}
Default: None
_Description: Select which area to download and import:
Template: osm-tile-server/continent
Type: select
-__Choices: None, Africa, Antarctica, Asia, Australia and Oceania, Central
America, Europe, North America, South America
+__Choices: None, Africa, Asia, Australia and Oceania, Central America, Europe,
North America, South America
Default: None
_Description: Select continent:
diff --git a/debian/po/templates.pot b/debian/po/templates.pot
index ad8b6a1..691db34 100644
--- a/debian/po/templates.pot
+++ b/debian/po/templates.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: osm-tile-server\n"
"Report-Msgid-Bugs-To: osm-tile-ser...@packages.debian.org\n"
-"POT-Creation-Date: 2015-09-03 19:12+0200\n"
+"POT-Creation-Date: 2015-09-04 20:09+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"
@@ -26,13 +26,161 @@ msgstr ""
#. Type: boolean
#. Description
#: ../osm-tile-server-base.templates:2001
-msgid "Should a test OSM file be imported into the database?"
+msgid "Should a test OSM file (Liechtenstein) be imported into the database?"
msgstr ""
#. Type: boolean
#. Description
-#: ../osm-tile-server-base.templates:2001
+#: ../osm-tile-server-base.templates:3001
+msgid "Do you want to select area to import now? "
+msgstr ""
+
+#. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#: ../osm-tile-server-base.templates:4001
+#: ../osm-tile-server-base.templates:5001
+#: ../osm-tile-server-base.templates:6001
+#: ../osm-tile-server-base.templates:7001
+#: ../osm-tile-server-base.templates:8001
+#: ../osm-tile-server-base.templates:9001
+#: ../osm-tile-server-base.templates:10001
+#: ../osm-tile-server-base.templates:11001
+msgid "None"
+msgstr ""
+
+#. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#. Type: select
+#. Choices
+#: ../osm-tile-server-base.templates:4001
+#: ../osm-tile-server-base.templates:5001
+#: ../osm-tile-server-base.templates:6001
+#: ../osm-tile-server-base.templates:7001
+#: ../osm-tile-server-base.templates:8001
+#: ../osm-tile-server-base.templates:9001
+#: ../osm-tile-server-base.templates:10001
+msgid "${CHOICES}"
+msgstr ""
+
+#. Type: select
+#. Description
+#. Type: select
+#. Description
+#. Type: select
+#. Description
+#. Type: select
+#. Description
+#. Type: select
+#. Description
+#. Type: select
+#. Description
+#. Type: select
+#. Description
+#: ../osm-tile-server-base.templates:4002
+#: ../osm-tile-server-base.templates:5002
+#: ../osm-tile-server-base.templates:6002
+#: ../osm-tile-server-base.templates:7002
+#: ../osm-tile-server-base.templates:8002
+#: ../osm-tile-server-base.templates:9002
+#: ../osm-tile-server-base.templates:10002
+msgid "Select which area to download and import:"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../osm-tile-server-base.templates:11001
+msgid "Africa"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../osm-tile-server-base.templates:11001
+msgid "Asia"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../osm-tile-server-base.templates:11001
+msgid "Australia and Oceania"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../osm-tile-server-base.templates:11001
+msgid "Central America"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../osm-tile-server-base.templates:11001
+msgid "Europe"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../osm-tile-server-base.templates:11001
+msgid "North America"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../osm-tile-server-base.templates:11001
+msgid "South America"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../osm-tile-server-base.templates:11002
+msgid "Select continent:"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../osm-tile-server-base.templates:12001
+msgid "Later"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../osm-tile-server-base.templates:12001
+msgid "Now; will take some time"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../osm-tile-server-base.templates:12002
+msgid "Do you want to download and import immediately or defer it to later?"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../osm-tile-server-base.templates:12002
msgid ""
-"If YES, a map of Liechtenstein will be imported so that it will be available "
-"to test."
+"Since downloading and importing may take some time, it is advicable to start "
+"it afterwards by running the \"osm-tile-server-process\" command after this "
+"configuration is done."
msgstr ""
--
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
