[DebianGIS-dev] r1726 - packages/gpsdrive/trunk/debian/patches

[nd-guest at alioth.debian.org]

Author: nd-guest
Date: 2008-07-15 20:43:42 +0000 (Tue, 15 Jul 2008)
New Revision: 1726

Added:
   packages/gpsdrive/trunk/debian/patches/99-autobestmap.dpatch
Modified:
   packages/gpsdrive/trunk/debian/patches/00list
   packages/gpsdrive/trunk/debian/patches/50-scripts.dpatch
Log:
fix bashism
fix autobestmap button bug.


Modified: packages/gpsdrive/trunk/debian/patches/00list
===================================================================
--- packages/gpsdrive/trunk/debian/patches/00list	2008-07-14 14:36:04 UTC (rev 1725)
+++ packages/gpsdrive/trunk/debian/patches/00list	2008-07-15 20:43:42 UTC (rev 1726)
@@ -14,3 +14,4 @@
 96-mapnik-plugins-dir
 97-osmxml
 98-mapnik-exception
+99-autobestmap

Modified: packages/gpsdrive/trunk/debian/patches/50-scripts.dpatch
===================================================================
--- packages/gpsdrive/trunk/debian/patches/50-scripts.dpatch	2008-07-14 14:36:04 UTC (rev 1725)
+++ packages/gpsdrive/trunk/debian/patches/50-scripts.dpatch	2008-07-15 20:43:42 UTC (rev 1726)
@@ -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.
 
 @DPATCH@
 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-02-28 23:16:15.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
@@ -23,3 +24,15 @@
      tile_dir = home + "/.gpsdrive/maps/mapnik/"
      mapkoordfile = home + "/.gpsdrive/maps/map_koord.txt"
      
+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 ; 

Added: packages/gpsdrive/trunk/debian/patches/99-autobestmap.dpatch
===================================================================
--- packages/gpsdrive/trunk/debian/patches/99-autobestmap.dpatch	                        (rev 0)
+++ packages/gpsdrive/trunk/debian/patches/99-autobestmap.dpatch	2008-07-15 20:43:42 UTC (rev 1726)
@@ -0,0 +1,26 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 99-autobestmap.dpatch by Andreas Putzo <andreas at putzo.net>
+##
+## DP: The autobestmap config option is not updated when using the toggle button
+## DP: in gpsdrive. Patch backported from 2.10pre5.
+
+ at 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;


Property changes on: packages/gpsdrive/trunk/debian/patches/99-autobestmap.dpatch
___________________________________________________________________
Name: svn:executable
   + *