Merge lp:~bilalakhtar/ubuntu/maverick/gpsdrive/gpsdrive-merge-605350 into lp:ubuntu/maverick/gpsdrive

[Bilal Akhtar]

This branch merges latest version from Debian sid.

=== modified file 'config.guess'
--- config.guess	2010-04-16 11:31:32 +0000
+++ config.guess	2010-07-28 08:11:20 +0000
@@ -56,8 +56,8 @@
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -161,7 +161,6 @@
 	    arm*) machine=arm-unknown ;;
 	    sh3el) machine=shl-unknown ;;
 	    sh3eb) machine=sh-unknown ;;
-	    sh5el) machine=sh5le-unknown ;;
 	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
 	esac
 	# The Operating System including object format, if it has switched
@@ -212,7 +211,7 @@
 	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
 	exit ;;
     macppc:MirBSD:*:*)
-	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
+	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
 	exit ;;
     *:MirBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
@@ -324,30 +323,14 @@
 	case `/usr/bin/uname -p` in
 	    sparc) echo sparc-icl-nx7; exit ;;
 	esac ;;
-    s390x:SunOS:*:*)
-	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
     sun4H:SunOS:5.*:*)
 	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
-    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
-	eval $set_cc_for_build
-	SUN_ARCH="i386"
-	# If there is a compiler, see if it is configured for 64-bit objects.
-	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
-	# This test works for both compilers.
-	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
-	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
-		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
-		grep IS_64BIT_ARCH >/dev/null
-	    then
-		SUN_ARCH="x86_64"
-	    fi
-	fi
-	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+    i86pc:SunOS:5.*:*)
+	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
     sun4*:SunOS:6*:*)
 	# According to config.sub, this is the proper way to canonicalize
@@ -548,7 +531,7 @@
 		echo rs6000-ibm-aix3.2
 	fi
 	exit ;;
-    *:AIX:*:[456])
+    *:AIX:*:[45])
 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
 		IBM_ARCH=rs6000
@@ -788,8 +771,6 @@
 	case ${UNAME_MACHINE} in
 	    pc98)
 		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-	    amd64)
-		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
 	    *)
 		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
 	esac
@@ -797,7 +778,10 @@
     i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
 	exit ;;
-    *:MINGW*:*)
+    i*:MINGW*:*)
+	echo ${UNAME_MACHINE}-pc-mingw32
+	exit ;;
+    i*:MSYS_NT-*:*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit ;;
     i*:windows32*:*)
@@ -807,18 +791,12 @@
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit ;;
-    *:Interix*:[3456]*)
-    	case ${UNAME_MACHINE} in
-	    x86)
-		echo i586-pc-interix${UNAME_RELEASE}
-		exit ;;
-	    EM64T | authenticamd | genuineintel)
-		echo x86_64-unknown-interix${UNAME_RELEASE}
-		exit ;;
-	    IA64)
-		echo ia64-unknown-interix${UNAME_RELEASE}
-		exit ;;
-	esac ;;
+    x86:Interix*:[345]*)
+	echo i586-pc-interix${UNAME_RELEASE}
+	exit ;;
+    EM64T:Interix*:[345]*)
+	echo x86_64-unknown-interix${UNAME_RELEASE}
+	exit ;;
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
 	echo i${UNAME_MACHINE}-pc-mks
 	exit ;;
@@ -855,16 +833,6 @@
 	echo ${UNAME_MACHINE}-pc-minix
 	exit ;;
     arm*:Linux:*:*)
-	eval $set_cc_for_build
-	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
-	    | grep -q __ARM_EABI__
-	then
-	    echo ${UNAME_MACHINE}-unknown-linux-gnu
-	else
-	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
-	fi
-	exit ;;
-    avr32*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     cris:Linux:*:*)
@@ -931,9 +899,6 @@
 	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
 	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
 	exit ;;
-    padre:Linux:*:*)
-	echo sparc-unknown-linux-gnu
-	exit ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
@@ -963,9 +928,6 @@
     x86_64:Linux:*:*)
 	echo x86_64-unknown-linux-gnu
 	exit ;;
-    xtensa*:Linux:*:*)
-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
     i*86:Linux:*:*)
 	# The BFD linker knows what the default object file format is, so
 	# first see if it will tell us. cd to the root directory to prevent
@@ -981,6 +943,17 @@
 	  elf32-i386)
 		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
 		;;
+	  a.out-i386-linux)
+		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
+		exit ;;
+	  coff-i386)
+		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
+		exit ;;
+	  "")
+		# Either a pre-BFD a.out linker (linux-gnuoldld) or
+		# one that does not give us useful --help.
+		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
+		exit ;;
 	esac
 	# Determine whether the default compiler is a.out or elf
 	eval $set_cc_for_build
@@ -997,7 +970,7 @@
 	LIBC=gnulibc1
 	# endif
 	#else
-	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
+	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__sun)
 	LIBC=gnu
 	#else
 	LIBC=gnuaout
@@ -1090,11 +1063,8 @@
     pc:*:*:*)
 	# Left here for compatibility:
         # uname -m prints for DJGPP always 'pc', but it prints nothing about
-        # the processor, so we play safe by assuming i586.
-	# Note: whatever this is, it MUST be the same as what config.sub
-	# prints for the "djgpp" host, or else GDB configury will decide that
-	# this is a cross-build.
-	echo i586-pc-msdosdjgpp
+        # the processor, so we play safe by assuming i386.
+	echo i386-pc-msdosdjgpp
         exit ;;
     Intel:Mach:3*:*)
 	echo i386-pc-mach3
@@ -1132,16 +1102,6 @@
     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
         /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
           && { echo i486-ncr-sysv4; exit; } ;;
-    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
-	OS_REL='.3'
-	test -r /etc/.relid \
-	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	    && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
-	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
-	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
-	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
     m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
 	echo m68k-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
@@ -1217,9 +1177,6 @@
     BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
 	echo i586-pc-beos
 	exit ;;
-    BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
-	echo i586-pc-haiku
-	exit ;;
     SX-4:SUPER-UX:*:*)
 	echo sx4-nec-superux${UNAME_RELEASE}
 	exit ;;
