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

[nd-guest at alioth.debian.org]

Author: nd-guest
Date: 2008-02-28 23:43:48 +0000 (Thu, 28 Feb 2008)
New Revision: 1394

Modified:
   packages/gpsdrive/trunk/debian/patches/50-scripts.dpatch
Log:
Fix wrong path to osm.xml in mapnik_gentiles.py


Modified: packages/gpsdrive/trunk/debian/patches/50-scripts.dpatch
===================================================================
--- packages/gpsdrive/trunk/debian/patches/50-scripts.dpatch	2008-02-28 23:43:05 UTC (rev 1393)
+++ packages/gpsdrive/trunk/debian/patches/50-scripts.dpatch	2008-02-28 23:43:48 UTC (rev 1394)
@@ -2,14 +2,24 @@
 ## 50-scripts.dpatch by Andreas Putzo <andreas at putzo.net>
 ##
 ## DP: Update shebang line of gpsdrive_mapnik_gentiles.py to use python 2.5 (needed by mapnik).
+## DP: Fix path to osm.xml (Thanks Giovanni Mascellani)
 
 @DPATCH@
 diff -urNad gpsdrive-2.10~pre4~/scripts/mapnik/gpsdrive_mapnik_gentiles-in.py gpsdrive-2.10~pre4/scripts/mapnik/gpsdrive_mapnik_gentiles-in.py
 --- gpsdrive-2.10~pre4~/scripts/mapnik/gpsdrive_mapnik_gentiles-in.py	2007-09-15 15:11:59.000000000 +0000
-+++ gpsdrive-2.10~pre4/scripts/mapnik/gpsdrive_mapnik_gentiles-in.py	2007-10-03 13:59:45.000000000 +0000
++++ gpsdrive-2.10~pre4/scripts/mapnik/gpsdrive_mapnik_gentiles-in.py	2008-02-28 23:16:15.000000000 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/python
 +#!/usr/bin/python2.5
  """GpsDrive Generate Mapnik Tiles
  
  Generates 1280x1024 Mapniktiles for GpsDrive
+@@ -166,7 +166,7 @@
+ 
+     home = os.environ['HOME']
+     data = "@DATA_DIR@/mapnik"
+-    mapfile = data + "/osm.xml"
++    mapfile = home + "/.gpsdrive/osm.xml"
+     tile_dir = home + "/.gpsdrive/maps/mapnik/"
+     mapkoordfile = home + "/.gpsdrive/maps/map_koord.txt"
+