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 3626e944e463e8c5319ed9c9b28a6c70f8480251 Author: Ruben Undheim <ruben.undh...@gmail.com> Date: Thu Sep 3 19:12:23 2015 +0200 User name not configurable anymore --- debian/osm-tile-server-base.config | 1 - debian/osm-tile-server-base.postinst | 4 ++-- debian/osm-tile-server-base.templates | 5 ----- debian/osm-tile-server-tilelite.postinst | 4 ++-- debian/po/templates.pot | 12 +++--------- 5 files changed, 7 insertions(+), 19 deletions(-) diff --git a/debian/osm-tile-server-base.config b/debian/osm-tile-server-base.config index c059a67..735b1ea 100644 --- a/debian/osm-tile-server-base.config +++ b/debian/osm-tile-server-base.config @@ -4,7 +4,6 @@ set -e . /usr/share/debconf/confmodule -db_input high osm-tile-server/db-user || true db_input high osm-tile-server/db-name || true db_input high osm-tile-server/import-sample || true db_go diff --git a/debian/osm-tile-server-base.postinst b/debian/osm-tile-server-base.postinst index c9c6fab..c4ea4b6 100644 --- a/debian/osm-tile-server-base.postinst +++ b/debian/osm-tile-server-base.postinst @@ -22,8 +22,8 @@ set -e case "$1" in configure) - db_get osm-tile-server/db-user - DBUSER=$RET + #db_get osm-tile-server/db-user + DBUSER="osm-tile-server" db_get osm-tile-server/db-name DBNAME=$RET db_get osm-tile-server/import-sample diff --git a/debian/osm-tile-server-base.templates b/debian/osm-tile-server-base.templates index d95075a..1292caf 100644 --- a/debian/osm-tile-server-base.templates +++ b/debian/osm-tile-server-base.templates @@ -4,11 +4,6 @@ Type: string Default: osmdb _Description: Enter name of postgresql database to use for the tile server: -Template: osm-tile-server/db-user -Type: string -Default: osm-tile-server -_Description: Enter name of the postgresql user: - Template: osm-tile-server/import-sample Type: boolean Default: false diff --git a/debian/osm-tile-server-tilelite.postinst b/debian/osm-tile-server-tilelite.postinst index 16f3932..d7449fb 100644 --- a/debian/osm-tile-server-tilelite.postinst +++ b/debian/osm-tile-server-tilelite.postinst @@ -22,8 +22,8 @@ set -e case "$1" in configure) - db_get osm-tile-server/db-user - DBUSER=$RET + #db_get osm-tile-server/db-user + DBUSER="osm-tile-server" db_get osm-tile-server/db-name DBNAME=$RET diff --git a/debian/po/templates.pot b/debian/po/templates.pot index 1116f19..ad8b6a1 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 08:31+0200\n" +"POT-Creation-Date: 2015-09-03 19:12+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" @@ -23,21 +23,15 @@ msgstr "" msgid "Enter name of postgresql database to use for the tile server:" msgstr "" -#. Type: string -#. Description -#: ../osm-tile-server-base.templates:2001 -msgid "Enter name of the postgresql user:" -msgstr "" - #. Type: boolean #. Description -#: ../osm-tile-server-base.templates:3001 +#: ../osm-tile-server-base.templates:2001 msgid "Should a test OSM file be imported into the database?" msgstr "" #. Type: boolean #. Description -#: ../osm-tile-server-base.templates:3001 +#: ../osm-tile-server-base.templates:2001 msgid "" "If YES, a map of Liechtenstein will be imported so that it will be available " "to test." -- 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