[DebianGIS-dev] r1194 - packages/gpsdrive/trunk/debian/patches

[nd-guest at alioth.debian.org]

Author: nd-guest
Date: 2007-10-15 19:44:35 +0000 (Mon, 15 Oct 2007)
New Revision: 1194

Modified:
   packages/gpsdrive/trunk/debian/patches/10-mapnikdir.dpatch
Log:
path to world domination^Wboundaries


Modified: packages/gpsdrive/trunk/debian/patches/10-mapnikdir.dpatch
===================================================================
--- packages/gpsdrive/trunk/debian/patches/10-mapnikdir.dpatch	2007-10-15 19:31:58 UTC (rev 1193)
+++ packages/gpsdrive/trunk/debian/patches/10-mapnikdir.dpatch	2007-10-15 19:44:35 UTC (rev 1194)
@@ -6,7 +6,7 @@
 @DPATCH@
 diff -urNad gpsdrive-2.10~pre4~/scripts/mapnik/Makefile.am gpsdrive-2.10~pre4/scripts/mapnik/Makefile.am
 --- gpsdrive-2.10~pre4~/scripts/mapnik/Makefile.am	2007-09-14 21:47:06.000000000 +0000
-+++ gpsdrive-2.10~pre4/scripts/mapnik/Makefile.am	2007-09-17 07:40:36.000000000 +0000
++++ gpsdrive-2.10~pre4/scripts/mapnik/Makefile.am	2007-10-15 19:35:56.000000000 +0000
 @@ -2,7 +2,7 @@
  
  bin_SCRIPTS = gpsdrive_mapnik_gentiles.py
@@ -26,9 +26,66 @@
  osm.xml: osm-in.xml
 -	sed 's, at DATA_DIR@,${datadir},' < $< > $@
 +	sed 's, at DATA_DIR@,${mapnikdir},' < $< > $@
+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	2007-09-14 21:47:06.000000000 +0000
++++ gpsdrive-2.10~pre4/scripts/mapnik/osm-in.xml	2007-10-15 19:36:53.000000000 +0000
+@@ -1641,7 +1641,7 @@
+     <StyleName>world-1</StyleName>
+     <Datasource>
+       <Parameter name="type">shape</Parameter>
+-      <Parameter name="file">@DATA_DIR@/mapnik/world_boundaries/world_boundaries_m</Parameter>
++      <Parameter name="file">@DATA_DIR@/world_boundaries/world_boundaries_m</Parameter>
+     </Datasource>
+   </Layer>
+   
+@@ -1649,7 +1649,7 @@
+     <StyleName>world</StyleName>
+     <Datasource>
+       <Parameter name="type">shape</Parameter>
+-      <Parameter name="file">@DATA_DIR@/mapnik/world_boundaries/world_bnd_m</Parameter>
++      <Parameter name="file">@DATA_DIR@/world_boundaries/world_bnd_m</Parameter>
+     </Datasource>
+   </Layer>
+   
+@@ -1657,7 +1657,7 @@
+     <StyleName>coast-poly</StyleName>
+     <Datasource>
+       <Parameter name="type">shape</Parameter>
+-      <Parameter name="file">@DATA_DIR@/mapnik/world_boundaries/shoreline_a</Parameter>
++      <Parameter name="file">@DATA_DIR@/world_boundaries/shoreline_a</Parameter>
+     </Datasource>
+   </Layer>
+   
+@@ -1665,7 +1665,7 @@
+     <StyleName>coast-line</StyleName>
+     <Datasource>
+       <Parameter name="type">shape</Parameter>
+-      <Parameter name="file">@DATA_DIR@/mapnik/world_boundaries/shoreline_l</Parameter>
++      <Parameter name="file">@DATA_DIR@/world_boundaries/shoreline_l</Parameter>
+     </Datasource>
+   </Layer>
+   
+@@ -1674,7 +1674,7 @@
+     <StyleName>builtup</StyleName>
+     <Datasource>
+       <Parameter name="type">shape</Parameter>
+-      <Parameter name="file">@DATA_DIR@/mapnik/world_boundaries/builtup_area</Parameter>
++      <Parameter name="file">@DATA_DIR@/world_boundaries/builtup_area</Parameter>
+     </Datasource>
+   </Layer>
+   
+@@ -1786,7 +1786,7 @@
+     <StyleName>places</StyleName>
+     <Datasource>
+       <Parameter name="type">shape</Parameter>
+-      <Parameter name="file">@DATA_DIR@/mapnik/world_boundaries/places</Parameter>
++      <Parameter name="file">@DATA_DIR@/world_boundaries/places</Parameter>
+     </Datasource>
+   </Layer>
+ </Map>
 diff -urNad gpsdrive-2.10~pre4~/src/mapnik.cpp gpsdrive-2.10~pre4/src/mapnik.cpp
 --- gpsdrive-2.10~pre4~/src/mapnik.cpp	2007-09-14 21:47:13.000000000 +0000
-+++ gpsdrive-2.10~pre4/src/mapnik.cpp	2007-09-17 07:41:30.000000000 +0000
++++ gpsdrive-2.10~pre4/src/mapnik.cpp	2007-10-15 19:35:56.000000000 +0000
 @@ -156,7 +156,7 @@
      if ( ! boost:: filesystem::exists(mapnik_config_file) ) 
  	mapnik_config_file.assign("../scripts/mapnik/osm.xml");