--- Begin Message ---
Package: gpsdrive
Version: 2.10~pre4-6.dfsg-5.1
Severity: normal
Tags: patch pending
Dear maintainer,
I've prepared an NMU for gpsdrive (versioned as 2.10~pre4-6.dfsg-5.2) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.
Regards.
diff -u gpsdrive-2.10~pre4-6.dfsg/debian/rules gpsdrive-2.10~pre4-6.dfsg/debian/rules
--- gpsdrive-2.10~pre4-6.dfsg/debian/rules
+++ gpsdrive-2.10~pre4-6.dfsg/debian/rules
@@ -13,7 +13,7 @@
DEB_UPSTREAM_VERSION := 2.10~pre4-6.dfsg
UPSTREAM_VERSION := 2.10pre4
DESTDIR := ${CURDIR}/debian/tmp
-MAPNIK_PATH = $(shell mapnik-plugin-base)
+# MAPNIK_PATH = $(shell mapnik-plugin-base)
CFLAGS = -Wall -g
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -51,14 +51,14 @@
libtoolize -i -f
./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
--prefix=/usr \
- --enable-mapnik \
+ --disable-mapnik \
--enable-dbus \
CFLAGS="$(CFLAGS)"
build: build-arch build-indep
build-arch: config.status build-arch-stamp
-build-arch-stamp:
+build-arch-stamp: config.status
dh_testdir
$(MAKE)
touch $@
@@ -90,11 +90,11 @@
install-poiDATA \
install-mapsDATA \
DESTDIR=$(DESTDIR)
- install -d $(CURDIR)/debian/tmp/usr/share/gpsdrive/mapnik
- install -m 644 $(CURDIR)/scripts/mapnik/osm.xml $(CURDIR)/debian/tmp/usr/share/gpsdrive/mapnik/osm.xml
+ # install -d $(CURDIR)/debian/tmp/usr/share/gpsdrive/mapnik
+ # install -m 644 $(CURDIR)/scripts/mapnik/osm.xml $(CURDIR)/debian/tmp/usr/share/gpsdrive/mapnik/osm.xml
install -d $(CURDIR)/debian/tmp/usr/share/map-icons
install -m 644 $(CURDIR)/data/map-icons/icons.xml $(CURDIR)/debian/tmp/usr/share/map-icons/icons.xml
- $(MAKE) -C scripts/mapnik/ install DESTDIR=$(DESTDIR)
+ # $(MAKE) -C scripts/mapnik/ install DESTDIR=$(DESTDIR)
$(MAKE) -C src/ install DESTDIR=$(DESTDIR)
install-indep: build-indep
@@ -116,7 +116,7 @@
# strip language extensions
mv -f $(CURDIR)/debian/gpsdrive-scripts/usr/bin/convert-waypoints.pl $(CURDIR)/debian/gpsdrive-scripts/usr/bin/convert-waypoints
mv -f $(CURDIR)/debian/gpsdrive-scripts/usr/bin/geoinfo.pl $(CURDIR)/debian/gpsdrive-scripts/usr/bin/geoinfo
- mv -f $(CURDIR)/debian/gpsdrive-scripts/usr/bin/gpsdrive_mapnik_gentiles.py $(CURDIR)/debian/gpsdrive-scripts/usr/bin/gpsdrive_mapnik_gentiles
+ # mv -f $(CURDIR)/debian/gpsdrive-scripts/usr/bin/gpsdrive_mapnik_gentiles.py $(CURDIR)/debian/gpsdrive-scripts/usr/bin/gpsdrive_mapnik_gentiles
mv -f $(CURDIR)/debian/gpsdrive-scripts/usr/bin/gpspoint2gpsdrive.pl $(CURDIR)/debian/gpsdrive-scripts/usr/bin/gpspoint2gpsdrive
mv -f $(CURDIR)/debian/gpsdrive-scripts/usr/bin/poi-manager.pl $(CURDIR)/debian/gpsdrive-scripts/usr/bin/poi-manager
mv -f $(CURDIR)/debian/gpsdrive-scripts/usr/share/man/man1/convert-waypoints.pl.1.gz \
diff -u gpsdrive-2.10~pre4-6.dfsg/debian/control gpsdrive-2.10~pre4-6.dfsg/debian/control
--- gpsdrive-2.10~pre4-6.dfsg/debian/control
+++ gpsdrive-2.10~pre4-6.dfsg/debian/control
@@ -5,7 +5,7 @@
Uploaders: Andreas Putzo <andr...@putzo.net>, Francesco Paolo Lovergine <fran...@debian.org>
DM-Upload-Allowed: yes
Build-Depends: debhelper (>= 7), automake1.9, libtool, pkg-config, libpcre3-dev, libgtk2.0-dev,libart-2.0-dev, libxml2-dev, libmysqlclient-dev,
- autotools-dev, dpatch, libmapnik-dev (>= 0.6), libboost-dev, libboost-filesystem-dev, libboost-serialization-dev, libdbus-glib-1-dev
+ autotools-dev, dpatch, libboost-dev, libboost-filesystem-dev, libboost-serialization-dev, libdbus-glib-1-dev, libltdl-dev (>= 2.4)
Standards-Version: 3.8.4
Homepage: http://gpsdrive.de
Vcs-Svn: svn://svn.debian.org/svn/pkg-grass/packages/gpsdrive/trunk
@@ -39,7 +39,7 @@
Package: gpsdrive-scripts
Architecture: all
-Depends: gpsdrive, ${perl:Depends}, python, python-imaging, python-mapnik, libdbi-perl, libdbd-mysql-perl, libdate-manip-perl, libfile-slurp-perl,
+Depends: gpsdrive, ${perl:Depends}, python, python-imaging, libdbi-perl, libdbd-mysql-perl, libdate-manip-perl, libfile-slurp-perl,
libmime-base64-perl, libtime-local-perl, libwww-curl-perl, libwww-mechanize-perl, libxml-parser-perl, libxml-simple-perl, libxml-twig-perl,
libxml-writer-perl, perlmagick, perl-tk
Description: Various scripts for gpsdrive
diff -u gpsdrive-2.10~pre4-6.dfsg/debian/changelog gpsdrive-2.10~pre4-6.dfsg/debian/changelog
--- gpsdrive-2.10~pre4-6.dfsg/debian/changelog
+++ gpsdrive-2.10~pre4-6.dfsg/debian/changelog
@@ -1,3 +1,15 @@
+gpsdrive (2.10~pre4-6.dfsg-5.2) unstable; urgency=low
+
+ * Non-maintainer upload
+
+ [ Allison Randal ]
+ * Disable optional mapnik libraries, gpsdrive is incompatible with
+ APIs of mapnik version 2.0.0.
+ * debian/patches/107-fix-disable-mapnik.dpatch:
+ Fix known bug with gpsdrive-2.10pre4 when disabling Mapnik library.
+
+ -- Christian Perrier <bubu...@debian.org> Sun, 07 Oct 2012 14:27:36 +0200
+
gpsdrive (2.10~pre4-6.dfsg-5.1) unstable; urgency=medium
* Non-maintainer upload.
diff -u gpsdrive-2.10~pre4-6.dfsg/debian/gpsdrive-scripts.install gpsdrive-2.10~pre4-6.dfsg/debian/gpsdrive-scripts.install
--- gpsdrive-2.10~pre4-6.dfsg/debian/gpsdrive-scripts.install
+++ gpsdrive-2.10~pre4-6.dfsg/debian/gpsdrive-scripts.install
@@ -5,7 +5,7 @@
usr/bin/gpspoint2gpsdrive.pl
usr/bin/gpsreplay
usr/bin/poi-manager.pl
-usr/bin/gpsdrive_mapnik_gentiles.py
+#usr/bin/gpsdrive_mapnik_gentiles.py
usr/share/perl5/Geo/Filter/* usr/share/perl5/Geo/Gpsdrive/Filter
usr/share/perl5/Geo/GPX/* usr/share/perl5/Geo/Gpsdrive/GPX
usr/share/perl5/Geo/Geometry.pm usr/share/perl5/Geo/Gpsdrive
diff -u gpsdrive-2.10~pre4-6.dfsg/debian/gpsdrive.install gpsdrive-2.10~pre4-6.dfsg/debian/gpsdrive.install
--- gpsdrive-2.10~pre4-6.dfsg/debian/gpsdrive.install
+++ gpsdrive-2.10~pre4-6.dfsg/debian/gpsdrive.install
@@ -4,3 +4,3 @@
usr/share/gpsdrive/map_koord.txt
-usr/share/gpsdrive/mapnik/osm.xml
+#usr/share/gpsdrive/mapnik/osm.xml
usr/share/map-icons/icons.xml usr/share/gpsdrive/map-icons/
diff -u gpsdrive-2.10~pre4-6.dfsg/debian/README.Debian gpsdrive-2.10~pre4-6.dfsg/debian/README.Debian
--- gpsdrive-2.10~pre4-6.dfsg/debian/README.Debian
+++ gpsdrive-2.10~pre4-6.dfsg/debian/README.Debian
@@ -1,6 +1,14 @@
gpsdrive for Debian
-------------------
+Using gpsdrive with mapnik 2.0
+------------------------------
+
+* Gpsdrive is incompatible with the new APIs of mapnik 2.0.0. This
+ optional library is now disabled in the package.
+
+ -- Allison Randal <alli...@canonical.com> Thu, 01 Dec 2011 12:48:22 -0800
+
Upgrading from gpsdrive 2.09 (etch)
-------------------------------------
* The mysql database schema has been changed.
diff -u gpsdrive-2.10~pre4-6.dfsg/debian/patches/00list gpsdrive-2.10~pre4-6.dfsg/debian/patches/00list
--- gpsdrive-2.10~pre4-6.dfsg/debian/patches/00list
+++ gpsdrive-2.10~pre4-6.dfsg/debian/patches/00list
@@ -23,0 +24 @@
+107-fix-disable-mapnik.dpatch
only in patch2:
unchanged:
--- gpsdrive-2.10~pre4-6.dfsg.orig/debian/patches/107-fix-disable-mapnik.dpatch
+++ gpsdrive-2.10~pre4-6.dfsg/debian/patches/107-fix-disable-mapnik.dpatch
@@ -0,0 +1,24 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 107-disable-mapnik.dpatch by Allison Randal <alli...@canonical.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Don't call into the mapnik library APIs when mapnik is disabled.
+
+@DPATCH@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' ftbfs-precise~/src/map_handler.c ftbfs-precise/src/map_handler.c
+--- ftbfs-precise~/src/map_handler.c 2011-12-01 22:24:15.000000000 +0000
++++ ftbfs-precise/src/map_handler.c 2011-12-01 22:37:16.298094236 +0000
+@@ -660,9 +660,12 @@
+ if (maploaded)
+ gdk_pixbuf_unref (image);
+
++#ifdef MAPNIK
+ if ( !strcmp (filename,"mapnik") ) {
+ limage = gdk_pixbuf_new_from_data(get_mapnik_imagedata(), GDK_COLORSPACE_RGB, FALSE, 8, 1280, 1024, 1280 * 3, NULL, NULL);
+- } else {
++ } else
++#endif // MAPNIK
++ {
+ limage = gdk_pixbuf_new_from_file (filename, NULL);
+ if (limage == NULL)
+ {
--- End Message ---
