Merge lp:~bilalakhtar/ubuntu/maverick/gpsdrive/gpsdrive-fix-325288 into lp:ubuntu/maverick/gpsdrive

[Bilal Akhtar]

Fixes bug #325288

[lp:~bilalakhtar/ubuntu/maverick/gpsdrive/gpsdrive-fix-325288]

20. By Bilal Akhtar on 2010-07-05

Added description for patch 103-lp-325388

[Stefano Rivera (stefanor)]

This really is a workaround rather than a fix. Have you forwarded it upstream?

[Bilal Akhtar (bilalakhtar)]

Ok, doing it now.

[Stefano Rivera (stefanor)]

I can't see this in the upstream bug tracker, please link to the lp bug when you have filed upstream.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2010-04-16 11:31:32 +0000
+++ debian/changelog	2010-07-05 15:45:40 +0000
@@ -1,3 +1,10 @@
+gpsdrive (2.10~pre4-6.dfsg-3ubuntu5) lucid; urgency=low
+
+  * scripts/geo-code: Changed executing environment from /bin/sh
+    to /bin/bash (LP: #325288)
+
+ -- Bilal Akhtar <[e-mail]>  Mon, 05 Jul 2010 13:50:55 +0300
+
 gpsdrive (2.10~pre4-6.dfsg-3ubuntu4) lucid; urgency=low
 
   * debian/control: Rebuild with libmysqlclient16-dev.
 
=== modified file 'debian/patches/00list'
--- debian/patches/00list	2009-06-11 19:26:06 +0000
+++ debian/patches/00list	2010-07-05 15:45:40 +0000
@@ -18,3 +18,4 @@
 100-fix-insecure-tempfiles
 101-signalposreq
 102-unittest
+103-lp-325288
 
=== added file 'debian/patches/103-lp-325288.dpatch'
--- debian/patches/103-lp-325288.dpatch	1970-01-01 00:00:00 +0000
+++ debian/patches/103-lp-325288.dpatch	2010-07-05 15:45:40 +0000
@@ -0,0 +1,17 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 103-lp-325288.dpatch by Bilal Akhtar <[e-mail]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: This patch fixes launchpad bug 325288 by changing the runtime
+## DP: environment of file scripts/geo-code from /bin/sh to /bin/bash.
+
+@DPATCH@
+diff -urNad gpsdrive~/scripts/geo-code gpsdrive/scripts/geo-code
+--- gpsdrive~/scripts/geo-code	2010-07-05 13:13:11.334553356 +0300
++++ gpsdrive/scripts/geo-code	2010-07-05 13:13:19.202560140 +0300
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ 
+ #
+ #	geo-code: Convert a street address into a latitude/longitude