@@ -1229,15 +1186,6 @@
     SX-6:SUPER-UX:*:*)
 	echo sx6-nec-superux${UNAME_RELEASE}
 	exit ;;
-    SX-7:SUPER-UX:*:*)
-	echo sx7-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-8:SUPER-UX:*:*)
-	echo sx8-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-8R:SUPER-UX:*:*)
-	echo sx8r-nec-superux${UNAME_RELEASE}
-	exit ;;
     Power*:Rhapsody:*:*)
 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
 	exit ;;
@@ -1328,9 +1276,6 @@
     i*86:rdos:*:*)
 	echo ${UNAME_MACHINE}-pc-rdos
 	exit ;;
-    i*86:AROS:*:*)
-	echo ${UNAME_MACHINE}-pc-aros
-	exit ;;
 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2
@@ -1491,9 +1436,9 @@
 the operating system you are using. It is advised that you
 download the most up to date version of the config scripts from
 
-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
 and
-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
 
 If the version you run ($0) is already up to date, please
 send the following data and any information you think might be

=== modified file 'config.sub'
--- config.sub	2010-04-16 11:31:32 +0000
+++ config.sub	2010-07-28 08:11:20 +0000
@@ -72,8 +72,8 @@
 version="\
 GNU config.sub ($timestamp)
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -122,7 +122,6 @@
 case $maybe_os in
   nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
   uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
-  kopensolaris*-gnu* | \
   storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
@@ -245,24 +244,20 @@
 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
 	| am33_2.0 \
-	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
+	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
 	| bfin \
 	| c4x | clipper \
 	| d10v | d30v | dlx | dsp16xx \
-	| fido | fr30 | frv \
+	| fr30 | frv \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
-	| lm32 \
-	| m32c | m32r | m32rle | m68000 | m68k | m88k \
-	| maxq | mb | microblaze | mcore | mep | metag \
+	| m32r | m32rle | m68000 | m68k | m88k | maxq | mb | microblaze | mcore \
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
 	| mips64 | mips64el \
-	| mips64octeon | mips64octeonel \
+	| mips64vr | mips64vrel \
 	| mips64orion | mips64orionel \
-	| mips64r5900 | mips64r5900el \
-	| mips64vr | mips64vrel \
 	| mips64vr4100 | mips64vr4100el \
 	| mips64vr4300 | mips64vr4300el \
 	| mips64vr5000 | mips64vr5000el \
@@ -275,7 +270,6 @@
 	| mipsisa64sr71k | mipsisa64sr71kel \
 	| mipstx39 | mipstx39el \
 	| mn10200 | mn10300 \
-	| moxie \
 	| mt \
 	| msp430 \
 	| nios | nios2 \
@@ -284,17 +278,19 @@
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 	| pyramid \
-	| score \
-	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
-	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
-	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
-	| spu | strongarm \
+	| sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
+	| sparcv8 | sparcv9 | sparcv9b \
+	| strongarm \
 	| tahoe | thumb | tic4x | tic80 | tron \
 	| v850 | v850e \
 	| we32k \
-	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
-	| z8k | z80)
+	| x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
+	| z8k)
+		basic_machine=$basic_machine-unknown
+		;;
+	m32c)
 		basic_machine=$basic_machine-unknown
 		;;
 	m6811 | m68hc11 | m6812 | m68hc12)
@@ -326,28 +322,25 @@
 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-	| avr-* | avr32-* \
+	| avr-* \
 	| bfin-* | bs2000-* \
 	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
 	| clipper-* | craynv-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
 	| elxsi-* \
-	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
+	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
 	| h8300-* | h8500-* \
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
 	| ip2k-* | iq2000-* \
-	| lm32-* \
-	| m32c-* | m32r-* | m32rle-* \
+	| m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
+	| m88110-* | m88k-* | maxq-* | mcore-* \
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
 	| mips16-* \
 	| mips64-* | mips64el-* \
-	| mips64octeon-* | mips64octeonel-* \
+	| mips64vr-* | mips64vrel-* \
 	| mips64orion-* | mips64orionel-* \
-	| mips64r5900-* | mips64r5900el-* \
-	| mips64vr-* | mips64vrel-* \
 	| mips64vr4100-* | mips64vr4100el-* \
 	| mips64vr4300-* | mips64vr4300el-* \
 	| mips64vr5000-* | mips64vr5000el-* \
@@ -369,24 +362,22 @@
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
 	| pyramid-* \
 	| romp-* | rs6000-* \
-	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
+	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
+	| sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
 	| sparclite-* \
-	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
+	| sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
 	| tahoe-* | thumb-* \
-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
+	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
 	| tron-* \
 	| v850-* | v850e-* | vax-* \
 	| we32k-* \
-	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
-	| xstormy16-* | xtensa*-* \
+	| x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
+	| xstormy16-* | xtensa-* \
 	| ymp-* \
-	| z8k-* | z80-*)
+	| z8k-*)
 		;;
-	# Recognize the basic CPU types without company name, with glob match.
-	xtensa*)
-		basic_machine=$basic_machine-unknown
+	m32c-*)
 		;;
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
@@ -450,10 +441,6 @@
 		basic_machine=m68k-apollo
 		os=-bsd
 		;;
-	aros)
-		basic_machine=i386-pc
-		os=-aros
-		;;
 	aux)
 		basic_machine=m68k-apple
 		os=-aux
@@ -478,10 +465,6 @@
 		basic_machine=c90-cray
 		os=-unicos
 		;;
-        cegcc)
-		basic_machine=arm-unknown
-		os=-cegcc
-		;;
 	convex-c1)
 		basic_machine=c1-convex
 		os=-bsd
@@ -510,8 +493,8 @@
 		basic_machine=craynv-cray
 		os=-unicosmp
 		;;
-	cr16)
-		basic_machine=cr16-unknown
+	cr16c)
+		basic_machine=cr16c-unknown
 		os=-elf
 		;;
 	crds | unos)
