diff --git a/debian/control b/debian/control index d475bc9e..ce79e067 100644 --- a/debian/control +++ b/debian/control @@ -2,12 +2,12 @@ Source: libapache2-mod-tile Section: utils Priority: optional Maintainer: Frederik Ramm -Build-Depends: debhelper (>= 7), apache2-prefork-dev (>= 2.2.3) | apache2-threaded-dev (>= 2.2.3), libmapnik-dev | libmapnik2-dev, autoconf, automake, m4, libtool +Build-Depends: debhelper (>= 7), apache2-dev (>= 2.4.0), libmapnik-dev | libmapnik2-dev, autoconf, automake, m4, libtool Standards-Version: 3.9.3 Package: libapache2-mod-tile Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, renderd | tirex-master, apache2.2-common, apache2-mpm-prefork | apache2-mpm-worker +Depends: ${shlibs:Depends}, ${misc:Depends}, renderd | tirex-master, apache2 Suggests: renderd Description: Apache module to deliver tiles created by renderd This Apache module receives map tiles requests and satisfies them from diff --git a/debian/libapache2-mod-tile.install b/debian/libapache2-mod-tile.install index 86c4fcc5..aa646fa7 100644 --- a/debian/libapache2-mod-tile.install +++ b/debian/libapache2-mod-tile.install @@ -1,6 +1,7 @@ debian/tile.load /etc/apache2/mods-available -debian/tileserver_site /etc/apache2/sites-available/ +debian/tileserver_site.conf /etc/apache2/sites-available/ readme.txt /usr/share/doc/libapache2-mod-tile munin/mod_tile* /usr/share/munin/plugins openstreetmap-tiles-update-expire /usr/bin/ +osmosis-db_replag /usr/bin slippymap.html /var/www/osm diff --git a/debian/libapache2-mod-tile.postinst b/debian/libapache2-mod-tile.postinst index ff68c29c..8c9f1a8a 100644 --- a/debian/libapache2-mod-tile.postinst +++ b/debian/libapache2-mod-tile.postinst @@ -16,7 +16,7 @@ if [ "$1" = configure ] ; then db_stop if [ "x$ENABLE_SITE" = "xtrue" ] ; then a2ensite tileserver_site - a2dissite default + a2dissite 000-default fi fi diff --git a/debian/libapache2-mod-tile.prerm b/debian/libapache2-mod-tile.prerm index 52b94e90..01c94a13 100644 --- a/debian/libapache2-mod-tile.prerm +++ b/debian/libapache2-mod-tile.prerm @@ -3,9 +3,9 @@ set -e if [ "$1" = remove ] ; then a2dissite tileserver_site || true - a2ensite default || true - a2dismod -q -f tile || true - invoke-rc.d apache2 restart || true + a2ensite 000-default || true + a2dismod -q -f tile || true + invoke-rc.d apache2 restart || true fi # automatically remove munin plugins diff --git a/debian/tileserver_site b/debian/tileserver_site.conf similarity index 100% rename from debian/tileserver_site rename to debian/tileserver_site.conf