[osm-tile-server] 27/117: Fixed some dependencies

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

    Fixed some dependencies
---
 debian/control                    |  6 +++---
 debian/osm-tile-server-base.prerm | 40 ---------------------------------------
 2 files changed, 3 insertions(+), 43 deletions(-)

diff --git a/debian/control b/debian/control
index 692cb3d..df00b21 100644
--- a/debian/control
+++ b/debian/control
@@ -14,16 +14,16 @@ Description: Meta package for installing OSM tile server
 
 Package: osm-tile-server-base
 Architecture: all
+Pre-Depends: adduser, postgis, postgresql-contrib, osm2pgsql
 Depends: ${misc:Depends},
-        openstreetmap-carto, node-carto, osm2pgsql,
-        postgis, postgresql-contrib
+        openstreetmap-carto, node-carto
 Description: Common files for OSM tile server
 
 Package: osm-tile-server-tilelite
 Architecture: all
 Depends: ${misc:Depends},
          osm-tile-server-base, tilelite, screen
-Breaks: osm-tile-server-mod-tile
+#Breaks: osm-tile-server-mod-tile
 Description: This sets up a full OSM tile server using tilelite
 
 #Package: osm-tile-server-mod-tile
diff --git a/debian/osm-tile-server-base.prerm b/debian/osm-tile-server-base.prerm
deleted file mode 100644
index 0352459..0000000
--- a/debian/osm-tile-server-base.prerm
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/sh
-# prerm script for bilder-ru
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <prerm> `remove'
-#        * <old-prerm> `upgrade' <new-version>
-#        * <new-prerm> `failed-upgrade' <old-version>
-#        * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
-#        * <deconfigured's-prerm> `deconfigure' `in-favour'
-#          <package-being-installed> <version> `removing'
-#          <conflicting-package> <version>
-# for details, see https://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
-case "$1" in
-    remove|upgrade|deconfigure)
-        #a2dissite naturfakta.conf
-        #rm /var/www/packages/bilder/www/bilder
-    ;;
-
-    failed-upgrade)
-    ;;
-
-    *)
-        echo "prerm called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0

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