Author: nd-guest Date: 2008-02-29 09:15:52 +0000 (Fri, 29 Feb 2008) New Revision: 1395
Modified: packages/gpsdrive/trunk/debian/NEWS packages/gpsdrive/trunk/debian/changelog packages/gpsdrive/trunk/debian/patches/97-osmxml.dpatch Log: not comment database part in osm.xml. mapnik is useless without it and we already handle failing db connections. Modified: packages/gpsdrive/trunk/debian/NEWS =================================================================== --- packages/gpsdrive/trunk/debian/NEWS 2008-02-28 23:43:48 UTC (rev 1394) +++ packages/gpsdrive/trunk/debian/NEWS 2008-02-29 09:15:52 UTC (rev 1395) @@ -6,6 +6,6 @@ ~/.gpsdrive/osm.xml or remove/fix all elements mapnik is complaining about, usually missing world_boundaries or a database connection problem. If removed, the file will be re-created during next start of gpsdrive with - these parts commented out. + the world_boundaries part commented out. -- Andreas Putzo <[EMAIL PROTECTED]> Thu, 28 Feb 2008 23:20:02 +0000 Modified: packages/gpsdrive/trunk/debian/changelog =================================================================== --- packages/gpsdrive/trunk/debian/changelog 2008-02-28 23:43:48 UTC (rev 1394) +++ packages/gpsdrive/trunk/debian/changelog 2008-02-29 09:15:52 UTC (rev 1395) @@ -3,7 +3,7 @@ * Fix regression of last upload in the mapnik handling. Mapnik no longer tolerates errors in the map config file. - Add 97-osmxml.dpatch to fix a syntax error and to comment - the world_boundaries and postgis rules. + the world_boundaries. - Add 98-mapnik-exception.dpatch to handle errors more gracefully. - Add NEWS file to explain how to handle existing osm.xml files * Updated 50-scripts.dpatch to search for osm.xml in user's home directory. Modified: packages/gpsdrive/trunk/debian/patches/97-osmxml.dpatch =================================================================== --- packages/gpsdrive/trunk/debian/patches/97-osmxml.dpatch 2008-02-28 23:43:48 UTC (rev 1394) +++ packages/gpsdrive/trunk/debian/patches/97-osmxml.dpatch 2008-02-29 09:15:52 UTC (rev 1395) @@ -2,18 +2,18 @@ ## 97-osmxml.dpatch by Andreas Putzo <[EMAIL PROTECTED]> ## ## DP: Fix hexadecimal color. -## DP: Comment db connection and world_boundaries by default. +## DP: Comment world_boundaries by default. @DPATCH@ diff -urNad gpsdrive-2.10~pre4~/scripts/mapnik/osm-in.xml gpsdrive-2.10~pre4/scripts/mapnik/osm-in.xml ---- gpsdrive-2.10~pre4~/scripts/mapnik/osm-in.xml 2008-02-28 23:35:09.000000000 +0000 -+++ gpsdrive-2.10~pre4/scripts/mapnik/osm-in.xml 2008-02-28 23:36:50.000000000 +0000 +--- gpsdrive-2.10~pre4~/scripts/mapnik/osm-in.xml 2008-02-29 09:01:17.000000000 +0000 ++++ gpsdrive-2.10~pre4/scripts/mapnik/osm-in.xml 2008-02-29 09:01:58.000000000 +0000 @@ -1,5 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE Map> + -+<!-- world_boundaries and database support are disabled by default. -+ See commented BLOCKs below. ++<!-- world_boundaries are disabled by default. ++ See commented BLOCK below. +--> + + @@ -39,7 +39,7 @@ <Layer name="world-1" status="on" srs="+proj=merc +datum=WGS84 +over"> <StyleName>world-1</StyleName> <Datasource> -@@ -1677,7 +1686,20 @@ +@@ -1677,7 +1686,18 @@ <Parameter name="file">@DATA_DIR@/world_boundaries/builtup_area</Parameter> </Datasource> </Layer> @@ -56,12 +56,10 @@ +END WORLD BOUNDARIES BLOCK --> + + -+<!-- BEGIN DATABASE BLOCK Uncomment this block if you have a working postgresql database setup -+ <Layer name="leisure" status="on" srs="+proj=merc +datum=WGS84 +k=1.0 +units=m +over +no_defs"> <StyleName>leisure</StyleName> <Datasource> -@@ -1729,7 +1751,6 @@ +@@ -1729,7 +1749,6 @@ </Layer> <Layer name="roads" status="on" srs="+proj=merc +datum=WGS84 +k=1.0 +units=m +over +no_defs"> @@ -69,7 +67,7 @@ <StyleName>roads</StyleName> <Datasource> <Parameter name="type">postgis</Parameter> -@@ -1781,12 +1802,7 @@ +@@ -1781,12 +1800,4 @@ <Parameter name="estimate_extent">true</Parameter> </Datasource> </Layer> @@ -81,7 +79,4 @@ - <Parameter name="file">@DATA_DIR@/world_boundaries/places</Parameter> - </Datasource> - </Layer> -+ -+END DATABASE BLOCK --> -+ </Map> _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel