[osm-tile-server] 25/117: Don't build osm-tile-server-config

[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 d4c1acf314ac139de29e27e63d02ed03dc2b4708
Author: Ruben Undheim <ruben.undheim at gmail.com>
Date:   Thu Sep 3 08:31:44 2015 +0200

    Don't build osm-tile-server-config
---
 debian/control                                                 | 10 ++--------
 ...m-tile-server-config.config => osm-tile-server-base.config} |  0
 ...le-server-config.postinst => osm-tile-server-base.postinst} |  0
 ...osm-tile-server-config.prerm => osm-tile-server-base.prerm} |  0
 ...-server-config.templates => osm-tile-server-base.templates} |  0
 debian/po/POTFILES.in                                          |  2 +-
 debian/po/templates.pot                                        | 10 +++++-----
 7 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/debian/control b/debian/control
index 73e0258..41506ff 100644
--- a/debian/control
+++ b/debian/control
@@ -18,23 +18,17 @@ Depends: ${misc:Depends},
         postgis, postgresql-contrib
 Description: Common files for OSM tile server
 
-Package: osm-tile-server-config
-Architecture: all
-Depends: ${misc:Depends},
-        osm-tile-server-base
-Description: This package contains the main configuration of the OSM tile server
-
 Package: osm-tile-server-tilelite
 Architecture: all
 Depends: ${misc:Depends},
-         osm-tile-server-config, tilelite, screen
+         osm-tile-server-base, tilelite, screen
 Breaks: osm-tile-server-mod-tile
 Description: This sets up a full OSM tile server using tilelite
 
 Package: osm-tile-server-mod-tile
 Architecture: all
 Depends: ${misc:Depends},
-         osm-tile-server-config, apache2
+         osm-tile-server-base, apache2
 #       libapache2-mod-tile
 Breaks: osm-tile-server-tilelite
 Description: This sets up a full OSM tile server using mod_tile
diff --git a/debian/osm-tile-server-config.config b/debian/osm-tile-server-base.config
similarity index 100%
rename from debian/osm-tile-server-config.config
rename to debian/osm-tile-server-base.config
diff --git a/debian/osm-tile-server-config.postinst b/debian/osm-tile-server-base.postinst
similarity index 100%
rename from debian/osm-tile-server-config.postinst
rename to debian/osm-tile-server-base.postinst
diff --git a/debian/osm-tile-server-config.prerm b/debian/osm-tile-server-base.prerm
similarity index 100%
rename from debian/osm-tile-server-config.prerm
rename to debian/osm-tile-server-base.prerm
diff --git a/debian/osm-tile-server-config.templates b/debian/osm-tile-server-base.templates
similarity index 100%
rename from debian/osm-tile-server-config.templates
rename to debian/osm-tile-server-base.templates
diff --git a/debian/po/POTFILES.in b/debian/po/POTFILES.in
index 6293195..2cc9364 100644
--- a/debian/po/POTFILES.in
+++ b/debian/po/POTFILES.in
@@ -1 +1 @@
-[type: gettext/rfc822deb] osm-tile-server-config.templates
+[type: gettext/rfc822deb] osm-tile-server-base.templates
diff --git a/debian/po/templates.pot b/debian/po/templates.pot
index 231fc1c..1116f19 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-server at packages.debian.org\n"
-"POT-Creation-Date: 2015-09-03 01:37+0200\n"
+"POT-Creation-Date: 2015-09-03 08:31+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -19,25 +19,25 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../osm-tile-server-config.templates:1001
+#: ../osm-tile-server-base.templates:1001
 msgid "Enter name of postgresql database to use for the tile server:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../osm-tile-server-config.templates:2001
+#: ../osm-tile-server-base.templates:2001
 msgid "Enter name of the postgresql user:"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../osm-tile-server-config.templates:3001
+#: ../osm-tile-server-base.templates:3001
 msgid "Should a test OSM file be imported into the database?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../osm-tile-server-config.templates:3001
+#: ../osm-tile-server-base.templates:3001
 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