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

frankie at alioth.debian.org frankie at alioth.debian.org
Thu Feb 4 16:26:14 UTC 2010 

Author: frankie
Date: 2010-02-04 16:26:13 +0000 (Thu, 04 Feb 2010)
New Revision: 2694

Modified:
   packages/gpsdrive/trunk/debian/changelog
   packages/gpsdrive/trunk/debian/compat
   packages/gpsdrive/trunk/debian/control
   packages/gpsdrive/trunk/debian/patches/50-scripts.dpatch
   packages/gpsdrive/trunk/debian/rules
Log:
Some minor fixes.


Modified: packages/gpsdrive/trunk/debian/changelog
===================================================================
--- packages/gpsdrive/trunk/debian/changelog	2010-02-04 15:08:26 UTC (rev 2693)
+++ packages/gpsdrive/trunk/debian/changelog	2010-02-04 16:26:13 UTC (rev 2694)
@@ -1,3 +1,15 @@
+gpsdrive (2.10~pre4-6.dfsg-4) unstable; urgency=low
+
+  * Do not depend on versioned python.
+  * Policy bumped to 3.8.4.
+  * Moved to libmysqlclient-dev build-dep.
+  * Now suggests postgresql-8.4-postgis.
+  * Debhelper level moved to 7.
+  * Removed superfluous config.{guess,sub} override.
+  * Added me as an uploader.
+
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Thu, 04 Feb 2010 16:53:01 +0100
+
 gpsdrive (2.10~pre4-6.dfsg-3) unstable; urgency=low
 
   * Regenerate aclocal.m4 with libtoolize in debian/rules.
@@ -76,6 +88,7 @@
 
  -- Andreas Putzo <andreas at putzo.net>  Sat, 19 Jul 2008 20:01:39 +0000
 
+>>>>>>> .r2096
 gpsdrive (2.10~pre4-3) unstable; urgency=low
 
   * Fix regression of last upload in the mapnik handling.

Modified: packages/gpsdrive/trunk/debian/compat
===================================================================
--- packages/gpsdrive/trunk/debian/compat	2010-02-04 15:08:26 UTC (rev 2693)
+++ packages/gpsdrive/trunk/debian/compat	2010-02-04 16:26:13 UTC (rev 2694)
@@ -1 +1 @@
-5
+7

Modified: packages/gpsdrive/trunk/debian/control
===================================================================
--- packages/gpsdrive/trunk/debian/control	2010-02-04 15:08:26 UTC (rev 2693)
+++ packages/gpsdrive/trunk/debian/control	2010-02-04 16:26:13 UTC (rev 2694)
@@ -2,10 +2,10 @@
 Section: utils
 Priority: optional
 Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
-Uploaders: Andreas Putzo <andreas at putzo.net>
+Uploaders: Andreas Putzo <andreas at putzo.net>, Francesco Paolo Lovergine <frankie at debian.org>
 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.6), libboost-dev, libboost-filesystem-dev, libboost-serialization-dev, libdbus-glib-1-dev
-Standards-Version: 3.8.0
+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
+Standards-Version: 3.8.4
 Homepage: http://gpsdrive.de
 Vcs-Svn: svn://svn.debian.org/svn/pkg-grass/packages/gpsdrive/
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-grass/packages/gpsdrive/
@@ -14,7 +14,7 @@
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, gpsdrive-data, openstreetmap-map-icons-square, openstreetmap-map-icons-classic
 Recommends: gpsd, gpsdrive-scripts
-Suggests: flite | festival, osm2pgsql, mysql-server, postgresql-8.3-postgis
+Suggests: flite | festival, osm2pgsql, mysql-server, postgresql-8.4-postgis
 Description: Car navigation system
  Map-based navigation system that displays the current
  position provided by a GPS receiver on a zoomable map.
@@ -38,7 +38,7 @@
 
 Package: gpsdrive-scripts
 Architecture: all
-Depends: gpsdrive, ${perl:Depends}, python2.5, python-imaging, python-mapnik, libdbi-perl, libdbd-mysql-perl, libdate-manip-perl, libfile-slurp-perl, libmime-base64-perl, libtext-query-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
+Depends: gpsdrive, ${perl:Depends}, python, python-imaging, python-mapnik, libdbi-perl, libdbd-mysql-perl, libdate-manip-perl, libfile-slurp-perl, libmime-base64-perl, libtext-query-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
  Gpsdrive is a car (bike, ship, plane) navigation system.
  .

Modified: packages/gpsdrive/trunk/debian/patches/50-scripts.dpatch
===================================================================
--- packages/gpsdrive/trunk/debian/patches/50-scripts.dpatch	2010-02-04 15:08:26 UTC (rev 2693)
+++ packages/gpsdrive/trunk/debian/patches/50-scripts.dpatch	2010-02-04 16:26:13 UTC (rev 2694)
@@ -1,7 +1,6 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
 ## 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)
 ## DP: Fix bashism in examples/wpget.
 
@@ -9,12 +8,6 @@
 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	2008-07-15 17:37:07.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']

Modified: packages/gpsdrive/trunk/debian/rules
===================================================================
--- packages/gpsdrive/trunk/debian/rules	2010-02-04 15:08:26 UTC (rev 2693)
+++ packages/gpsdrive/trunk/debian/rules	2010-02-04 16:26:13 UTC (rev 2694)
@@ -74,16 +74,10 @@
 	dh_testroot
 	rm -f build-arch-stamp build-indep-stamp
 	[ ! -f Makefile ] || $(MAKE) distclean
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
-	cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
-	cp -f /usr/share/misc/config.guess config.guess
-endif
 	dh_clean
 
 install: install-arch install-indep
-	dh_clean -k
+	dh_prep
 
 install-arch: build-arch
 	dh_testdir

More information about the Pkg-grass-devel mailing list