[DebianGIS-dev] r1384 - in packages/gpsdrive/trunk/debian: . patches
frankie at alioth.debian.org
frankie at alioth.debian.org
Wed Feb 20 14:48:04 UTC 2008
Author: frankie
Date: 2008-02-20 14:48:03 +0000 (Wed, 20 Feb 2008)
New Revision: 1384
Added:
packages/gpsdrive/trunk/debian/patches/95-newapi.dpatch
packages/gpsdrive/trunk/debian/patches/96-mapnik-plugins-dir.dpatch
Modified:
packages/gpsdrive/trunk/debian/changelog
packages/gpsdrive/trunk/debian/patches/00list
packages/gpsdrive/trunk/debian/rules
Log:
Fixing main issue
Modified: packages/gpsdrive/trunk/debian/changelog
===================================================================
--- packages/gpsdrive/trunk/debian/changelog 2008-02-18 09:48:05 UTC (rev 1383)
+++ packages/gpsdrive/trunk/debian/changelog 2008-02-20 14:48:03 UTC (rev 1384)
@@ -1,5 +1,6 @@
gpsdrive (2.10~pre4-2) UNRELEASED; urgency=low
+ [ Andreas Putzo ]
* Enable DBUS support. All gps receivers supported by
gpsd should work with this interface.
- Added 80-dbus.dpatch
@@ -22,8 +23,17 @@
Script no longer works with geocaching.com.
(Closes: #464982)
- -- Andreas Putzo <andreas at putzo.net> Tue, 12 Feb 2008 19:46:30 +0000
+ [ Francesco Paolo Lovergine ]
+ * Added 95-newapi.dpatch patch to manage new mapnik 0.5 API.
+ Thanks Dominic Hargreaves.
+ (Closes: #465344,#466472)
+ * Added 96-mapnik-plugin-dir patch to use the mapnik-plugin-dir utility
+ instead of the embedded lib path. This is suboptimal because
+ it should be autoconfiscated instead in gpsdrive bulding system.
+ But it works :)
+ -- Francesco Paolo Lovergine <frankie at debian.org> Wed, 20 Feb 2008 15:02:48 +0100
+
gpsdrive (2.10~pre4-1) unstable; urgency=low
* New upstream release.
Modified: packages/gpsdrive/trunk/debian/patches/00list
===================================================================
--- packages/gpsdrive/trunk/debian/patches/00list 2008-02-18 09:48:05 UTC (rev 1383)
+++ packages/gpsdrive/trunk/debian/patches/00list 2008-02-20 14:48:03 UTC (rev 1384)
@@ -10,3 +10,5 @@
80-dbus
85-settings
90-usage
+95-newapi
+96-mapnik-plugins-dir
Added: packages/gpsdrive/trunk/debian/patches/95-newapi.dpatch
===================================================================
--- packages/gpsdrive/trunk/debian/patches/95-newapi.dpatch (rev 0)
+++ packages/gpsdrive/trunk/debian/patches/95-newapi.dpatch 2008-02-20 14:48:03 UTC (rev 1384)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 95-newapi.dpatch by Francesco Paolo Lovergine <frankie at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad gpsdrive-2.10~pre4~/src/mapnik.cpp gpsdrive-2.10~pre4/src/mapnik.cpp
+--- gpsdrive-2.10~pre4~/src/mapnik.cpp 2008-02-20 14:27:41.000000000 +0100
++++ gpsdrive-2.10~pre4/src/mapnik.cpp 2008-02-20 14:28:04.000000000 +0100
+@@ -119,7 +119,7 @@
+
+ datasource_cache::instance()->register_datasources("/usr/lib/mapnik/input/");
+ // XXX We should make the fontname and path a config option
+- freetype_engine::instance()->register_font("/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf");
++ freetype_engine::register_font("/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf");
+
+
+ MapnikMap.WidthInt = 1280;
Property changes on: packages/gpsdrive/trunk/debian/patches/95-newapi.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: packages/gpsdrive/trunk/debian/patches/96-mapnik-plugins-dir.dpatch
===================================================================
--- packages/gpsdrive/trunk/debian/patches/96-mapnik-plugins-dir.dpatch (rev 0)
+++ packages/gpsdrive/trunk/debian/patches/96-mapnik-plugins-dir.dpatch 2008-02-20 14:48:03 UTC (rev 1384)
@@ -0,0 +1,30 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 96-mapnik-plugins-dir.dpatch by Francesco Paolo Lovergine <frankie at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad gpsdrive-2.10~pre4~/src/mapnik.cpp gpsdrive-2.10~pre4/src/mapnik.cpp
+--- gpsdrive-2.10~pre4~/src/mapnik.cpp 2008-02-20 14:49:36.000000000 +0100
++++ gpsdrive-2.10~pre4/src/mapnik.cpp 2008-02-20 14:51:30.000000000 +0100
+@@ -108,6 +108,10 @@
+ return StringToReplace;
+ }
+
++#if !defined(MAPNIK_PATH)
++#define MAPNIK_PATH "/usr/lib/mapnik"
++#endif
++
+ /*
+ * initialize mapnik
+ */
+@@ -117,7 +121,7 @@
+ // register datasources (plug-ins) and a font
+ // Both datasorce_cache and font_engine are 'singletons'.
+
+- datasource_cache::instance()->register_datasources("/usr/lib/mapnik/input/");
++ datasource_cache::instance()->register_datasources( MAPNIK_PATH "/input/");
+ // XXX We should make the fontname and path a config option
+ freetype_engine::register_font("/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf");
+
Property changes on: packages/gpsdrive/trunk/debian/patches/96-mapnik-plugins-dir.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Modified: packages/gpsdrive/trunk/debian/rules
===================================================================
--- packages/gpsdrive/trunk/debian/rules 2008-02-18 09:48:05 UTC (rev 1383)
+++ packages/gpsdrive/trunk/debian/rules 2008-02-20 14:48:03 UTC (rev 1384)
@@ -13,6 +13,7 @@
DEB_UPSTREAM_VERSION := $(shell echo $(DEB_NOEPOCH_VERSION) | sed 's/-[^-]*$$//')
UPSTREAM_VERSION := $(strip $(shell (echo $(DEB_UPSTREAM_VERSION)|sed 's/~//')))
DESTDIR := ${CURDIR}/debian/tmp
+MAPNIK_PATH = $(shell mapnik-plugin-base)
CFLAGS = -Wall -g
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -21,6 +22,8 @@
CFLAGS += -O2
endif
+CFLAGS += -DMAPNIK_PATH=$(MAPNIK_PATH)
+
get-orig-source:
dh_testdir
test -d ../tarballs/. || mkdir -p ../tarballs
More information about the Pkg-grass-devel
mailing list