[DebianGIS-dev] r2276 - in packages/gpsdrive/trunk/debian: . patches

[nd-guest at alioth.debian.org]

Author: nd-guest
Date: 2009-06-11 19:43:07 +0000 (Thu, 11 Jun 2009)
New Revision: 2276

Modified:
   packages/gpsdrive/trunk/debian/changelog
   packages/gpsdrive/trunk/debian/control
   packages/gpsdrive/trunk/debian/patches/96-mapnik-plugins-dir.dpatch
   packages/gpsdrive/trunk/debian/rules
Log:
fix #527956


Modified: packages/gpsdrive/trunk/debian/changelog
===================================================================
--- packages/gpsdrive/trunk/debian/changelog	2009-06-11 09:08:21 UTC (rev 2275)
+++ packages/gpsdrive/trunk/debian/changelog	2009-06-11 19:43:07 UTC (rev 2276)
@@ -1,3 +1,13 @@
+gpsdrive (2.10~pre4-6.dfsg-3) unstable; urgency=low
+
+  * Regenerate aclocal.m4 with libtoolize in debian/rules.
+    Thanks to Adam D. Barratt (Closes: #527956)
+  * Updated build-dep to libmapnik-dev >= 0.6.
+  * Updated 96-mapnik-plugins-dir.dpatch to define the correct
+    MAPNIK_PATH.
+
+ -- Andreas Putzo <andreas at putzo.net>  Thu, 11 Jun 2009 19:26:06 +0000
+
 gpsdrive (2.10~pre4-6.dfsg-2) unstable; urgency=low
 
   * Remove example script gpssmswatch. Prone to symlink attacks

Modified: packages/gpsdrive/trunk/debian/control
===================================================================
--- packages/gpsdrive/trunk/debian/control	2009-06-11 09:08:21 UTC (rev 2275)
+++ packages/gpsdrive/trunk/debian/control	2009-06-11 19:43:07 UTC (rev 2276)
@@ -4,7 +4,7 @@
 Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
 Uploaders: Andreas Putzo <andreas at putzo.net>
 DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 5), automake1.9, libtool, pkg-config, libpcre3-dev, libgtk2.0-dev,libart-2.0-dev, libxml2-dev, libmysqlclient15-dev, autotools-dev, dpatch, libmapnik-dev (>= 0.5~svn638), libboost-dev, libboost-filesystem-dev, libboost-serialization-dev, libdbus-glib-1-dev
+Build-Depends: debhelper (>= 5), automake1.9, libtool, pkg-config, libpcre3-dev, libgtk2.0-dev,libart-2.0-dev, libxml2-dev, libmysqlclient15-dev, autotools-dev, dpatch, libmapnik-dev (>= 0.6), libboost-dev, libboost-filesystem-dev, libboost-serialization-dev, libdbus-glib-1-dev
 Standards-Version: 3.8.0
 Homepage: http://gpsdrive.de
 Vcs-Svn: svn://svn.debian.org/svn/pkg-grass/packages/gpsdrive/

Modified: packages/gpsdrive/trunk/debian/patches/96-mapnik-plugins-dir.dpatch
===================================================================
--- packages/gpsdrive/trunk/debian/patches/96-mapnik-plugins-dir.dpatch	2009-06-11 09:08:21 UTC (rev 2275)
+++ packages/gpsdrive/trunk/debian/patches/96-mapnik-plugins-dir.dpatch	2009-06-11 19:43:07 UTC (rev 2276)
@@ -4,15 +4,15 @@
 ## DP: Use correct mapnik path on debian systems.
 
 @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
+diff -urNad gpsdrive-2.10~pre4-6.dfsg~/src/mapnik.cpp gpsdrive-2.10~pre4-6.dfsg/src/mapnik.cpp
+--- gpsdrive-2.10~pre4-6.dfsg~/src/mapnik.cpp	2009-06-11 19:23:32.000000000 +0000
++++ gpsdrive-2.10~pre4-6.dfsg/src/mapnik.cpp	2009-06-11 19:23:32.000000000 +0000
 @@ -108,6 +108,10 @@
      return StringToReplace;
  }
  
 +#if !defined(MAPNIK_PATH)
-+#define MAPNIK_PATH "/usr/lib/mapnik/0.5"
++#define MAPNIK_PATH "/usr/lib/mapnik/0.6"
 +#endif
 +
  /*

Modified: packages/gpsdrive/trunk/debian/rules
===================================================================
--- packages/gpsdrive/trunk/debian/rules	2009-06-11 09:08:21 UTC (rev 2275)
+++ packages/gpsdrive/trunk/debian/rules	2009-06-11 19:43:07 UTC (rev 2276)
@@ -48,6 +48,7 @@
 	aclocal -I m4 --force
 	automake --add-missing
 	autoconf
+	libtoolize -i -f
 	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
 				--prefix=/usr \
 				--enable-mapnik \