@@ -549,10 +532,6 @@
 		basic_machine=m88k-motorola
 		os=-sysv3
 		;;
-	dicos)
-		basic_machine=i686-pc
-		os=-dicos
-		;;
 	djgpp)
 		basic_machine=i586-pc
 		os=-msdosdjgpp
@@ -707,14 +686,6 @@
 		basic_machine=m68k-isi
 		os=-sysv
 		;;
-	m68knommu)
-		basic_machine=m68k-unknown
-		os=-linux
-		;;
-	m68knommu-*)
-		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
-		os=-linux
-		;;
 	m88k-omron*)
 		basic_machine=m88k-omron
 		;;
@@ -730,10 +701,6 @@
 		basic_machine=i386-pc
 		os=-mingw32
 		;;
-	mingw32ce)
-		basic_machine=arm-unknown
-		os=-mingw32ce
-		;;
 	miniframe)
 		basic_machine=m68000-convergent
 		;;
@@ -860,14 +827,6 @@
 		basic_machine=i860-intel
 		os=-osf
 		;;
-	parisc)
-		basic_machine=hppa-unknown
-		os=-linux
-		;;
-	parisc-*)
-		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
-		os=-linux
-		;;
 	pbd)
 		basic_machine=sparc-tti
 		;;
@@ -969,10 +928,6 @@
 	sb1el)
 		basic_machine=mipsisa64sb1el-unknown
 		;;
-	sde)
-		basic_machine=mipsisa32-sde
-		os=-elf
-		;;
 	sei)
 		basic_machine=mips-sei
 		os=-seiux
@@ -984,9 +939,6 @@
 		basic_machine=sh-hitachi
 		os=-hms
 		;;
-	sh5el)
-		basic_machine=sh5le-unknown
-		;;
 	sh64)
 		basic_machine=sh64-unknown
 		;;
@@ -1076,10 +1028,6 @@
 		basic_machine=tic6x-unknown
 		os=-coff
 		;;
-	tile*)
-		basic_machine=tile-unknown
-		os=-linux-gnu
-		;;
 	tx39)
 		basic_machine=mipstx39-unknown
 		;;
@@ -1155,10 +1103,6 @@
 		basic_machine=z8k-unknown
 		os=-sim
 		;;
-	z80-*-coff)
-		basic_machine=z80-unknown
-		os=-sim
-		;;
 	none)
 		basic_machine=none-none
 		os=-none
@@ -1197,10 +1141,10 @@
 	we32k)
 		basic_machine=we32k-att
 		;;
-	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
+	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
 		basic_machine=sh-unknown
 		;;
-	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
+	sparc | sparcv8 | sparcv9 | sparcv9b)
 		basic_machine=sparc-sun
 		;;
 	cydra)
@@ -1269,9 +1213,8 @@
 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
 	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
-	      | -kopensolaris* \
 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-	      | -aos* | -aros* \
+	      | -aos* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
 	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
@@ -1280,7 +1223,7 @@
 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-	      | -chorusos* | -chorusrdb* | -cegcc* \
+	      | -chorusos* | -chorusrdb* \
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
 	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
 	      | -uxpv* | -beos* | -mpeix* | -udk* \
@@ -1290,7 +1233,7 @@
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
+	      | -skyos* | -haiku* | -rdos*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1420,9 +1363,6 @@
 	-zvmoe)
 		os=-zvmoe
 		;;
-	-dicos*)
-		os=-dicos
-		;;
 	-none)
 		;;
 	*)
@@ -1445,12 +1385,6 @@
 # system, and we'll never get to this point.
 
 case $basic_machine in
-        score-*)
-		os=-elf
-		;;
-        spu-*)
-		os=-elf
-		;;
 	*-acorn)
 		os=-riscix1.2
 		;;
@@ -1460,9 +1394,9 @@
 	arm*-semi)
 		os=-aout
 		;;
-        c4x-* | tic4x-*)
-        	os=-coff
-		;;
+    c4x-* | tic4x-*)
+        os=-coff
+        ;;
 	# This must come before the *-dec entry.
 	pdp10-*)
 		os=-tops20
@@ -1488,9 +1422,6 @@
 	m68*-cisco)
 		os=-aout
 		;;
-        mep-*)
-		os=-elf
-		;;
 	mips*-cisco)
 		os=-elf
 		;;

=== modified file 'debian/changelog'
--- debian/changelog	2010-07-11 20:22:33 +0000
+++ debian/changelog	2010-07-28 08:11:20 +0000
@@ -1,3 +1,35 @@
+gpsdrive (2.10~pre4-6.dfsg-5ubuntu1) maverick; urgency=low
+
+  * Merge from Debian unstable (LP: #605350), remaining changes:
+    - scripts/geo-code: Changed executing environment from /bin/sh
+      to /bin/bash.
+    - Dropped changes:
+      + Build with libmysqlclient16-dev.
+
+ -- Bilal Akhtar <[e-mail]>  Mon, 26 Jul 2010 12:03:38 +0530
+
+gpsdrive (2.10~pre4-6.dfsg-5) unstable; urgency=low
+
+  * Added 103-no-textquery patch to remove Text::Query use. Removed
+    dependency on the libtext-query-perl package.
+    Thanks Jonathan Yu.
+  * Revised debian/control for a better layout.
+  * Vcs-* fields now point the trunk branch.
+
+ -- Francesco Paolo Lovergine <[e-mail]>  Mon, 08 Mar 2010 11:23:39 +0100
+
+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 <[e-mail]>  Thu, 04 Feb 2010 16:53:01 +0100
+
 gpsdrive (2.10~pre4-6.dfsg-3ubuntu5) maverick; urgency=low
 
   * scripts/geo-code: Changed executing environment from /bin/sh
@@ -113,6 +145,7 @@
 
  -- Andreas Putzo <[e-mail]>  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 file 'debian/compat'
--- debian/compat	2007-10-16 20:00:05 +0000
+++ debian/compat	2010-07-28 08:11:20 +0000
@@ -1,1 +1,1 @@
-5
+7

=== modified file 'debian/control'
--- debian/control	2010-04-16 11:31:32 +0000
+++ debian/control	2010-07-28 08:11:20 +0000
@@ -3,19 +3,20 @@
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Debian GIS Project <[e-mail]>
-Uploaders: Andreas Putzo <[e-mail]>
+Uploaders: Andreas Putzo <[e-mail]>, Francesco Paolo Lovergine <[e-mail]>
 DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 5), automake1.9, libtool, pkg-config, libpcre3-dev, libgtk2.0-dev,libart-2.0-dev, libxml2-dev, libmysqlclient16-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/
+Vcs-Svn: svn://svn.debian.org/svn/pkg-grass/packages/gpsdrive/trunk
+Vcs-Browser: http://svn.debian.org/viewsvn/pkg-grass/packages/gpsdrive/trunk
 
 Package: gpsdrive
 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.
@@ -39,7 +40,9 @@
 
 Package: gpsdrive-scripts
 Architecture: all
-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
+Depends: gpsdrive, ${perl:Depends}, python, python-imaging, python-mapnik, libdbi-perl, libdbd-mysql-perl, libdate-manip-perl, libfile-slurp-perl, 
+ libmime-base64-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 file 'debian/patches/00list'
--- debian/patches/00list	2010-07-05 10:54:00 +0000
+++ debian/patches/00list	2010-07-28 08:11:20 +0000
@@ -18,4 +18,5 @@
 100-fix-insecure-tempfiles
 101-signalposreq
 102-unittest
-103-lp-325288
+103-no-textquery
+104-lp-325288

=== removed file 'debian/patches/103-lp-325288.dpatch'
--- debian/patches/103-lp-325288.dpatch	2010-07-05 15:42:31 +0000
+++ debian/patches/103-lp-325288.dpatch	1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-#! /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

=== added file 'debian/patches/103-no-textquery.dpatch'
--- debian/patches/103-no-textquery.dpatch	1970-01-01 00:00:00 +0000
+++ debian/patches/103-no-textquery.dpatch	2010-07-28 08:11:20 +0000
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 103-no-textquery.dpatch by Francesco Paolo Lovergine <[e-mail]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' gpsdrive-2.10pre7~/scripts/osm/perl_lib/Geo/Gpsdrive/getstreet.pm gpsdrive-2.10pre7/scripts/osm/perl_lib/Geo/Gpsdrive/getstreet.pm
+--- gpsdrive-2.10pre7~/scripts/osm/perl_lib/Geo/Gpsdrive/getstreet.pm	2009-06-14 15:57:25.000000000 +0200
++++ gpsdrive-2.10pre7/scripts/osm/perl_lib/Geo/Gpsdrive/getstreet.pm	2010-03-08 10:47:16.000000000 +0100
+@@ -2,7 +2,6 @@
+ #noch nicht alle variablen angepasst
+ use LWP::UserAgent;
+ use WWW::Mechanize;
+-use Text::Query;
+ use Getopt::Long; #maybe not needed any more
+ use Pod::Usage;
+ use DBI;

=== added file 'debian/patches/104-lp-325288.dpatch'
--- debian/patches/104-lp-325288.dpatch	1970-01-01 00:00:00 +0000
+++ debian/patches/104-lp-325288.dpatch	2010-07-28 08:11:20 +0000
@@ -0,0 +1,17 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 104-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

=== added file 'debian/patches/gpsdrive2.10pre7_osm_proj.patch'
--- debian/patches/gpsdrive2.10pre7_osm_proj.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/gpsdrive2.10pre7_osm_proj.patch	2010-07-28 08:11:20 +0000
@@ -0,0 +1,572 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## gpsdrive2.10pre7_osm_proj.patch by H. Bowman <hamish_b yahoo com>
+##
+## DP: Fix OpenStreetMap projection handling (backport from upstream)
+
+@DPATCH@
+Index: src/map_download.c
+===================================================================
+--- src/map_download.c	(revision 2476)
++++ src/map_download.c	(revision 2477)
+@@ -61,8 +61,8 @@
+ # endif
+ 
+ 
+-#include <gpsdrive.h>
+-#include <map_handler.h>
++#include "gpsdrive.h"
++#include "map_handler.h"
+ #include "gpsdrive_config.h"
+ #include "gui.h"
+ #include "map_download.h"
+@@ -133,24 +133,20 @@
+ 	MAPSOURCE_LANDSAT, "1 : 50 million", 0, 50000000,
+ 
+ 	MAPSOURCE_OSM_TAH, "OpenStreetMap Tiles@Home", -1, -1,
+-	MAPSOURCE_OSM_TAH, "1 : 147 456 000", 1, 256*576000,
+-	MAPSOURCE_OSM_TAH, "1 : 73 728 000", 2, 128*576000,
+-	MAPSOURCE_OSM_TAH, "1 : 36 864 000", 3, 64*576000,
+-	MAPSOURCE_OSM_TAH, "1 : 18 432 000", 4, 32*576000,
+-	MAPSOURCE_OSM_TAH, "1 : 9 216 000", 5, 16*576000,
+-	MAPSOURCE_OSM_TAH, "1 : 4 608 000", 6, 8*576000,
+-	MAPSOURCE_OSM_TAH, "1 : 2 304 000", 7, 4*576000,
+-	MAPSOURCE_OSM_TAH, "1 : 1 152 000", 8, 2*576000,
+-
+-	MAPSOURCE_OSM_TAH, "1 : 576 000", 9, 576000,
+-	MAPSOURCE_OSM_TAH, "1 : 288 000", 10, 288000,
+-	MAPSOURCE_OSM_TAH, "1 : 144 000", 11, 144000,
+-	MAPSOURCE_OSM_TAH, "1 : 72 000", 12, 72000,
+-	MAPSOURCE_OSM_TAH, "1 : 36 000", 13, 36000,
+-	MAPSOURCE_OSM_TAH, "1 : 18 000", 14, 18000,
+-	MAPSOURCE_OSM_TAH, "1 : 9 000", 15, 9000,
+-	MAPSOURCE_OSM_TAH, "1 : 4 500", 16, 4500,
+-	MAPSOURCE_OSM_TAH, "1 : 2 250", 17, 2250,
++	/* scale varies with latitude, so this is just a rough guide
++		which will only be valid for mid-lats */
++	/* Octave code: for lat=0:5:75;   disp( [lat (a * 2*pi *pixelfact * cos(lat  * pi/180))  / (256*2^9)]); end */
++	MAPSOURCE_OSM_TAH, "1 : 2 500", 17, 2250,
++	MAPSOURCE_OSM_TAH, "1 : 5 000", 16, 4500,
++	MAPSOURCE_OSM_TAH, "1 : 10 000", 15, 9000,
++	MAPSOURCE_OSM_TAH, "1 : 20 000", 14, 18000,
++	MAPSOURCE_OSM_TAH, "1 : 40 000", 13, 36000,
++	MAPSOURCE_OSM_TAH, "1 : 75 000", 12, 72000,
++	MAPSOURCE_OSM_TAH, "1 : 150 000", 11, 144000,
++	MAPSOURCE_OSM_TAH, "1 : 300 000", 10, 288000,
++	MAPSOURCE_OSM_TAH, "1 : 600 000", 9, 576000,
++	/* the distortion gets too bad at scales wider than 1:500k
++	    It would be more accurate to stop earlier, but we compromise */
+ 	MAPSOURCE_N_ITEMS, "", 0, 0
+ };
+ 
+@@ -165,7 +161,23 @@
+ 	gtk_entry_set_text (GTK_ENTRY (lon_entry), lon);
+ }
+ 
++/* *****************************************************************************
++ * calculate the local map scale based on Web Tile zoom level and latitude
++ */
++double
++calc_webtile_scale (double lat, int zoom)
++{
++    double scale;
++    double a = 6378137.0; /* major radius of WGS84 ellipsoid (meters) */
+ 
++    scale = (a * 2*M_PI * cos(DEG2RAD(lat)) * PIXELFACT) / (256 * pow(2,zoom));
++
++    if (mydebug > 3)
++	g_print ("Tile scale: %.2f\n", scale);
++
++    return scale;
++}
++
+ /* *****************************************************************************
+  * callback to set paramaters for map to download
+  */
+@@ -195,9 +207,13 @@
+ 			3, &mapdl_scale, -1);
+ /* TODO: determine map_ or top_ proj at this point so drawdownloadrectangle()
+  *	 knows how big to draw the green preview box */
++		if (local_config.mapsource_type == MAPSOURCE_OSM_TAH)
++		    mapdl_scale = (int)calc_webtile_scale(mapdl_lat, mapdl_zoom);
++
+ 		if (mydebug > 3)
+ 			g_print ("new map scale/zoom level: %d / %d\n",
+ 				mapdl_scale, mapdl_zoom);
++
+ 		local_config.mapsource_scale = gtk_combo_box_get_active (GTK_COMBO_BOX (scale_combobox));
+ 		current.needtosave = TRUE;
+ 	}
+@@ -439,6 +455,7 @@
+ 	gchar file_path[512];
+ 	gchar path[40];
+ 	gchar img_fmt[4];
++	gchar scale_str[40];
+ 
+ 	if (mapdl_active)
+ 		return TRUE;
+@@ -450,11 +467,14 @@
+ 			g_strlcpy (path, "landsat", sizeof (path));
+ 			g_strlcpy (img_fmt, "jpg", sizeof (img_fmt));
+ 			mapdl_geturl_landsat ();
++			g_snprintf (scale_str, sizeof (scale_str), "%d", mapdl_scale);
+ 			break;
+ 		case MAPSOURCE_OSM_TAH:
+ 			g_strlcpy (path, "openstreetmap_tah", sizeof (path));
+ 			g_strlcpy (img_fmt, "png", sizeof (img_fmt));
+ 			mapdl_geturl_osm_tah ();
++			mapdl_scale = (int)calc_webtile_scale(mapdl_lat, mapdl_zoom);
++			g_snprintf (scale_str, sizeof (scale_str), "%d", mapdl_zoom);
+ 			break;
+ 		default:
+ 			return TRUE;
+@@ -464,10 +484,11 @@
+ 		g_print ("  download url:\n%s\n", mapdl_url);
+ 
+ 	/* set file path and create directory if necessary */
+-	
+-	
+-	g_snprintf (file_path, sizeof (file_path), "%s%s/%d/%.0f/%.0f/",
+-		local_config.dir_maps, path, mapdl_scale, mapdl_lat, mapdl_lon);
++
++	g_snprintf (file_path, sizeof (file_path), "%s%s/%s/%.0f/%.0f/",
++		local_config.dir_maps, path, scale_str, mapdl_lat, mapdl_lon);
++
++
+ 	if(!g_file_test (file_path, G_FILE_TEST_IS_DIR))
+ 	{
+ 		if (g_mkdir_with_parents (file_path, 0700))
+@@ -477,14 +498,15 @@
+ 	}
+ 
+ 	/* complete filename */
+-	g_snprintf (mapdl_file_w_path, sizeof (mapdl_file_w_path), "%s%s_%d_%5.3f_%5.3f.%s",
+-		file_path, mapdl_proj, mapdl_scale, mapdl_lat, mapdl_lon, img_fmt);
++	g_snprintf (mapdl_file_w_path, sizeof (mapdl_file_w_path), "%s%s_%s_%5.3f_%5.3f.%s",
++		file_path, mapdl_proj, scale_str, mapdl_lat, mapdl_lon, img_fmt);
+ 
+ 	if (mydebug > 10)
+ 		g_print ("  filename: %s\n", mapdl_file_w_path);
+ 
+ 	gtk_progress_bar_set_text (GTK_PROGRESS_BAR (mapdl_progress),
+ 		_("Loading Map..."));
++
+ 	mapdl_abort = FALSE;
+ 	mapdl_download ();
+ 
+Index: src/map_download.h
+===================================================================
+--- src/map_download.h	(revision 2476)
++++ src/map_download.h	(revision 2477)
+@@ -1,10 +1,9 @@
+ /***********************************************************************
+ 
+ Copyright (c) 2008 Guenther Meyer <d.s.e (at) sordidmusic.com>
+-
+ Website: www.gpsdrive.de/
+ 
+-Disclaimer: Please do not use for navigation.
++Disclaimer: Please do not use as a primary means of navigation.
+ 
+     This program is free software; you can redistribute it and/or modify
+     it under the terms of the GNU General Public License as published by
+@@ -36,5 +35,6 @@
+ void mapdl_set_coords (gchar *lat, gchar *lon);
+ gint mapdl_init (void);
+ gint mapdl_cleanup (void);
++double calc_webtile_scale (double, int);
+ 
+ #endif /* GPSDRIVE_MAP_DOWNLOAD_H */
+Index: scripts/gpsfetchmap.pl
+===================================================================
+--- scripts/gpsfetchmap.pl	(revision 2479)
++++ scripts/gpsfetchmap.pl	(revision 2480)
+@@ -47,6 +47,7 @@
+ modified (Jul 2007) by Maciek Kaliszewski <mkalkal\@interia.pl>
+ modified (Oct 2007) by Andreas Putzo <andreas\@putzo.net>
+ modified (Jan 2008) by Gernot Hillier <gernot\@hillier.de> (added Openstreetmap support)
++modified (Aug 2009) by Hamish Bowman <hamish_b yahoo com> (fix OSM+WMS map scales)
+ Version svn-$Version
+ ";
+ 
+@@ -151,24 +152,20 @@
+       10000000 =>10000000,
+       50000000 =>50000000,
+     },
++# Web Map Tiles scale varies with latitude by the formula
++# (a * 2*pi * PIXELFACT * cos(lat * pi/180)) / (256 * 2^zoom)
++# where a is major radius of the Earth according to the WGS84 ellipsoid definition.
++# zoom levels lower than 9 (~1:500k) badly distort the Mercator so are not offered.
+     openstreetmap_tah => {
+-      256*576000 =>  1,
+-      128*576000 =>  2,
+-       64*576000 =>  3,
+-       32*576000 =>  4,
+-       16*576000 =>  5,
+-        8*576000 =>  6,
+-        4*576000 =>  7,
+-        2*576000 =>  8,
+-          576000 =>  9,
+-          288000 => 10,
+-          144000 => 11,
+-           72000 => 12,
+-           36000 => 13,
+-           18000 => 14,
+-           9000  => 15,
+-            4500 => 16,
+-            2250 => 17
++          600000 =>  9,
++          300000 => 10,
++          150000 => 11,
++           75000 => 12,
++           40000 => 13,
++           20000 => 14,
++           10000 => 15,
++            5000 => 16,
++            2500 => 17
+     }
+ };
+ 
+@@ -240,8 +237,6 @@
+     $polite=1;
+ }
+ 
+-
+-
+ if ( $mapserver eq 'geoscience' )
+ {
+     $scale ||= join(",",keys %{$Scale2Zoom->{'geoscience'}});
+@@ -269,22 +264,24 @@
+ pod2usage(-verbose=>2) if $man;
+ 
+ sub append_koords($$$$);   # {}
++sub calc_webtile_scale ($$); # {}
+ sub check_coverage($);     # {}
+ sub check_koord_file($);   # {}
+ sub debug($);              # {}
++sub file_count($);         # {}
+ sub geoscience_url($$$);   # {}
+-sub landsat_url($$$);   # {}
+-sub resize($$); #{}
+-sub file_count($);         # {}
+ sub get_coords_for_route;  # {}
+ sub get_coords_for_track($); # {}
++sub get_gpsd_position();   # {}
+ sub get_waypoint($);       # {}
+ sub is_map_file($);        # {}
++sub landsat_url($$$);      # {}
++sub openstreetmap_tah_url($$$); # {}
+ sub read_gpstool_map_file(); # {}
+ sub read_koord_file($);    # {}
++sub resize($$);            # {}
+ sub update_gpsdrive_map_koord_file(); # {}
+ sub wget_map($$$);         # {}
+-sub get_gpsd_position();       # {}
+ 
+ STDERR->autoflush(1);
+ STDOUT->autoflush(1);
+@@ -407,7 +404,9 @@
+ 
+ my ($existing,$wanted) = file_count($desired_locations);
+ print "You are about to download $wanted (".($existing+$wanted).") file(s).\n";
+-
++if ($debug) {
++    print "Politeness delay set to $polite seconds,\n";
++}
+ if ( $mapserver eq 'geoscience' ){
+     print "+-----------------------------------------------------------+\n";
+     print "| Geoscience Maps are Copyright, Commonwealth of Australia  |\n";
+@@ -419,6 +418,7 @@
+     print "+----------------------------------------------------------------+\n";
+     print "| Landsat maps are courtesy JPL/NASA's OnEarth WMS Global Mosaic |\n";
+     print "| Map prefix will be set automatically based on scale.           |\n";
++    print "+----------------------------------------------------------------+\n";
+     # By law, US Government data is without copyright.
+ }elsif ( $mapserver eq 'openstreetmap_tah' ){
+     print "+-----------------------------------------------------------+\n";
+@@ -427,6 +427,8 @@
+     print "| They are free for use under the terms of the              |\n";
+     print "| Creative Commons \"Attribution-Share Alike 2.0 Generic\"    |\n";
+     print "| license. See http://www.openstreetmap.org for details.    |\n";
++    print "+-----------------------------------------------------------+\n";
++
+ } elsif ( ! $force) {
+     print "You may violating the map servers terms of use!\n";
+     print "Please use their service responsible!\n";
+@@ -654,14 +656,32 @@
+ ######################################################################
+ sub map_filename($$$){
+     my ($scale,$lati,$long) = @_;
++
++    my $mscale = $scale;
++
++    if ( $mapserver eq 'openstreetmap_tah' ) {
++	my $zoom = undef;
++	for my $s ( sort keys %{$Scale2Zoom->{openstreetmap_tah}} ) {
++	    next unless $s == $scale;
++	    $zoom = $Scale2Zoom->{openstreetmap_tah}->{$s};
++	    last;
++	}
++	unless ( $zoom ) {
++	    print "Error calculating Zoomlevel for Scale: $scale\n";
++	    return (undef);
++	}
++	$mscale = $zoom;
++    }
+     
+-    my $filename = "$mapserver/$scale"
++    my $filename = "$mapserver/$mscale"
+ 	."/".int($lati)
+ #	."/".sprintf("%3.1f",$lati)
+ 	."/".int($long)
+-	."/$FILEPREFIX$scale-$lati-$long.$fileext";
+-    printf("Filename(%.0f,%.5f,%.5f): $filename\n",$scale,$lati,$long)
++	."/$FILEPREFIX$mscale-$lati-$long.$fileext";
++
++    printf("Filename(%.0f,%.5f,%.5f): $filename\n",$mscale,$lati,$long)
+ 	if $debug;
++
+     return $filename;
+ }
+ 
+@@ -678,6 +698,9 @@
+     # mapblast/1000/047/047.0232/9/map_1000-047.0232-0009.8140.gif 47.02320 9.81400 1000
+     #my $filename = "$mapserver/$scale/".int($lati)."/".sprintf("%3.1f",$lati).
+     #"/".int($long)."/$FILEPREFIX$scale-$lati-$long.gif";
++    if ($debug) {
++	print "---------------\n";
++    }
+ 
+     # redundant??
+     if ($mapserver eq 'landsat')
+@@ -1082,7 +1105,7 @@
+ 	    $lon2 += 360;
+ 	}
+ 
+-    debug( "landsat_url(LAT=$lat,LON=$lon,SCALE=$scale,FACTOR=$factor)");
++    debug( "landsat_url(LAT=$lat,LON=$lon,SCALE=$scale)");
+ 
+     debug( "Calculated Lat1  $lat1");
+     debug( "Calculated Lat2  $lat2");
+@@ -1111,7 +1134,28 @@
+     return ($url,$scale);
+ }
+ 
++
+ #############################################################################
++# calculate the local map scale based on Web Tile zoom level and latitude
++# This same formula is used by OSM, Google Maps, Microsoft Maps, ...
++sub calc_webtile_scale ($$){
++    my $lat = shift;
++    my $zoom = shift;
++
++    # major radius of WGS84 ellipsoid (meters)
++    my $a = $RADIUS_KM * 1000;
++
++    my $zscale = (2*$a*$PI * cos($lat*$D2R) * $PIXELFACT) / (256 * 2**$zoom);
++
++    if ($debug) {
++        print "Tile scale: $zscale\n";
++    }
++
++    return ($zscale);
++}
++
++
++#############################################################################
+ sub openstreetmap_tah_url($$$){
+     my $lati = shift;
+     my $long = shift;
+@@ -1122,7 +1166,7 @@
+     for my $s ( sort keys %{$Scale2Zoom->{openstreetmap_tah}} ) {
+ 	next unless $s == $scale;
+ 	$zoom = $Scale2Zoom->{openstreetmap_tah}->{$s};
+-	$mapscale = $s;
++	$mapscale = calc_webtile_scale($lati, $zoom);
+ 	last;
+     }
+ 
+@@ -1132,10 +1176,9 @@
+     }
+ 
+     if ($debug) {
+-	print "\n";
+-	print "Using openstreetmap_tah zoom ", $zoom, " for requested scale ", $scale, ":1 actual scale ", $mapscale, ":1\n";
+-	print "lat: $lati\n";
+-	print "lon: $long\n";
++	print "Using openstreetmap_tah zoom ", $zoom, " for requested scale 1:", $scale, ". Actual scale 1:", $mapscale, "\n";
++	print "cetner lat: $lati\n";
++	print "cetner lon: $long\n";
+     }
+ 
+     my $url = "http://tah.openstreetmap.org/MapOf/?lat=$lati&long=$long&z=$zoom&w=1280&h=1024&format=png";
+@@ -1903,7 +1946,7 @@
+ 
+ gpsfetchmap -w <WAYPOINT NAME> -sc <SCALE> -a <#> -p
+ 
+-gpsfetchmap -la <latitude DD.DDDD> -lo <latitude DD.DDDD> -sc <SCALE> -a <#> -p
++gpsfetchmap -la <latitude DD.DDDD> -lo <longitude DD.DDDD> -sc <SCALE> -a <#> -p
+ 
+ gpsfetchmap -sla <start latitude DD.DDDD> -endla <end latitude DD.DDDD> -slo <start longitude DD.DDDD> -endlo <end longitude DD.DDDD> -sc <SCALE> -a <#> -p
+ 
+@@ -1915,7 +1958,7 @@
+             [-la <latitude DD.DDDD>] [-lo <longitude DD.DDDD>] 
+             [-sla <start latitude DD.DDDD>] [-endla <end latitude DD.DDDD>]
+             [-slo <start longitude DD.DDDD>] [-endlo <end longitude DD.DDDD>]
+-            [-sc <SCALE>] [-a <#>] [-p] [-m <MAPSERVER>]
++            [-sc <SCALE>] [-a <#>] [-p <#>] [-m <MAPSERVER>]
+             [-u <UNIT>] [-md <DIR>] [-W <FILE>] [-t <FILE>] [-r]
+             [-C <FILE>] [-P <PREFIX>] [-F] [-d] [-v] [-h] [-M] [-n] [-U] [-c]
+ 
+@@ -2000,7 +2043,7 @@
+ of longitude. 'units' is read from the configuration file (-C) or as defined
+ by (-u).
+ 
+-=item B<-p, --polite>
++=item B<-p, --polite <#>>
+ 
+ This causes the program to sleep one second between downloads to be polite
+ to the mapserver. Takes an optional value of number of seconds to sleep.
+@@ -2117,6 +2160,13 @@
+ 
+ Prints the manual page and exits.
+ 
++=back
++
++
++=head1 OUTPUT
++
++=over 2
++
+ =item B<Download>
+ 
+ When downloading Maps the output reads as folows:
+@@ -2130,5 +2180,16 @@
+ 
+ =back
+ 
++
++=head1 EXAMPLE
++
++Download all 1:10000 OpenStreetMaps in a 5 km radius around the
++Sydney Convention Centre. Between tile downloads it will let
++the server rest for 3 seconds.
++ 
++gpsfetchmap --mapserver openstreetmap_tah --polite 3 \
++   --lat "-33.8753" --lon 151.2001 --scale 10000 \
++   --area 5 --unit kilometers
++
+ =cut
+ 
+Index: scripts/mapnik/gpsdrive_mapnik_gentiles-in.py
+===================================================================
+--- scripts/mapnik/gpsdrive_mapnik_gentiles-in.py	(revision 2473)
++++ scripts/mapnik/gpsdrive_mapnik_gentiles-in.py	(revision 2479)
+@@ -7,14 +7,20 @@
+ 
+ Options:
+   -h, --help     show this help
+-  -b, --bbox     boundingbox (lon,lat,lon,lat) - Be carefull! Quote negative values!
+-  -s, --scale    scale single/range
+-                              1 = 147456000
+-                              2 = 73728000
+-                             ...
+-                             15 = 9000
+-                             16 = 4500
+-                             17 = 2250
++  -b, --bbox     boundingbox (minlon,minlat,maxlon,maxlat)
++                  - Be carefull! "Quote" negative values!
++  -s, --scale    scale single/range (zoom level or min-max)
++                   (below "9" Mercator becomes distorted;
++		    actual scale will vary with latitude)
++                        9 - 1:600,000
++                       10 - 1:300,000
++                       11 - 1:150,000
++                       12 - 1:75,000
++                       13 - 1:40,000
++                       14 - 1:20,000
++                       15 - 1:10,000
++                       16 - 1:5,000
++                       17 - 1:2,500
+   --test         testrun = generates Munich example
+                              
+ Examples:
+@@ -22,7 +28,7 @@
+   Munich:
+     gpsdrive_mapnik_gentiles.py -b  11.4,48.07,11.7,48.2 -s 10-16
+   
+-  World:
++  World: (just to demonstrate lat/lon order; scale not recommended)
+     gpsdrive_mapnik_gentiles.py -b "-180.0,-90.0,180.0,90.0" -s 1-6
+ """
+ 
+@@ -32,12 +38,19 @@
+ import getopt
+ import string
+ 
+-zoom2scale = [728 * 576000,256 * 576000,128 * 576000,64 * 576000,32 * 576000,16 * 576000,8 * 576000,4 * 576000,2 * 576000,576000,288000,144000,72000,36000,18000,9000,4500,2250,1125]
+ 
+-
+ DEG_TO_RAD = pi/180
+ RAD_TO_DEG = 180/pi
+ 
++def calc_scale (lat, zoom):
++    # GpsDrive's hardcoded pixels per meter ratio
++    PixelFact = 2817.947378
++    # wgs84 major Earth axis
++    a = 6378137.0
++    dynscale = ( a * 2*pi * cos(lat * DEG_TO_RAD) * PixelFact ) / ( 256*pow(2,zoom) )
++    print dynscale
++    return dynscale
++
+ def minmax (a,b,c):
+     a = max(a,b)
+     a = min(a,c)
+@@ -90,17 +103,28 @@
+          os.mkdir(tile_dir)
+ 
+     gprj = GoogleProjection(maxZoom+1) 
++
+     #m = Map(2 * 256,2 * 256)
+     m = Map(1280,1024)
+     load_map(m,mapfile)
+-    prj = Projection("+proj=merc +datum=WGS84")
+-    
++
++    #prj = Projection("+proj=merc +datum=WGS84")
++    # What follows is from /usr/share/proj/esri.extra, EPSG:900913
++    #  "Chris' funny epsgish code for the google mercator"
++    prj = Projection("+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs")
++
+     ll0 = (bbox[0],bbox[3])
+     ll1 = (bbox[2],bbox[1])
+-    
++
+     for z in range(minZoom,maxZoom + 1):
++        if z == 9:
++            print "CAUTION: Mercator projection begins to be noticeably distorted at this zoom level."
++        elif z < 9:
++            print "WARNING: Mercator projection is very distorted at this zoom level."
++
+         px0 = gprj.fromLLtoPixel(ll0,z)
+         px1 = gprj.fromLLtoPixel(ll1,z)
++
+         for x in range(int(px0[0]/640.0),int(px1[0]/640.0)+1):
+             for y in range(int(px0[1]/512.0),int(px1[1]/512.0)+1):
+                 p0 = gprj.fromPixelToLL((x * 640.0, (y+1) * 512.0),z)
+@@ -145,7 +169,7 @@
+                     fh_mapkoord.write(tile_path + " ")
+                     fh_mapkoord.write(str((p0[1] + p1[1]) / 2) + " ")
+                     fh_mapkoord.write(str((p0[0] + p1[0]) / 2) + " ")
+-                    fh_mapkoord.write(str(zoom2scale[z]))
++                    fh_mapkoord.write(str( calc_scale( (p0[1] + p1[1])/2, z) ))
+                     fh_mapkoord.write(" " + str(p0[1]) + " " + str(p0[0]))
+                     fh_mapkoord.write(" " + str(p1[1]) + " " + str(p1[0]))
+                     fh_mapkoord.write("\n")
+@@ -221,6 +245,7 @@
+     
+     # check for correct values
+     if str(eval(bboxs[0])) != bboxs[0] or str(eval(bboxs[1])) != bboxs[1] or str(eval(bboxs[2])) != bboxs[2] or str(eval(bboxs[3])) != bboxs[3]:
++        # rounding problems... what exactly is this supposed to be checking ???
+         sys.exit("Boundingbox invalid!")
+         
+     if minZoom < 1 or minZoom > 17 or maxZoom < 1 and maxZoom > 17 or minZoom > maxZoom or int(minZoom) <> minZoom or int(maxZoom) <> maxZoom:

=== modified file 'debian/rules'
--- debian/rules	2009-06-11 19:26:06 +0000
+++ debian/rules	2010-07-28 08:11:20 +0000
@@ -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