switch to distribution-supplied osmosis

Both, Debian and Ubuntu now come with a reasonably recent version
of osmosis. Make using that the default.

diff --git a/settings/settings.php b/settings/settings.php
index 4ebc199d1357cc12238e043e4ea4b3ba8adf8f4c..d90136bdbf41a8e1ec4183a5515312a11eb9247e 100644 (file)
--- a/settings/settings.php
+++ b/settings/settings.php
@@ -11,7 +11,7 @@
        @define('CONST_Path_Postgresql_Contrib', '/usr/share/postgresql/'.CONST_Postgresql_Version.'/contrib');
        @define('CONST_Path_Postgresql_Postgis', CONST_Path_Postgresql_Contrib.'/postgis-1.5');
        @define('CONST_Osm2pgsql_Binary', CONST_BasePath.'/osm2pgsql/osm2pgsql');
-       @define('CONST_Osmosis_Binary', CONST_BasePath.'/osmosis-0.40.1/bin/osmosis');
+       @define('CONST_Osmosis_Binary', '/usr/bin/osmosis');
 
        // Website settings
        @define('CONST_ClosedForIndexing', false);