please accept gpsdrive 2.10~pre4-4 into lenny
Dear Release Team,
gpsdrive 2.10~pre4-4 got uploaded before the freeze but it is
currently in binary NEW. I wrongly assumed that it would be processed
before the freeze.
I'd like to get a freeze exception for the following reasons:
* Fixes an important bug (#480234)
* Fixes a bashism, only in an example script, though (#489603)
Changelog:
gpsdrive (2.10~pre4-4) unstable; urgency=low
* No longer create openstreetmap-map-icons-* binary packages.
They are build from the openstreetmap-map-icons source package
now. (Closes: #482866).
* Build a gpsdrive-data packages that contains architecture independent
files.
* Added DM-Upload-Allowed field to debian/control.
* Bumped Policy to 3.8.0, without changes.
* Updated 50-scripts.dpatch to fix bashism in wpget.
(Closes: #489603).
* Removed debian revison from mapnik dependency to
fix a lintian warning.
* Added 99-autobestmap.dpatch so that the toggle button
in gpsdrive works again. Already fixed upstream.
(Closes: #480234).
* Wrap lines in copyright file at 80 characters.
* Upload sponsored by Petter Reinholdtsen.
-- Andreas Putzo <andreas@putzo.net> Sat, 19 Jul 2008 20:01:39 +0000
The debdiff is rather unreadable because of removing a lot of trailing
whitespaces and breaking lines at 80 characters in debian/copyright.
The relevant parts are cited below.
Please consider an exception for gpsdrive to enter lenny.
Regards,
Andreas
diff -u gpsdrive-2.10~pre4/debian/control gpsdrive-2.10~pre4/debian/control
--- gpsdrive-2.10~pre4/debian/control
+++ gpsdrive-2.10~pre4/debian/control
@@ -3,13 +3,14 @@
Priority: optional
Maintainer: Debian GIS Project <pkg-grass-devel@lists.alioth.debian.org>
Uploaders: Andreas Putzo <andreas@putzo.net>
-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-1), libboost-dev, libboost-filesystem-dev, libboost-serialization-dev, libdbus-glib-1-dev
-Standards-Version: 3.7.3
+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
+Standards-Version: 3.8.0
Homepage: http://gpsdrive.de
Package: gpsdrive
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, openstreetmap-map-icons-square, openstreetmap-map-icons-classic
+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.2-postgis
Description: Car navigation system
@@ -24,41 +25,19 @@
+Package: gpsdrive-data
+Architecture: all
+Recommends: gpsdrive
+Description: Car naviagion system
+ Map-based navigation system that displays the current
+ position provided by a GPS receiver on a zoomable map.
+ Maps can be downloaded from different map providers or
+ rendered on-the-fly using the OpenStreetMap dataset.
+ .
+ This package contains the data files.
+
diff -u gpsdrive-2.10~pre4/debian/rules gpsdrive-2.10~pre4/debian/rules
--- gpsdrive-2.10~pre4/debian/rules
+++ gpsdrive-2.10~pre4/debian/rules
@@ -83,11 +82,11 @@
dh_clean
install: install-arch install-indep
+ dh_clean -k
install-arch: build-arch
dh_testdir
dh_testroot
- dh_clean -k
dh_installdirs -a
$(MAKE) -C data/ \
install-appsDATA \
diff -u gpsdrive-2.10~pre4/debian/gpsdrive.install gpsdrive-2.10~pre4/debian/gpsdrive.install
--- gpsdrive-2.10~pre4/debian/gpsdrive.install
+++ gpsdrive-2.10~pre4/debian/gpsdrive.install
@@ -3,7 +3,4 @@
usr/share/applications/gpsdrive.desktop
usr/share/gpsdrive/map_koord.txt
-usr/share/gpsdrive/maps/*
-usr/share/gpsdrive/pixmaps/*
-usr/share/gpsdrive/poi/*
usr/share/gpsdrive/mapnik/osm.xml
usr/share/map-icons/icons.xml usr/share/gpsdrive/map-icons/
diff -u gpsdrive-2.10~pre4/debian/patches/50-scripts.dpatch gpsdrive-2.10~pre4/debian/patches/50-scripts.dpatch
--- gpsdrive-2.10~pre4/debian/patches/50-scripts.dpatch
+++ gpsdrive-2.10~pre4/debian/patches/50-scripts.dpatch
@@ -3,11 +3,12 @@
##
## 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.
+diff -urNad gpsdrive-2.10~pre4~/scripts/wpget gpsdrive-2.10~pre4/scripts/wpget
+--- gpsdrive-2.10~pre4~/scripts/wpget 2007-09-14 21:47:07.000000000 +0000
++++ gpsdrive-2.10~pre4/scripts/wpget 2008-07-15 17:38:12.000000000 +0000
+@@ -32,7 +32,7 @@
+ done
+
+ opt=${opt:= -w}
+-if [[ ${#opt} != "3" && ${#opt} != "12" ]]; then
++if [ ${#opt} -ne 3 -a ${#opt} -ne 12 ]; then
+ echo "Usage: $0 [-r|--get-routes]|[-w|--get-waypts]|[-t|--get-tracks] [-d device|--device device]" >&2 ;
+ echo "defaults are: --get-waypts and --device /dev/gps" >&2 ;
+ exit 1 ;
--- gpsdrive-2.10~pre4.orig/debian/gpsdrive-data.install
+++ gpsdrive-2.10~pre4/debian/gpsdrive-data.install
@@ -0,0 +1,3 @@
+usr/share/gpsdrive/maps
+usr/share/gpsdrive/pixmaps
+usr/share/gpsdrive/poi
only in patch2:
unchanged:
--- gpsdrive-2.10~pre4.orig/debian/patches/99-autobestmap.dpatch
+++ gpsdrive-2.10~pre4/debian/patches/99-autobestmap.dpatch
@@ -0,0 +1,26 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 99-autobestmap.dpatch by Andreas Putzo <andreas@putzo.net>
+##
+## DP: The autobestmap config option is not updated when using the toggle button
+## DP: in gpsdrive. Patch backported from 2.10pre5.
+
+@DPATCH@
+diff -urNad gpsdrive-2.10~pre4~/src/main_gui.c gpsdrive-2.10~pre4/src/main_gui.c
+--- gpsdrive-2.10~pre4~/src/main_gui.c 2007-09-15 15:12:03.000000000 +0000
++++ gpsdrive-2.10~pre4/src/main_gui.c 2008-07-15 19:48:34.000000000 +0000
+@@ -229,6 +229,7 @@
+ gtk_label_set_text (GTK_LABEL (statusprefscale_lb), _("Auto"));
+ if (mapscaler_scaler)
+ gtk_widget_set_sensitive (mapscaler_scaler, FALSE);
++ local_config.autobestmap = TRUE;
+ }
+ else
+ {
+@@ -238,6 +239,7 @@
+ gtk_label_set_text (GTK_LABEL (statusprefscale_lb), sc);
+ if (mapscaler_scaler)
+ gtk_widget_set_sensitive (mapscaler_scaler, TRUE);
++ local_config.autobestmap = FALSE;
+ }
+
+ current.needtosave = TRUE;
Reply to: