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

[nd-guest at alioth.debian.org]

Author: nd-guest
Date: 2007-09-24 20:30:00 +0000 (Mon, 24 Sep 2007)
New Revision: 1104

Added:
   packages/gpsdrive/trunk/debian/patches/10-mapnikdir.dpatch
Log:
* move mapnik files to /u/s/gpsdrive/mapnik/.


Added: packages/gpsdrive/trunk/debian/patches/10-mapnikdir.dpatch
===================================================================
--- packages/gpsdrive/trunk/debian/patches/10-mapnikdir.dpatch	                        (rev 0)
+++ packages/gpsdrive/trunk/debian/patches/10-mapnikdir.dpatch	2007-09-24 20:30:00 UTC (rev 1104)
@@ -0,0 +1,40 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10-mapnikdir.dpatch by Andreas Putzo <andreas at putzo.net>
+##
+## DP: Put mapnik files into gpsdrive directory.
+
+ at 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
+@@ -2,7 +2,7 @@
+ 
+ bin_SCRIPTS = gpsdrive_mapnik_gentiles.py
+ 
+-mapnikdir = $(datadir)/mapnik
++mapnikdir = $(datadir)/gpsdrive/mapnik
+ mapnik_DATA = osm.xml
+ 
+ EXTRA_DIST = setup_z_order.sql gpsdrive_mapnik_gentiles-in.py osm-in.xml 
+@@ -13,7 +13,7 @@
+ dummy:
+ 
+ gpsdrive_mapnik_gentiles.py: gpsdrive_mapnik_gentiles-in.py
+-	sed 's, at DATA_DIR@,${datadir},' < $< > $@
++	sed 's, at DATA_DIR@,${mapnikdir},' < $< > $@
+ 
+ osm.xml: osm-in.xml
+-	sed 's, at DATA_DIR@,${datadir},' < $< > $@
++	sed 's, at DATA_DIR@,${mapnikdir},' < $< > $@
+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
+@@ -156,7 +156,7 @@
+     if ( ! boost:: filesystem::exists(mapnik_config_file) ) 
+ 	mapnik_config_file.assign("../scripts/mapnik/osm.xml");
+     if ( ! boost:: filesystem::exists(mapnik_config_file) ) 
+-	mapnik_config_file.assign(DATADIR).append("/mapnik/osm.xml");
++	mapnik_config_file.assign(DATADIR).append("/gpsdrive/mapnik/osm.xml");
+     cout << "Using Mapnik config-file: " << mapnik_config_file << endl;
+     
+     if ( ! boost:: filesystem::exists(mapnik_config_file) ) {


Property changes on: packages/gpsdrive/trunk/debian/patches/10-mapnikdir.dpatch
___________________________________________________________________
Name: svn:executable
   + *