Merge lp:~bilalakhtar/ubuntu/maverick/gpsdrive/gpsdrive-merge-605350 into lp:ubuntu/maverick/gpsdrive
- Maverick (10.10)
- gpsdrive-merge-605350
- Merge into maverick
Proposed by
Bilal Akhtar
Status: | Merged |
---|---|
Merged at revision: | 20 |
Proposed branch: | lp:~bilalakhtar/ubuntu/maverick/gpsdrive/gpsdrive-merge-605350 |
Merge into: | lp:ubuntu/maverick/gpsdrive |
Diff against target: |
1406 lines (+724/-227) 11 files modified
config.guess (+32/-87) config.sub (+38/-107) debian/changelog (+33/-0) debian/compat (+1/-1) debian/control (+10/-7) debian/patches/00list (+2/-1) debian/patches/103-lp-325288.dpatch (+0/-17) debian/patches/103-no-textquery.dpatch (+18/-0) debian/patches/104-lp-325288.dpatch (+17/-0) debian/patches/gpsdrive2.10pre7_osm_proj.patch (+572/-0) debian/rules (+1/-7) |
To merge this branch: | bzr merge lp:~bilalakhtar/ubuntu/maverick/gpsdrive/gpsdrive-merge-605350 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ubuntu Sponsors | Pending | ||
Review via email: mp+31128@code.launchpad.net |
Commit message
Description of the change
This branch merges latest version from Debian sid.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'config.guess' | |||
2 | --- config.guess 2010-04-16 11:31:32 +0000 | |||
3 | +++ config.guess 2010-07-28 08:11:20 +0000 | |||
4 | @@ -56,8 +56,8 @@ | |||
5 | 56 | GNU config.guess ($timestamp) | 56 | GNU config.guess ($timestamp) |
6 | 57 | 57 | ||
7 | 58 | Originally written by Per Bothner. | 58 | Originally written by Per Bothner. |
10 | 59 | Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, | 59 | Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 |
11 | 60 | 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. | 60 | Free Software Foundation, Inc. |
12 | 61 | 61 | ||
13 | 62 | This is free software; see the source for copying conditions. There is NO | 62 | This is free software; see the source for copying conditions. There is NO |
14 | 63 | warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." | 63 | warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." |
15 | @@ -161,7 +161,6 @@ | |||
16 | 161 | arm*) machine=arm-unknown ;; | 161 | arm*) machine=arm-unknown ;; |
17 | 162 | sh3el) machine=shl-unknown ;; | 162 | sh3el) machine=shl-unknown ;; |
18 | 163 | sh3eb) machine=sh-unknown ;; | 163 | sh3eb) machine=sh-unknown ;; |
19 | 164 | sh5el) machine=sh5le-unknown ;; | ||
20 | 165 | *) machine=${UNAME_MACHINE_ARCH}-unknown ;; | 164 | *) machine=${UNAME_MACHINE_ARCH}-unknown ;; |
21 | 166 | esac | 165 | esac |
22 | 167 | # The Operating System including object format, if it has switched | 166 | # The Operating System including object format, if it has switched |
23 | @@ -212,7 +211,7 @@ | |||
24 | 212 | echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} | 211 | echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} |
25 | 213 | exit ;; | 212 | exit ;; |
26 | 214 | macppc:MirBSD:*:*) | 213 | macppc:MirBSD:*:*) |
28 | 215 | echo powerpc-unknown-mirbsd${UNAME_RELEASE} | 214 | echo powerppc-unknown-mirbsd${UNAME_RELEASE} |
29 | 216 | exit ;; | 215 | exit ;; |
30 | 217 | *:MirBSD:*:*) | 216 | *:MirBSD:*:*) |
31 | 218 | echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} | 217 | echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} |
32 | @@ -324,30 +323,14 @@ | |||
33 | 324 | case `/usr/bin/uname -p` in | 323 | case `/usr/bin/uname -p` in |
34 | 325 | sparc) echo sparc-icl-nx7; exit ;; | 324 | sparc) echo sparc-icl-nx7; exit ;; |
35 | 326 | esac ;; | 325 | esac ;; |
36 | 327 | s390x:SunOS:*:*) | ||
37 | 328 | echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` | ||
38 | 329 | exit ;; | ||
39 | 330 | sun4H:SunOS:5.*:*) | 326 | sun4H:SunOS:5.*:*) |
40 | 331 | echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` | 327 | echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` |
41 | 332 | exit ;; | 328 | exit ;; |
42 | 333 | sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) | 329 | sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) |
43 | 334 | echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` | 330 | echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` |
44 | 335 | exit ;; | 331 | exit ;; |
60 | 336 | i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) | 332 | i86pc:SunOS:5.*:*) |
61 | 337 | eval $set_cc_for_build | 333 | echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` |
47 | 338 | SUN_ARCH="i386" | ||
48 | 339 | # If there is a compiler, see if it is configured for 64-bit objects. | ||
49 | 340 | # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. | ||
50 | 341 | # This test works for both compilers. | ||
51 | 342 | if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then | ||
52 | 343 | if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ | ||
53 | 344 | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ | ||
54 | 345 | grep IS_64BIT_ARCH >/dev/null | ||
55 | 346 | then | ||
56 | 347 | SUN_ARCH="x86_64" | ||
57 | 348 | fi | ||
58 | 349 | fi | ||
59 | 350 | echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` | ||
62 | 351 | exit ;; | 334 | exit ;; |
63 | 352 | sun4*:SunOS:6*:*) | 335 | sun4*:SunOS:6*:*) |
64 | 353 | # According to config.sub, this is the proper way to canonicalize | 336 | # According to config.sub, this is the proper way to canonicalize |
65 | @@ -548,7 +531,7 @@ | |||
66 | 548 | echo rs6000-ibm-aix3.2 | 531 | echo rs6000-ibm-aix3.2 |
67 | 549 | fi | 532 | fi |
68 | 550 | exit ;; | 533 | exit ;; |
70 | 551 | *:AIX:*:[456]) | 534 | *:AIX:*:[45]) |
71 | 552 | IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` | 535 | IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` |
72 | 553 | if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then | 536 | if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then |
73 | 554 | IBM_ARCH=rs6000 | 537 | IBM_ARCH=rs6000 |
74 | @@ -788,8 +771,6 @@ | |||
75 | 788 | case ${UNAME_MACHINE} in | 771 | case ${UNAME_MACHINE} in |
76 | 789 | pc98) | 772 | pc98) |
77 | 790 | echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; | 773 | echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; |
78 | 791 | amd64) | ||
79 | 792 | echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; | ||
80 | 793 | *) | 774 | *) |
81 | 794 | echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; | 775 | echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; |
82 | 795 | esac | 776 | esac |
83 | @@ -797,7 +778,10 @@ | |||
84 | 797 | i*:CYGWIN*:*) | 778 | i*:CYGWIN*:*) |
85 | 798 | echo ${UNAME_MACHINE}-pc-cygwin | 779 | echo ${UNAME_MACHINE}-pc-cygwin |
86 | 799 | exit ;; | 780 | exit ;; |
88 | 800 | *:MINGW*:*) | 781 | i*:MINGW*:*) |
89 | 782 | echo ${UNAME_MACHINE}-pc-mingw32 | ||
90 | 783 | exit ;; | ||
91 | 784 | i*:MSYS_NT-*:*:*) | ||
92 | 801 | echo ${UNAME_MACHINE}-pc-mingw32 | 785 | echo ${UNAME_MACHINE}-pc-mingw32 |
93 | 802 | exit ;; | 786 | exit ;; |
94 | 803 | i*:windows32*:*) | 787 | i*:windows32*:*) |
95 | @@ -807,18 +791,12 @@ | |||
96 | 807 | i*:PW*:*) | 791 | i*:PW*:*) |
97 | 808 | echo ${UNAME_MACHINE}-pc-pw32 | 792 | echo ${UNAME_MACHINE}-pc-pw32 |
98 | 809 | exit ;; | 793 | exit ;; |
111 | 810 | *:Interix*:[3456]*) | 794 | x86:Interix*:[345]*) |
112 | 811 | case ${UNAME_MACHINE} in | 795 | echo i586-pc-interix${UNAME_RELEASE} |
113 | 812 | x86) | 796 | exit ;; |
114 | 813 | echo i586-pc-interix${UNAME_RELEASE} | 797 | EM64T:Interix*:[345]*) |
115 | 814 | exit ;; | 798 | echo x86_64-unknown-interix${UNAME_RELEASE} |
116 | 815 | EM64T | authenticamd | genuineintel) | 799 | exit ;; |
105 | 816 | echo x86_64-unknown-interix${UNAME_RELEASE} | ||
106 | 817 | exit ;; | ||
107 | 818 | IA64) | ||
108 | 819 | echo ia64-unknown-interix${UNAME_RELEASE} | ||
109 | 820 | exit ;; | ||
110 | 821 | esac ;; | ||
117 | 822 | [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) | 800 | [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) |
118 | 823 | echo i${UNAME_MACHINE}-pc-mks | 801 | echo i${UNAME_MACHINE}-pc-mks |
119 | 824 | exit ;; | 802 | exit ;; |
120 | @@ -855,16 +833,6 @@ | |||
121 | 855 | echo ${UNAME_MACHINE}-pc-minix | 833 | echo ${UNAME_MACHINE}-pc-minix |
122 | 856 | exit ;; | 834 | exit ;; |
123 | 857 | arm*:Linux:*:*) | 835 | arm*:Linux:*:*) |
124 | 858 | eval $set_cc_for_build | ||
125 | 859 | if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ | ||
126 | 860 | | grep -q __ARM_EABI__ | ||
127 | 861 | then | ||
128 | 862 | echo ${UNAME_MACHINE}-unknown-linux-gnu | ||
129 | 863 | else | ||
130 | 864 | echo ${UNAME_MACHINE}-unknown-linux-gnueabi | ||
131 | 865 | fi | ||
132 | 866 | exit ;; | ||
133 | 867 | avr32*:Linux:*:*) | ||
134 | 868 | echo ${UNAME_MACHINE}-unknown-linux-gnu | 836 | echo ${UNAME_MACHINE}-unknown-linux-gnu |
135 | 869 | exit ;; | 837 | exit ;; |
136 | 870 | cris:Linux:*:*) | 838 | cris:Linux:*:*) |
137 | @@ -931,9 +899,6 @@ | |||
138 | 931 | if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi | 899 | if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi |
139 | 932 | echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} | 900 | echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} |
140 | 933 | exit ;; | 901 | exit ;; |
141 | 934 | padre:Linux:*:*) | ||
142 | 935 | echo sparc-unknown-linux-gnu | ||
143 | 936 | exit ;; | ||
144 | 937 | parisc:Linux:*:* | hppa:Linux:*:*) | 902 | parisc:Linux:*:* | hppa:Linux:*:*) |
145 | 938 | # Look for CPU level | 903 | # Look for CPU level |
146 | 939 | case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in | 904 | case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in |
147 | @@ -963,9 +928,6 @@ | |||
148 | 963 | x86_64:Linux:*:*) | 928 | x86_64:Linux:*:*) |
149 | 964 | echo x86_64-unknown-linux-gnu | 929 | echo x86_64-unknown-linux-gnu |
150 | 965 | exit ;; | 930 | exit ;; |
151 | 966 | xtensa*:Linux:*:*) | ||
152 | 967 | echo ${UNAME_MACHINE}-unknown-linux-gnu | ||
153 | 968 | exit ;; | ||
154 | 969 | i*86:Linux:*:*) | 931 | i*86:Linux:*:*) |
155 | 970 | # The BFD linker knows what the default object file format is, so | 932 | # The BFD linker knows what the default object file format is, so |
156 | 971 | # first see if it will tell us. cd to the root directory to prevent | 933 | # first see if it will tell us. cd to the root directory to prevent |
157 | @@ -981,6 +943,17 @@ | |||
158 | 981 | elf32-i386) | 943 | elf32-i386) |
159 | 982 | TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" | 944 | TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" |
160 | 983 | ;; | 945 | ;; |
161 | 946 | a.out-i386-linux) | ||
162 | 947 | echo "${UNAME_MACHINE}-pc-linux-gnuaout" | ||
163 | 948 | exit ;; | ||
164 | 949 | coff-i386) | ||
165 | 950 | echo "${UNAME_MACHINE}-pc-linux-gnucoff" | ||
166 | 951 | exit ;; | ||
167 | 952 | "") | ||
168 | 953 | # Either a pre-BFD a.out linker (linux-gnuoldld) or | ||
169 | 954 | # one that does not give us useful --help. | ||
170 | 955 | echo "${UNAME_MACHINE}-pc-linux-gnuoldld" | ||
171 | 956 | exit ;; | ||
172 | 984 | esac | 957 | esac |
173 | 985 | # Determine whether the default compiler is a.out or elf | 958 | # Determine whether the default compiler is a.out or elf |
174 | 986 | eval $set_cc_for_build | 959 | eval $set_cc_for_build |
175 | @@ -997,7 +970,7 @@ | |||
176 | 997 | LIBC=gnulibc1 | 970 | LIBC=gnulibc1 |
177 | 998 | # endif | 971 | # endif |
178 | 999 | #else | 972 | #else |
180 | 1000 | #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) | 973 | #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__sun) |
181 | 1001 | LIBC=gnu | 974 | LIBC=gnu |
182 | 1002 | #else | 975 | #else |
183 | 1003 | LIBC=gnuaout | 976 | LIBC=gnuaout |
184 | @@ -1090,11 +1063,8 @@ | |||
185 | 1090 | pc:*:*:*) | 1063 | pc:*:*:*) |
186 | 1091 | # Left here for compatibility: | 1064 | # Left here for compatibility: |
187 | 1092 | # uname -m prints for DJGPP always 'pc', but it prints nothing about | 1065 | # uname -m prints for DJGPP always 'pc', but it prints nothing about |
193 | 1093 | # the processor, so we play safe by assuming i586. | 1066 | # the processor, so we play safe by assuming i386. |
194 | 1094 | # Note: whatever this is, it MUST be the same as what config.sub | 1067 | echo i386-pc-msdosdjgpp |
190 | 1095 | # prints for the "djgpp" host, or else GDB configury will decide that | ||
191 | 1096 | # this is a cross-build. | ||
192 | 1097 | echo i586-pc-msdosdjgpp | ||
195 | 1098 | exit ;; | 1068 | exit ;; |
196 | 1099 | Intel:Mach:3*:*) | 1069 | Intel:Mach:3*:*) |
197 | 1100 | echo i386-pc-mach3 | 1070 | echo i386-pc-mach3 |
198 | @@ -1132,16 +1102,6 @@ | |||
199 | 1132 | 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) | 1102 | 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) |
200 | 1133 | /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ | 1103 | /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ |
201 | 1134 | && { echo i486-ncr-sysv4; exit; } ;; | 1104 | && { echo i486-ncr-sysv4; exit; } ;; |
202 | 1135 | NCR*:*:4.2:* | MPRAS*:*:4.2:*) | ||
203 | 1136 | OS_REL='.3' | ||
204 | 1137 | test -r /etc/.relid \ | ||
205 | 1138 | && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` | ||
206 | 1139 | /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ | ||
207 | 1140 | && { echo i486-ncr-sysv4.3${OS_REL}; exit; } | ||
208 | 1141 | /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ | ||
209 | 1142 | && { echo i586-ncr-sysv4.3${OS_REL}; exit; } | ||
210 | 1143 | /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ | ||
211 | 1144 | && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; | ||
212 | 1145 | m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) | 1105 | m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) |
213 | 1146 | echo m68k-unknown-lynxos${UNAME_RELEASE} | 1106 | echo m68k-unknown-lynxos${UNAME_RELEASE} |
214 | 1147 | exit ;; | 1107 | exit ;; |
215 | @@ -1217,9 +1177,6 @@ | |||
216 | 1217 | BePC:BeOS:*:*) # BeOS running on Intel PC compatible. | 1177 | BePC:BeOS:*:*) # BeOS running on Intel PC compatible. |
217 | 1218 | echo i586-pc-beos | 1178 | echo i586-pc-beos |
218 | 1219 | exit ;; | 1179 | exit ;; |
219 | 1220 | BePC:Haiku:*:*) # Haiku running on Intel PC compatible. | ||
220 | 1221 | echo i586-pc-haiku | ||
221 | 1222 | exit ;; | ||
222 | 1223 | SX-4:SUPER-UX:*:*) | 1180 | SX-4:SUPER-UX:*:*) |
223 | 1224 | echo sx4-nec-superux${UNAME_RELEASE} | 1181 | echo sx4-nec-superux${UNAME_RELEASE} |
224 | 1225 | exit ;; | 1182 | exit ;; |
225 | @@ -1229,15 +1186,6 @@ | |||
226 | 1229 | SX-6:SUPER-UX:*:*) | 1186 | SX-6:SUPER-UX:*:*) |
227 | 1230 | echo sx6-nec-superux${UNAME_RELEASE} | 1187 | echo sx6-nec-superux${UNAME_RELEASE} |
228 | 1231 | exit ;; | 1188 | exit ;; |
229 | 1232 | SX-7:SUPER-UX:*:*) | ||
230 | 1233 | echo sx7-nec-superux${UNAME_RELEASE} | ||
231 | 1234 | exit ;; | ||
232 | 1235 | SX-8:SUPER-UX:*:*) | ||
233 | 1236 | echo sx8-nec-superux${UNAME_RELEASE} | ||
234 | 1237 | exit ;; | ||
235 | 1238 | SX-8R:SUPER-UX:*:*) | ||
236 | 1239 | echo sx8r-nec-superux${UNAME_RELEASE} | ||
237 | 1240 | exit ;; | ||
238 | 1241 | Power*:Rhapsody:*:*) | 1189 | Power*:Rhapsody:*:*) |
239 | 1242 | echo powerpc-apple-rhapsody${UNAME_RELEASE} | 1190 | echo powerpc-apple-rhapsody${UNAME_RELEASE} |
240 | 1243 | exit ;; | 1191 | exit ;; |
241 | @@ -1328,9 +1276,6 @@ | |||
242 | 1328 | i*86:rdos:*:*) | 1276 | i*86:rdos:*:*) |
243 | 1329 | echo ${UNAME_MACHINE}-pc-rdos | 1277 | echo ${UNAME_MACHINE}-pc-rdos |
244 | 1330 | exit ;; | 1278 | exit ;; |
245 | 1331 | i*86:AROS:*:*) | ||
246 | 1332 | echo ${UNAME_MACHINE}-pc-aros | ||
247 | 1333 | exit ;; | ||
248 | 1334 | esac | 1279 | esac |
249 | 1335 | 1280 | ||
250 | 1336 | #echo '(No uname command or uname output not recognized.)' 1>&2 | 1281 | #echo '(No uname command or uname output not recognized.)' 1>&2 |
251 | @@ -1491,9 +1436,9 @@ | |||
252 | 1491 | the operating system you are using. It is advised that you | 1436 | the operating system you are using. It is advised that you |
253 | 1492 | download the most up to date version of the config scripts from | 1437 | download the most up to date version of the config scripts from |
254 | 1493 | 1438 | ||
256 | 1494 | http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD | 1439 | http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess |
257 | 1495 | and | 1440 | and |
259 | 1496 | http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD | 1441 | http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub |
260 | 1497 | 1442 | ||
261 | 1498 | If the version you run ($0) is already up to date, please | 1443 | If the version you run ($0) is already up to date, please |
262 | 1499 | send the following data and any information you think might be | 1444 | send the following data and any information you think might be |
263 | 1500 | 1445 | ||
264 | === modified file 'config.sub' | |||
265 | --- config.sub 2010-04-16 11:31:32 +0000 | |||
266 | +++ config.sub 2010-07-28 08:11:20 +0000 | |||
267 | @@ -72,8 +72,8 @@ | |||
268 | 72 | version="\ | 72 | version="\ |
269 | 73 | GNU config.sub ($timestamp) | 73 | GNU config.sub ($timestamp) |
270 | 74 | 74 | ||
273 | 75 | Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, | 75 | Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 |
274 | 76 | 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. | 76 | Free Software Foundation, Inc. |
275 | 77 | 77 | ||
276 | 78 | This is free software; see the source for copying conditions. There is NO | 78 | This is free software; see the source for copying conditions. There is NO |
277 | 79 | warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." | 79 | warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." |
278 | @@ -122,7 +122,6 @@ | |||
279 | 122 | case $maybe_os in | 122 | case $maybe_os in |
280 | 123 | nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ | 123 | nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ |
281 | 124 | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ | 124 | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ |
282 | 125 | kopensolaris*-gnu* | \ | ||
283 | 126 | storm-chaos* | os2-emx* | rtmk-nova*) | 125 | storm-chaos* | os2-emx* | rtmk-nova*) |
284 | 127 | os=-$maybe_os | 126 | os=-$maybe_os |
285 | 128 | basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` | 127 | basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` |
286 | @@ -245,24 +244,20 @@ | |||
287 | 245 | | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | 244 | | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ |
288 | 246 | | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | 245 | | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ |
289 | 247 | | am33_2.0 \ | 246 | | am33_2.0 \ |
291 | 248 | | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ | 247 | | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ |
292 | 249 | | bfin \ | 248 | | bfin \ |
293 | 250 | | c4x | clipper \ | 249 | | c4x | clipper \ |
294 | 251 | | d10v | d30v | dlx | dsp16xx \ | 250 | | d10v | d30v | dlx | dsp16xx \ |
296 | 252 | | fido | fr30 | frv \ | 251 | | fr30 | frv \ |
297 | 253 | | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | 252 | | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ |
298 | 254 | | i370 | i860 | i960 | ia64 \ | 253 | | i370 | i860 | i960 | ia64 \ |
299 | 255 | | ip2k | iq2000 \ | 254 | | ip2k | iq2000 \ |
303 | 256 | | lm32 \ | 255 | | m32r | m32rle | m68000 | m68k | m88k | maxq | mb | microblaze | mcore \ |
301 | 257 | | m32c | m32r | m32rle | m68000 | m68k | m88k \ | ||
302 | 258 | | maxq | mb | microblaze | mcore | mep | metag \ | ||
304 | 259 | | mips | mipsbe | mipseb | mipsel | mipsle \ | 256 | | mips | mipsbe | mipseb | mipsel | mipsle \ |
305 | 260 | | mips16 \ | 257 | | mips16 \ |
306 | 261 | | mips64 | mips64el \ | 258 | | mips64 | mips64el \ |
308 | 262 | | mips64octeon | mips64octeonel \ | 259 | | mips64vr | mips64vrel \ |
309 | 263 | | mips64orion | mips64orionel \ | 260 | | mips64orion | mips64orionel \ |
310 | 264 | | mips64r5900 | mips64r5900el \ | ||
311 | 265 | | mips64vr | mips64vrel \ | ||
312 | 266 | | mips64vr4100 | mips64vr4100el \ | 261 | | mips64vr4100 | mips64vr4100el \ |
313 | 267 | | mips64vr4300 | mips64vr4300el \ | 262 | | mips64vr4300 | mips64vr4300el \ |
314 | 268 | | mips64vr5000 | mips64vr5000el \ | 263 | | mips64vr5000 | mips64vr5000el \ |
315 | @@ -275,7 +270,6 @@ | |||
316 | 275 | | mipsisa64sr71k | mipsisa64sr71kel \ | 270 | | mipsisa64sr71k | mipsisa64sr71kel \ |
317 | 276 | | mipstx39 | mipstx39el \ | 271 | | mipstx39 | mipstx39el \ |
318 | 277 | | mn10200 | mn10300 \ | 272 | | mn10200 | mn10300 \ |
319 | 278 | | moxie \ | ||
320 | 279 | | mt \ | 273 | | mt \ |
321 | 280 | | msp430 \ | 274 | | msp430 \ |
322 | 281 | | nios | nios2 \ | 275 | | nios | nios2 \ |
323 | @@ -284,17 +278,19 @@ | |||
324 | 284 | | pdp10 | pdp11 | pj | pjl \ | 278 | | pdp10 | pdp11 | pj | pjl \ |
325 | 285 | | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | 279 | | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ |
326 | 286 | | pyramid \ | 280 | | pyramid \ |
329 | 287 | | score \ | 281 | | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ |
328 | 288 | | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | ||
330 | 289 | | sh64 | sh64le \ | 282 | | sh64 | sh64le \ |
334 | 290 | | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ | 283 | | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \ |
335 | 291 | | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ | 284 | | sparcv8 | sparcv9 | sparcv9b \ |
336 | 292 | | spu | strongarm \ | 285 | | strongarm \ |
337 | 293 | | tahoe | thumb | tic4x | tic80 | tron \ | 286 | | tahoe | thumb | tic4x | tic80 | tron \ |
338 | 294 | | v850 | v850e \ | 287 | | v850 | v850e \ |
339 | 295 | | we32k \ | 288 | | we32k \ |
342 | 296 | | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ | 289 | | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \ |
343 | 297 | | z8k | z80) | 290 | | z8k) |
344 | 291 | basic_machine=$basic_machine-unknown | ||
345 | 292 | ;; | ||
346 | 293 | m32c) | ||
347 | 298 | basic_machine=$basic_machine-unknown | 294 | basic_machine=$basic_machine-unknown |
348 | 299 | ;; | 295 | ;; |
349 | 300 | m6811 | m68hc11 | m6812 | m68hc12) | 296 | m6811 | m68hc11 | m6812 | m68hc12) |
350 | @@ -326,28 +322,25 @@ | |||
351 | 326 | | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ | 322 | | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ |
352 | 327 | | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ | 323 | | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ |
353 | 328 | | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | 324 | | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ |
355 | 329 | | avr-* | avr32-* \ | 325 | | avr-* \ |
356 | 330 | | bfin-* | bs2000-* \ | 326 | | bfin-* | bs2000-* \ |
357 | 331 | | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ | 327 | | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ |
358 | 332 | | clipper-* | craynv-* | cydra-* \ | 328 | | clipper-* | craynv-* | cydra-* \ |
359 | 333 | | d10v-* | d30v-* | dlx-* \ | 329 | | d10v-* | d30v-* | dlx-* \ |
360 | 334 | | elxsi-* \ | 330 | | elxsi-* \ |
362 | 335 | | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ | 331 | | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ |
363 | 336 | | h8300-* | h8500-* \ | 332 | | h8300-* | h8500-* \ |
364 | 337 | | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | 333 | | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ |
365 | 338 | | i*86-* | i860-* | i960-* | ia64-* \ | 334 | | i*86-* | i860-* | i960-* | ia64-* \ |
366 | 339 | | ip2k-* | iq2000-* \ | 335 | | ip2k-* | iq2000-* \ |
369 | 340 | | lm32-* \ | 336 | | m32r-* | m32rle-* \ |
368 | 341 | | m32c-* | m32r-* | m32rle-* \ | ||
370 | 342 | | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ | 337 | | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ |
372 | 343 | | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ | 338 | | m88110-* | m88k-* | maxq-* | mcore-* \ |
373 | 344 | | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | 339 | | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ |
374 | 345 | | mips16-* \ | 340 | | mips16-* \ |
375 | 346 | | mips64-* | mips64el-* \ | 341 | | mips64-* | mips64el-* \ |
377 | 347 | | mips64octeon-* | mips64octeonel-* \ | 342 | | mips64vr-* | mips64vrel-* \ |
378 | 348 | | mips64orion-* | mips64orionel-* \ | 343 | | mips64orion-* | mips64orionel-* \ |
379 | 349 | | mips64r5900-* | mips64r5900el-* \ | ||
380 | 350 | | mips64vr-* | mips64vrel-* \ | ||
381 | 351 | | mips64vr4100-* | mips64vr4100el-* \ | 344 | | mips64vr4100-* | mips64vr4100el-* \ |
382 | 352 | | mips64vr4300-* | mips64vr4300el-* \ | 345 | | mips64vr4300-* | mips64vr4300el-* \ |
383 | 353 | | mips64vr5000-* | mips64vr5000el-* \ | 346 | | mips64vr5000-* | mips64vr5000el-* \ |
384 | @@ -369,24 +362,22 @@ | |||
385 | 369 | | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ | 362 | | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ |
386 | 370 | | pyramid-* \ | 363 | | pyramid-* \ |
387 | 371 | | romp-* | rs6000-* \ | 364 | | romp-* | rs6000-* \ |
389 | 372 | | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | 365 | | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \ |
390 | 373 | | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | 366 | | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ |
392 | 374 | | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ | 367 | | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \ |
393 | 375 | | sparclite-* \ | 368 | | sparclite-* \ |
395 | 376 | | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ | 369 | | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ |
396 | 377 | | tahoe-* | thumb-* \ | 370 | | tahoe-* | thumb-* \ |
398 | 378 | | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \ | 371 | | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ |
399 | 379 | | tron-* \ | 372 | | tron-* \ |
400 | 380 | | v850-* | v850e-* | vax-* \ | 373 | | v850-* | v850e-* | vax-* \ |
401 | 381 | | we32k-* \ | 374 | | we32k-* \ |
404 | 382 | | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ | 375 | | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \ |
405 | 383 | | xstormy16-* | xtensa*-* \ | 376 | | xstormy16-* | xtensa-* \ |
406 | 384 | | ymp-* \ | 377 | | ymp-* \ |
408 | 385 | | z8k-* | z80-*) | 378 | | z8k-*) |
409 | 386 | ;; | 379 | ;; |
413 | 387 | # Recognize the basic CPU types without company name, with glob match. | 380 | m32c-*) |
411 | 388 | xtensa*) | ||
412 | 389 | basic_machine=$basic_machine-unknown | ||
414 | 390 | ;; | 381 | ;; |
415 | 391 | # Recognize the various machine names and aliases which stand | 382 | # Recognize the various machine names and aliases which stand |
416 | 392 | # for a CPU type and a company and sometimes even an OS. | 383 | # for a CPU type and a company and sometimes even an OS. |
417 | @@ -450,10 +441,6 @@ | |||
418 | 450 | basic_machine=m68k-apollo | 441 | basic_machine=m68k-apollo |
419 | 451 | os=-bsd | 442 | os=-bsd |
420 | 452 | ;; | 443 | ;; |
421 | 453 | aros) | ||
422 | 454 | basic_machine=i386-pc | ||
423 | 455 | os=-aros | ||
424 | 456 | ;; | ||
425 | 457 | aux) | 444 | aux) |
426 | 458 | basic_machine=m68k-apple | 445 | basic_machine=m68k-apple |
427 | 459 | os=-aux | 446 | os=-aux |
428 | @@ -478,10 +465,6 @@ | |||
429 | 478 | basic_machine=c90-cray | 465 | basic_machine=c90-cray |
430 | 479 | os=-unicos | 466 | os=-unicos |
431 | 480 | ;; | 467 | ;; |
432 | 481 | cegcc) | ||
433 | 482 | basic_machine=arm-unknown | ||
434 | 483 | os=-cegcc | ||
435 | 484 | ;; | ||
436 | 485 | convex-c1) | 468 | convex-c1) |
437 | 486 | basic_machine=c1-convex | 469 | basic_machine=c1-convex |
438 | 487 | os=-bsd | 470 | os=-bsd |
439 | @@ -510,8 +493,8 @@ | |||
440 | 510 | basic_machine=craynv-cray | 493 | basic_machine=craynv-cray |
441 | 511 | os=-unicosmp | 494 | os=-unicosmp |
442 | 512 | ;; | 495 | ;; |
445 | 513 | cr16) | 496 | cr16c) |
446 | 514 | basic_machine=cr16-unknown | 497 | basic_machine=cr16c-unknown |
447 | 515 | os=-elf | 498 | os=-elf |
448 | 516 | ;; | 499 | ;; |
449 | 517 | crds | unos) | 500 | crds | unos) |
450 | @@ -549,10 +532,6 @@ | |||
451 | 549 | basic_machine=m88k-motorola | 532 | basic_machine=m88k-motorola |
452 | 550 | os=-sysv3 | 533 | os=-sysv3 |
453 | 551 | ;; | 534 | ;; |
454 | 552 | dicos) | ||
455 | 553 | basic_machine=i686-pc | ||
456 | 554 | os=-dicos | ||
457 | 555 | ;; | ||
458 | 556 | djgpp) | 535 | djgpp) |
459 | 557 | basic_machine=i586-pc | 536 | basic_machine=i586-pc |
460 | 558 | os=-msdosdjgpp | 537 | os=-msdosdjgpp |
461 | @@ -707,14 +686,6 @@ | |||
462 | 707 | basic_machine=m68k-isi | 686 | basic_machine=m68k-isi |
463 | 708 | os=-sysv | 687 | os=-sysv |
464 | 709 | ;; | 688 | ;; |
465 | 710 | m68knommu) | ||
466 | 711 | basic_machine=m68k-unknown | ||
467 | 712 | os=-linux | ||
468 | 713 | ;; | ||
469 | 714 | m68knommu-*) | ||
470 | 715 | basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` | ||
471 | 716 | os=-linux | ||
472 | 717 | ;; | ||
473 | 718 | m88k-omron*) | 689 | m88k-omron*) |
474 | 719 | basic_machine=m88k-omron | 690 | basic_machine=m88k-omron |
475 | 720 | ;; | 691 | ;; |
476 | @@ -730,10 +701,6 @@ | |||
477 | 730 | basic_machine=i386-pc | 701 | basic_machine=i386-pc |
478 | 731 | os=-mingw32 | 702 | os=-mingw32 |
479 | 732 | ;; | 703 | ;; |
480 | 733 | mingw32ce) | ||
481 | 734 | basic_machine=arm-unknown | ||
482 | 735 | os=-mingw32ce | ||
483 | 736 | ;; | ||
484 | 737 | miniframe) | 704 | miniframe) |
485 | 738 | basic_machine=m68000-convergent | 705 | basic_machine=m68000-convergent |
486 | 739 | ;; | 706 | ;; |
487 | @@ -860,14 +827,6 @@ | |||
488 | 860 | basic_machine=i860-intel | 827 | basic_machine=i860-intel |
489 | 861 | os=-osf | 828 | os=-osf |
490 | 862 | ;; | 829 | ;; |
491 | 863 | parisc) | ||
492 | 864 | basic_machine=hppa-unknown | ||
493 | 865 | os=-linux | ||
494 | 866 | ;; | ||
495 | 867 | parisc-*) | ||
496 | 868 | basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` | ||
497 | 869 | os=-linux | ||
498 | 870 | ;; | ||
499 | 871 | pbd) | 830 | pbd) |
500 | 872 | basic_machine=sparc-tti | 831 | basic_machine=sparc-tti |
501 | 873 | ;; | 832 | ;; |
502 | @@ -969,10 +928,6 @@ | |||
503 | 969 | sb1el) | 928 | sb1el) |
504 | 970 | basic_machine=mipsisa64sb1el-unknown | 929 | basic_machine=mipsisa64sb1el-unknown |
505 | 971 | ;; | 930 | ;; |
506 | 972 | sde) | ||
507 | 973 | basic_machine=mipsisa32-sde | ||
508 | 974 | os=-elf | ||
509 | 975 | ;; | ||
510 | 976 | sei) | 931 | sei) |
511 | 977 | basic_machine=mips-sei | 932 | basic_machine=mips-sei |
512 | 978 | os=-seiux | 933 | os=-seiux |
513 | @@ -984,9 +939,6 @@ | |||
514 | 984 | basic_machine=sh-hitachi | 939 | basic_machine=sh-hitachi |
515 | 985 | os=-hms | 940 | os=-hms |
516 | 986 | ;; | 941 | ;; |
517 | 987 | sh5el) | ||
518 | 988 | basic_machine=sh5le-unknown | ||
519 | 989 | ;; | ||
520 | 990 | sh64) | 942 | sh64) |
521 | 991 | basic_machine=sh64-unknown | 943 | basic_machine=sh64-unknown |
522 | 992 | ;; | 944 | ;; |
523 | @@ -1076,10 +1028,6 @@ | |||
524 | 1076 | basic_machine=tic6x-unknown | 1028 | basic_machine=tic6x-unknown |
525 | 1077 | os=-coff | 1029 | os=-coff |
526 | 1078 | ;; | 1030 | ;; |
527 | 1079 | tile*) | ||
528 | 1080 | basic_machine=tile-unknown | ||
529 | 1081 | os=-linux-gnu | ||
530 | 1082 | ;; | ||
531 | 1083 | tx39) | 1031 | tx39) |
532 | 1084 | basic_machine=mipstx39-unknown | 1032 | basic_machine=mipstx39-unknown |
533 | 1085 | ;; | 1033 | ;; |
534 | @@ -1155,10 +1103,6 @@ | |||
535 | 1155 | basic_machine=z8k-unknown | 1103 | basic_machine=z8k-unknown |
536 | 1156 | os=-sim | 1104 | os=-sim |
537 | 1157 | ;; | 1105 | ;; |
538 | 1158 | z80-*-coff) | ||
539 | 1159 | basic_machine=z80-unknown | ||
540 | 1160 | os=-sim | ||
541 | 1161 | ;; | ||
542 | 1162 | none) | 1106 | none) |
543 | 1163 | basic_machine=none-none | 1107 | basic_machine=none-none |
544 | 1164 | os=-none | 1108 | os=-none |
545 | @@ -1197,10 +1141,10 @@ | |||
546 | 1197 | we32k) | 1141 | we32k) |
547 | 1198 | basic_machine=we32k-att | 1142 | basic_machine=we32k-att |
548 | 1199 | ;; | 1143 | ;; |
550 | 1200 | sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) | 1144 | sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele) |
551 | 1201 | basic_machine=sh-unknown | 1145 | basic_machine=sh-unknown |
552 | 1202 | ;; | 1146 | ;; |
554 | 1203 | sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) | 1147 | sparc | sparcv8 | sparcv9 | sparcv9b) |
555 | 1204 | basic_machine=sparc-sun | 1148 | basic_machine=sparc-sun |
556 | 1205 | ;; | 1149 | ;; |
557 | 1206 | cydra) | 1150 | cydra) |
558 | @@ -1269,9 +1213,8 @@ | |||
559 | 1269 | -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ | 1213 | -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ |
560 | 1270 | | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ | 1214 | | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ |
561 | 1271 | | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ | 1215 | | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ |
562 | 1272 | | -kopensolaris* \ | ||
563 | 1273 | | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ | 1216 | | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ |
565 | 1274 | | -aos* | -aros* \ | 1217 | | -aos* \ |
566 | 1275 | | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | 1218 | | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ |
567 | 1276 | | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ | 1219 | | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ |
568 | 1277 | | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ | 1220 | | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ |
569 | @@ -1280,7 +1223,7 @@ | |||
570 | 1280 | | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | 1223 | | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ |
571 | 1281 | | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | 1224 | | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ |
572 | 1282 | | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | 1225 | | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ |
574 | 1283 | | -chorusos* | -chorusrdb* | -cegcc* \ | 1226 | | -chorusos* | -chorusrdb* \ |
575 | 1284 | | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | 1227 | | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ |
576 | 1285 | | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ | 1228 | | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ |
577 | 1286 | | -uxpv* | -beos* | -mpeix* | -udk* \ | 1229 | | -uxpv* | -beos* | -mpeix* | -udk* \ |
578 | @@ -1290,7 +1233,7 @@ | |||
579 | 1290 | | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | 1233 | | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ |
580 | 1291 | | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | 1234 | | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ |
581 | 1292 | | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ | 1235 | | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ |
583 | 1293 | | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) | 1236 | | -skyos* | -haiku* | -rdos*) |
584 | 1294 | # Remember, each alternative MUST END IN *, to match a version number. | 1237 | # Remember, each alternative MUST END IN *, to match a version number. |
585 | 1295 | ;; | 1238 | ;; |
586 | 1296 | -qnx*) | 1239 | -qnx*) |
587 | @@ -1420,9 +1363,6 @@ | |||
588 | 1420 | -zvmoe) | 1363 | -zvmoe) |
589 | 1421 | os=-zvmoe | 1364 | os=-zvmoe |
590 | 1422 | ;; | 1365 | ;; |
591 | 1423 | -dicos*) | ||
592 | 1424 | os=-dicos | ||
593 | 1425 | ;; | ||
594 | 1426 | -none) | 1366 | -none) |
595 | 1427 | ;; | 1367 | ;; |
596 | 1428 | *) | 1368 | *) |
597 | @@ -1445,12 +1385,6 @@ | |||
598 | 1445 | # system, and we'll never get to this point. | 1385 | # system, and we'll never get to this point. |
599 | 1446 | 1386 | ||
600 | 1447 | case $basic_machine in | 1387 | case $basic_machine in |
601 | 1448 | score-*) | ||
602 | 1449 | os=-elf | ||
603 | 1450 | ;; | ||
604 | 1451 | spu-*) | ||
605 | 1452 | os=-elf | ||
606 | 1453 | ;; | ||
607 | 1454 | *-acorn) | 1388 | *-acorn) |
608 | 1455 | os=-riscix1.2 | 1389 | os=-riscix1.2 |
609 | 1456 | ;; | 1390 | ;; |
610 | @@ -1460,9 +1394,9 @@ | |||
611 | 1460 | arm*-semi) | 1394 | arm*-semi) |
612 | 1461 | os=-aout | 1395 | os=-aout |
613 | 1462 | ;; | 1396 | ;; |
617 | 1463 | c4x-* | tic4x-*) | 1397 | c4x-* | tic4x-*) |
618 | 1464 | os=-coff | 1398 | os=-coff |
619 | 1465 | ;; | 1399 | ;; |
620 | 1466 | # This must come before the *-dec entry. | 1400 | # This must come before the *-dec entry. |
621 | 1467 | pdp10-*) | 1401 | pdp10-*) |
622 | 1468 | os=-tops20 | 1402 | os=-tops20 |
623 | @@ -1488,9 +1422,6 @@ | |||
624 | 1488 | m68*-cisco) | 1422 | m68*-cisco) |
625 | 1489 | os=-aout | 1423 | os=-aout |
626 | 1490 | ;; | 1424 | ;; |
627 | 1491 | mep-*) | ||
628 | 1492 | os=-elf | ||
629 | 1493 | ;; | ||
630 | 1494 | mips*-cisco) | 1425 | mips*-cisco) |
631 | 1495 | os=-elf | 1426 | os=-elf |
632 | 1496 | ;; | 1427 | ;; |
633 | 1497 | 1428 | ||
634 | === modified file 'debian/changelog' | |||
635 | --- debian/changelog 2010-07-11 20:22:33 +0000 | |||
636 | +++ debian/changelog 2010-07-28 08:11:20 +0000 | |||
637 | @@ -1,3 +1,35 @@ | |||
638 | 1 | gpsdrive (2.10~pre4-6.dfsg-5ubuntu1) maverick; urgency=low | ||
639 | 2 | |||
640 | 3 | * Merge from Debian unstable (LP: #605350), remaining changes: | ||
641 | 4 | - scripts/geo-code: Changed executing environment from /bin/sh | ||
642 | 5 | to /bin/bash. | ||
643 | 6 | - Dropped changes: | ||
644 | 7 | + Build with libmysqlclient16-dev. | ||
645 | 8 | |||
646 | 9 | -- Bilal Akhtar <bilalakhtar96@yahoo.com> Mon, 26 Jul 2010 12:03:38 +0530 | ||
647 | 10 | |||
648 | 11 | gpsdrive (2.10~pre4-6.dfsg-5) unstable; urgency=low | ||
649 | 12 | |||
650 | 13 | * Added 103-no-textquery patch to remove Text::Query use. Removed | ||
651 | 14 | dependency on the libtext-query-perl package. | ||
652 | 15 | Thanks Jonathan Yu. | ||
653 | 16 | * Revised debian/control for a better layout. | ||
654 | 17 | * Vcs-* fields now point the trunk branch. | ||
655 | 18 | |||
656 | 19 | -- Francesco Paolo Lovergine <frankie@debian.org> Mon, 08 Mar 2010 11:23:39 +0100 | ||
657 | 20 | |||
658 | 21 | gpsdrive (2.10~pre4-6.dfsg-4) unstable; urgency=low | ||
659 | 22 | |||
660 | 23 | * Do not depend on versioned python. | ||
661 | 24 | * Policy bumped to 3.8.4. | ||
662 | 25 | * Moved to libmysqlclient-dev build-dep. | ||
663 | 26 | * Now suggests postgresql-8.4-postgis. | ||
664 | 27 | * Debhelper level moved to 7. | ||
665 | 28 | * Removed superfluous config.{guess,sub} override. | ||
666 | 29 | * Added me as an uploader. | ||
667 | 30 | |||
668 | 31 | -- Francesco Paolo Lovergine <frankie@debian.org> Thu, 04 Feb 2010 16:53:01 +0100 | ||
669 | 32 | |||
670 | 1 | gpsdrive (2.10~pre4-6.dfsg-3ubuntu5) maverick; urgency=low | 33 | gpsdrive (2.10~pre4-6.dfsg-3ubuntu5) maverick; urgency=low |
671 | 2 | 34 | ||
672 | 3 | * scripts/geo-code: Changed executing environment from /bin/sh | 35 | * scripts/geo-code: Changed executing environment from /bin/sh |
673 | @@ -113,6 +145,7 @@ | |||
674 | 113 | 145 | ||
675 | 114 | -- Andreas Putzo <andreas@putzo.net> Sat, 19 Jul 2008 20:01:39 +0000 | 146 | -- Andreas Putzo <andreas@putzo.net> Sat, 19 Jul 2008 20:01:39 +0000 |
676 | 115 | 147 | ||
677 | 148 | >>>>>>> .r2096 | ||
678 | 116 | gpsdrive (2.10~pre4-3) unstable; urgency=low | 149 | gpsdrive (2.10~pre4-3) unstable; urgency=low |
679 | 117 | 150 | ||
680 | 118 | * Fix regression of last upload in the mapnik handling. | 151 | * Fix regression of last upload in the mapnik handling. |
681 | 119 | 152 | ||
682 | === modified file 'debian/compat' | |||
683 | --- debian/compat 2007-10-16 20:00:05 +0000 | |||
684 | +++ debian/compat 2010-07-28 08:11:20 +0000 | |||
685 | @@ -1,1 +1,1 @@ | |||
687 | 1 | 5 | 1 | 7 |
688 | 2 | 2 | ||
689 | === modified file 'debian/control' | |||
690 | --- debian/control 2010-04-16 11:31:32 +0000 | |||
691 | +++ debian/control 2010-07-28 08:11:20 +0000 | |||
692 | @@ -3,19 +3,20 @@ | |||
693 | 3 | Priority: optional | 3 | Priority: optional |
694 | 4 | Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> | 4 | Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> |
695 | 5 | XSBC-Original-Maintainer: Debian GIS Project <pkg-grass-devel@lists.alioth.debian.org> | 5 | XSBC-Original-Maintainer: Debian GIS Project <pkg-grass-devel@lists.alioth.debian.org> |
697 | 6 | Uploaders: Andreas Putzo <andreas@putzo.net> | 6 | Uploaders: Andreas Putzo <andreas@putzo.net>, Francesco Paolo Lovergine <frankie@debian.org> |
698 | 7 | DM-Upload-Allowed: yes | 7 | DM-Upload-Allowed: yes |
701 | 8 | 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 | 8 | Build-Depends: debhelper (>= 7), automake1.9, libtool, pkg-config, libpcre3-dev, libgtk2.0-dev,libart-2.0-dev, libxml2-dev, libmysqlclient-dev, |
702 | 9 | Standards-Version: 3.8.0 | 9 | autotools-dev, dpatch, libmapnik-dev (>= 0.6), libboost-dev, libboost-filesystem-dev, libboost-serialization-dev, libdbus-glib-1-dev |
703 | 10 | Standards-Version: 3.8.4 | ||
704 | 10 | Homepage: http://gpsdrive.de | 11 | Homepage: http://gpsdrive.de |
707 | 11 | Vcs-Svn: svn://svn.debian.org/svn/pkg-grass/packages/gpsdrive/ | 12 | Vcs-Svn: svn://svn.debian.org/svn/pkg-grass/packages/gpsdrive/trunk |
708 | 12 | Vcs-Browser: http://svn.debian.org/viewsvn/pkg-grass/packages/gpsdrive/ | 13 | Vcs-Browser: http://svn.debian.org/viewsvn/pkg-grass/packages/gpsdrive/trunk |
709 | 13 | 14 | ||
710 | 14 | Package: gpsdrive | 15 | Package: gpsdrive |
711 | 15 | Architecture: any | 16 | Architecture: any |
712 | 16 | Depends: ${shlibs:Depends}, ${misc:Depends}, gpsdrive-data, openstreetmap-map-icons-square, openstreetmap-map-icons-classic | 17 | Depends: ${shlibs:Depends}, ${misc:Depends}, gpsdrive-data, openstreetmap-map-icons-square, openstreetmap-map-icons-classic |
713 | 17 | Recommends: gpsd, gpsdrive-scripts | 18 | Recommends: gpsd, gpsdrive-scripts |
715 | 18 | Suggests: flite | festival, osm2pgsql, mysql-server, postgresql-8.3-postgis | 19 | Suggests: flite | festival, osm2pgsql, mysql-server, postgresql-8.4-postgis |
716 | 19 | Description: Car navigation system | 20 | Description: Car navigation system |
717 | 20 | Map-based navigation system that displays the current | 21 | Map-based navigation system that displays the current |
718 | 21 | position provided by a GPS receiver on a zoomable map. | 22 | position provided by a GPS receiver on a zoomable map. |
719 | @@ -39,7 +40,9 @@ | |||
720 | 39 | 40 | ||
721 | 40 | Package: gpsdrive-scripts | 41 | Package: gpsdrive-scripts |
722 | 41 | Architecture: all | 42 | Architecture: all |
724 | 42 | 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 | 43 | Depends: gpsdrive, ${perl:Depends}, python, python-imaging, python-mapnik, libdbi-perl, libdbd-mysql-perl, libdate-manip-perl, libfile-slurp-perl, |
725 | 44 | libmime-base64-perl, libtime-local-perl, libwww-curl-perl, libwww-mechanize-perl, libxml-parser-perl, libxml-simple-perl, libxml-twig-perl, | ||
726 | 45 | libxml-writer-perl, perlmagick, perl-tk | ||
727 | 43 | Description: Various scripts for gpsdrive | 46 | Description: Various scripts for gpsdrive |
728 | 44 | Gpsdrive is a car (bike, ship, plane) navigation system. | 47 | Gpsdrive is a car (bike, ship, plane) navigation system. |
729 | 45 | . | 48 | . |
730 | 46 | 49 | ||
731 | === modified file 'debian/patches/00list' | |||
732 | --- debian/patches/00list 2010-07-05 10:54:00 +0000 | |||
733 | +++ debian/patches/00list 2010-07-28 08:11:20 +0000 | |||
734 | @@ -18,4 +18,5 @@ | |||
735 | 18 | 100-fix-insecure-tempfiles | 18 | 100-fix-insecure-tempfiles |
736 | 19 | 101-signalposreq | 19 | 101-signalposreq |
737 | 20 | 102-unittest | 20 | 102-unittest |
739 | 21 | 103-lp-325288 | 21 | 103-no-textquery |
740 | 22 | 104-lp-325288 | ||
741 | 22 | 23 | ||
742 | === removed file 'debian/patches/103-lp-325288.dpatch' | |||
743 | --- debian/patches/103-lp-325288.dpatch 2010-07-05 15:42:31 +0000 | |||
744 | +++ debian/patches/103-lp-325288.dpatch 1970-01-01 00:00:00 +0000 | |||
745 | @@ -1,17 +0,0 @@ | |||
746 | 1 | #! /bin/sh /usr/share/dpatch/dpatch-run | ||
747 | 2 | ## 103-lp-325288.dpatch by Bilal Akhtar <bilalakhtar96@yahoo.com> | ||
748 | 3 | ## | ||
749 | 4 | ## All lines beginning with `## DP:' are a description of the patch. | ||
750 | 5 | ## DP: This patch fixes launchpad bug 325288 by changing the runtime | ||
751 | 6 | ## DP: environment of file scripts/geo-code from /bin/sh to /bin/bash. | ||
752 | 7 | |||
753 | 8 | @DPATCH@ | ||
754 | 9 | diff -urNad gpsdrive~/scripts/geo-code gpsdrive/scripts/geo-code | ||
755 | 10 | --- gpsdrive~/scripts/geo-code 2010-07-05 13:13:11.334553356 +0300 | ||
756 | 11 | +++ gpsdrive/scripts/geo-code 2010-07-05 13:13:19.202560140 +0300 | ||
757 | 12 | @@ -1,4 +1,4 @@ | ||
758 | 13 | -#!/bin/sh | ||
759 | 14 | +#!/bin/bash | ||
760 | 15 | |||
761 | 16 | # | ||
762 | 17 | # geo-code: Convert a street address into a latitude/longitude | ||
763 | 18 | 0 | ||
764 | === added file 'debian/patches/103-no-textquery.dpatch' | |||
765 | --- debian/patches/103-no-textquery.dpatch 1970-01-01 00:00:00 +0000 | |||
766 | +++ debian/patches/103-no-textquery.dpatch 2010-07-28 08:11:20 +0000 | |||
767 | @@ -0,0 +1,18 @@ | |||
768 | 1 | #! /bin/sh /usr/share/dpatch/dpatch-run | ||
769 | 2 | ## 103-no-textquery.dpatch by Francesco Paolo Lovergine <frankie@debian.org> | ||
770 | 3 | ## | ||
771 | 4 | ## All lines beginning with `## DP:' are a description of the patch. | ||
772 | 5 | ## DP: No description. | ||
773 | 6 | |||
774 | 7 | @DPATCH@ | ||
775 | 8 | 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 | ||
776 | 9 | --- gpsdrive-2.10pre7~/scripts/osm/perl_lib/Geo/Gpsdrive/getstreet.pm 2009-06-14 15:57:25.000000000 +0200 | ||
777 | 10 | +++ gpsdrive-2.10pre7/scripts/osm/perl_lib/Geo/Gpsdrive/getstreet.pm 2010-03-08 10:47:16.000000000 +0100 | ||
778 | 11 | @@ -2,7 +2,6 @@ | ||
779 | 12 | #noch nicht alle variablen angepasst | ||
780 | 13 | use LWP::UserAgent; | ||
781 | 14 | use WWW::Mechanize; | ||
782 | 15 | -use Text::Query; | ||
783 | 16 | use Getopt::Long; #maybe not needed any more | ||
784 | 17 | use Pod::Usage; | ||
785 | 18 | use DBI; | ||
786 | 0 | 19 | ||
787 | === added file 'debian/patches/104-lp-325288.dpatch' | |||
788 | --- debian/patches/104-lp-325288.dpatch 1970-01-01 00:00:00 +0000 | |||
789 | +++ debian/patches/104-lp-325288.dpatch 2010-07-28 08:11:20 +0000 | |||
790 | @@ -0,0 +1,17 @@ | |||
791 | 1 | #! /bin/sh /usr/share/dpatch/dpatch-run | ||
792 | 2 | ## 104-lp-325288.dpatch by Bilal Akhtar <bilalakhtar96@yahoo.com> | ||
793 | 3 | ## | ||
794 | 4 | ## All lines beginning with `## DP:' are a description of the patch. | ||
795 | 5 | ## DP: This patch fixes launchpad bug 325288 by changing the runtime | ||
796 | 6 | ## DP: environment of file scripts/geo-code from /bin/sh to /bin/bash. | ||
797 | 7 | |||
798 | 8 | @DPATCH@ | ||
799 | 9 | diff -urNad gpsdrive~/scripts/geo-code gpsdrive/scripts/geo-code | ||
800 | 10 | --- gpsdrive~/scripts/geo-code 2010-07-05 13:13:11.334553356 +0300 | ||
801 | 11 | +++ gpsdrive/scripts/geo-code 2010-07-05 13:13:19.202560140 +0300 | ||
802 | 12 | @@ -1,4 +1,4 @@ | ||
803 | 13 | -#!/bin/sh | ||
804 | 14 | +#!/bin/bash | ||
805 | 15 | |||
806 | 16 | # | ||
807 | 17 | # geo-code: Convert a street address into a latitude/longitude | ||
808 | 0 | 18 | ||
809 | === added file 'debian/patches/gpsdrive2.10pre7_osm_proj.patch' | |||
810 | --- debian/patches/gpsdrive2.10pre7_osm_proj.patch 1970-01-01 00:00:00 +0000 | |||
811 | +++ debian/patches/gpsdrive2.10pre7_osm_proj.patch 2010-07-28 08:11:20 +0000 | |||
812 | @@ -0,0 +1,572 @@ | |||
813 | 1 | #! /bin/sh /usr/share/dpatch/dpatch-run | ||
814 | 2 | ## gpsdrive2.10pre7_osm_proj.patch by H. Bowman <hamish_b yahoo com> | ||
815 | 3 | ## | ||
816 | 4 | ## DP: Fix OpenStreetMap projection handling (backport from upstream) | ||
817 | 5 | |||
818 | 6 | @DPATCH@ | ||
819 | 7 | Index: src/map_download.c | ||
820 | 8 | =================================================================== | ||
821 | 9 | --- src/map_download.c (revision 2476) | ||
822 | 10 | +++ src/map_download.c (revision 2477) | ||
823 | 11 | @@ -61,8 +61,8 @@ | ||
824 | 12 | # endif | ||
825 | 13 | |||
826 | 14 | |||
827 | 15 | -#include <gpsdrive.h> | ||
828 | 16 | -#include <map_handler.h> | ||
829 | 17 | +#include "gpsdrive.h" | ||
830 | 18 | +#include "map_handler.h" | ||
831 | 19 | #include "gpsdrive_config.h" | ||
832 | 20 | #include "gui.h" | ||
833 | 21 | #include "map_download.h" | ||
834 | 22 | @@ -133,24 +133,20 @@ | ||
835 | 23 | MAPSOURCE_LANDSAT, "1 : 50 million", 0, 50000000, | ||
836 | 24 | |||
837 | 25 | MAPSOURCE_OSM_TAH, "OpenStreetMap Tiles@Home", -1, -1, | ||
838 | 26 | - MAPSOURCE_OSM_TAH, "1 : 147 456 000", 1, 256*576000, | ||
839 | 27 | - MAPSOURCE_OSM_TAH, "1 : 73 728 000", 2, 128*576000, | ||
840 | 28 | - MAPSOURCE_OSM_TAH, "1 : 36 864 000", 3, 64*576000, | ||
841 | 29 | - MAPSOURCE_OSM_TAH, "1 : 18 432 000", 4, 32*576000, | ||
842 | 30 | - MAPSOURCE_OSM_TAH, "1 : 9 216 000", 5, 16*576000, | ||
843 | 31 | - MAPSOURCE_OSM_TAH, "1 : 4 608 000", 6, 8*576000, | ||
844 | 32 | - MAPSOURCE_OSM_TAH, "1 : 2 304 000", 7, 4*576000, | ||
845 | 33 | - MAPSOURCE_OSM_TAH, "1 : 1 152 000", 8, 2*576000, | ||
846 | 34 | - | ||
847 | 35 | - MAPSOURCE_OSM_TAH, "1 : 576 000", 9, 576000, | ||
848 | 36 | - MAPSOURCE_OSM_TAH, "1 : 288 000", 10, 288000, | ||
849 | 37 | - MAPSOURCE_OSM_TAH, "1 : 144 000", 11, 144000, | ||
850 | 38 | - MAPSOURCE_OSM_TAH, "1 : 72 000", 12, 72000, | ||
851 | 39 | - MAPSOURCE_OSM_TAH, "1 : 36 000", 13, 36000, | ||
852 | 40 | - MAPSOURCE_OSM_TAH, "1 : 18 000", 14, 18000, | ||
853 | 41 | - MAPSOURCE_OSM_TAH, "1 : 9 000", 15, 9000, | ||
854 | 42 | - MAPSOURCE_OSM_TAH, "1 : 4 500", 16, 4500, | ||
855 | 43 | - MAPSOURCE_OSM_TAH, "1 : 2 250", 17, 2250, | ||
856 | 44 | + /* scale varies with latitude, so this is just a rough guide | ||
857 | 45 | + which will only be valid for mid-lats */ | ||
858 | 46 | + /* Octave code: for lat=0:5:75; disp( [lat (a * 2*pi *pixelfact * cos(lat * pi/180)) / (256*2^9)]); end */ | ||
859 | 47 | + MAPSOURCE_OSM_TAH, "1 : 2 500", 17, 2250, | ||
860 | 48 | + MAPSOURCE_OSM_TAH, "1 : 5 000", 16, 4500, | ||
861 | 49 | + MAPSOURCE_OSM_TAH, "1 : 10 000", 15, 9000, | ||
862 | 50 | + MAPSOURCE_OSM_TAH, "1 : 20 000", 14, 18000, | ||
863 | 51 | + MAPSOURCE_OSM_TAH, "1 : 40 000", 13, 36000, | ||
864 | 52 | + MAPSOURCE_OSM_TAH, "1 : 75 000", 12, 72000, | ||
865 | 53 | + MAPSOURCE_OSM_TAH, "1 : 150 000", 11, 144000, | ||
866 | 54 | + MAPSOURCE_OSM_TAH, "1 : 300 000", 10, 288000, | ||
867 | 55 | + MAPSOURCE_OSM_TAH, "1 : 600 000", 9, 576000, | ||
868 | 56 | + /* the distortion gets too bad at scales wider than 1:500k | ||
869 | 57 | + It would be more accurate to stop earlier, but we compromise */ | ||
870 | 58 | MAPSOURCE_N_ITEMS, "", 0, 0 | ||
871 | 59 | }; | ||
872 | 60 | |||
873 | 61 | @@ -165,7 +161,23 @@ | ||
874 | 62 | gtk_entry_set_text (GTK_ENTRY (lon_entry), lon); | ||
875 | 63 | } | ||
876 | 64 | |||
877 | 65 | +/* ***************************************************************************** | ||
878 | 66 | + * calculate the local map scale based on Web Tile zoom level and latitude | ||
879 | 67 | + */ | ||
880 | 68 | +double | ||
881 | 69 | +calc_webtile_scale (double lat, int zoom) | ||
882 | 70 | +{ | ||
883 | 71 | + double scale; | ||
884 | 72 | + double a = 6378137.0; /* major radius of WGS84 ellipsoid (meters) */ | ||
885 | 73 | |||
886 | 74 | + scale = (a * 2*M_PI * cos(DEG2RAD(lat)) * PIXELFACT) / (256 * pow(2,zoom)); | ||
887 | 75 | + | ||
888 | 76 | + if (mydebug > 3) | ||
889 | 77 | + g_print ("Tile scale: %.2f\n", scale); | ||
890 | 78 | + | ||
891 | 79 | + return scale; | ||
892 | 80 | +} | ||
893 | 81 | + | ||
894 | 82 | /* ***************************************************************************** | ||
895 | 83 | * callback to set paramaters for map to download | ||
896 | 84 | */ | ||
897 | 85 | @@ -195,9 +207,13 @@ | ||
898 | 86 | 3, &mapdl_scale, -1); | ||
899 | 87 | /* TODO: determine map_ or top_ proj at this point so drawdownloadrectangle() | ||
900 | 88 | * knows how big to draw the green preview box */ | ||
901 | 89 | + if (local_config.mapsource_type == MAPSOURCE_OSM_TAH) | ||
902 | 90 | + mapdl_scale = (int)calc_webtile_scale(mapdl_lat, mapdl_zoom); | ||
903 | 91 | + | ||
904 | 92 | if (mydebug > 3) | ||
905 | 93 | g_print ("new map scale/zoom level: %d / %d\n", | ||
906 | 94 | mapdl_scale, mapdl_zoom); | ||
907 | 95 | + | ||
908 | 96 | local_config.mapsource_scale = gtk_combo_box_get_active (GTK_COMBO_BOX (scale_combobox)); | ||
909 | 97 | current.needtosave = TRUE; | ||
910 | 98 | } | ||
911 | 99 | @@ -439,6 +455,7 @@ | ||
912 | 100 | gchar file_path[512]; | ||
913 | 101 | gchar path[40]; | ||
914 | 102 | gchar img_fmt[4]; | ||
915 | 103 | + gchar scale_str[40]; | ||
916 | 104 | |||
917 | 105 | if (mapdl_active) | ||
918 | 106 | return TRUE; | ||
919 | 107 | @@ -450,11 +467,14 @@ | ||
920 | 108 | g_strlcpy (path, "landsat", sizeof (path)); | ||
921 | 109 | g_strlcpy (img_fmt, "jpg", sizeof (img_fmt)); | ||
922 | 110 | mapdl_geturl_landsat (); | ||
923 | 111 | + g_snprintf (scale_str, sizeof (scale_str), "%d", mapdl_scale); | ||
924 | 112 | break; | ||
925 | 113 | case MAPSOURCE_OSM_TAH: | ||
926 | 114 | g_strlcpy (path, "openstreetmap_tah", sizeof (path)); | ||
927 | 115 | g_strlcpy (img_fmt, "png", sizeof (img_fmt)); | ||
928 | 116 | mapdl_geturl_osm_tah (); | ||
929 | 117 | + mapdl_scale = (int)calc_webtile_scale(mapdl_lat, mapdl_zoom); | ||
930 | 118 | + g_snprintf (scale_str, sizeof (scale_str), "%d", mapdl_zoom); | ||
931 | 119 | break; | ||
932 | 120 | default: | ||
933 | 121 | return TRUE; | ||
934 | 122 | @@ -464,10 +484,11 @@ | ||
935 | 123 | g_print (" download url:\n%s\n", mapdl_url); | ||
936 | 124 | |||
937 | 125 | /* set file path and create directory if necessary */ | ||
938 | 126 | - | ||
939 | 127 | - | ||
940 | 128 | - g_snprintf (file_path, sizeof (file_path), "%s%s/%d/%.0f/%.0f/", | ||
941 | 129 | - local_config.dir_maps, path, mapdl_scale, mapdl_lat, mapdl_lon); | ||
942 | 130 | + | ||
943 | 131 | + g_snprintf (file_path, sizeof (file_path), "%s%s/%s/%.0f/%.0f/", | ||
944 | 132 | + local_config.dir_maps, path, scale_str, mapdl_lat, mapdl_lon); | ||
945 | 133 | + | ||
946 | 134 | + | ||
947 | 135 | if(!g_file_test (file_path, G_FILE_TEST_IS_DIR)) | ||
948 | 136 | { | ||
949 | 137 | if (g_mkdir_with_parents (file_path, 0700)) | ||
950 | 138 | @@ -477,14 +498,15 @@ | ||
951 | 139 | } | ||
952 | 140 | |||
953 | 141 | /* complete filename */ | ||
954 | 142 | - g_snprintf (mapdl_file_w_path, sizeof (mapdl_file_w_path), "%s%s_%d_%5.3f_%5.3f.%s", | ||
955 | 143 | - file_path, mapdl_proj, mapdl_scale, mapdl_lat, mapdl_lon, img_fmt); | ||
956 | 144 | + g_snprintf (mapdl_file_w_path, sizeof (mapdl_file_w_path), "%s%s_%s_%5.3f_%5.3f.%s", | ||
957 | 145 | + file_path, mapdl_proj, scale_str, mapdl_lat, mapdl_lon, img_fmt); | ||
958 | 146 | |||
959 | 147 | if (mydebug > 10) | ||
960 | 148 | g_print (" filename: %s\n", mapdl_file_w_path); | ||
961 | 149 | |||
962 | 150 | gtk_progress_bar_set_text (GTK_PROGRESS_BAR (mapdl_progress), | ||
963 | 151 | _("Loading Map...")); | ||
964 | 152 | + | ||
965 | 153 | mapdl_abort = FALSE; | ||
966 | 154 | mapdl_download (); | ||
967 | 155 | |||
968 | 156 | Index: src/map_download.h | ||
969 | 157 | =================================================================== | ||
970 | 158 | --- src/map_download.h (revision 2476) | ||
971 | 159 | +++ src/map_download.h (revision 2477) | ||
972 | 160 | @@ -1,10 +1,9 @@ | ||
973 | 161 | /*********************************************************************** | ||
974 | 162 | |||
975 | 163 | Copyright (c) 2008 Guenther Meyer <d.s.e (at) sordidmusic.com> | ||
976 | 164 | - | ||
977 | 165 | Website: www.gpsdrive.de/ | ||
978 | 166 | |||
979 | 167 | -Disclaimer: Please do not use for navigation. | ||
980 | 168 | +Disclaimer: Please do not use as a primary means of navigation. | ||
981 | 169 | |||
982 | 170 | This program is free software; you can redistribute it and/or modify | ||
983 | 171 | it under the terms of the GNU General Public License as published by | ||
984 | 172 | @@ -36,5 +35,6 @@ | ||
985 | 173 | void mapdl_set_coords (gchar *lat, gchar *lon); | ||
986 | 174 | gint mapdl_init (void); | ||
987 | 175 | gint mapdl_cleanup (void); | ||
988 | 176 | +double calc_webtile_scale (double, int); | ||
989 | 177 | |||
990 | 178 | #endif /* GPSDRIVE_MAP_DOWNLOAD_H */ | ||
991 | 179 | Index: scripts/gpsfetchmap.pl | ||
992 | 180 | =================================================================== | ||
993 | 181 | --- scripts/gpsfetchmap.pl (revision 2479) | ||
994 | 182 | +++ scripts/gpsfetchmap.pl (revision 2480) | ||
995 | 183 | @@ -47,6 +47,7 @@ | ||
996 | 184 | modified (Jul 2007) by Maciek Kaliszewski <mkalkal\@interia.pl> | ||
997 | 185 | modified (Oct 2007) by Andreas Putzo <andreas\@putzo.net> | ||
998 | 186 | modified (Jan 2008) by Gernot Hillier <gernot\@hillier.de> (added Openstreetmap support) | ||
999 | 187 | +modified (Aug 2009) by Hamish Bowman <hamish_b yahoo com> (fix OSM+WMS map scales) | ||
1000 | 188 | Version svn-$Version | ||
1001 | 189 | "; | ||
1002 | 190 | |||
1003 | 191 | @@ -151,24 +152,20 @@ | ||
1004 | 192 | 10000000 =>10000000, | ||
1005 | 193 | 50000000 =>50000000, | ||
1006 | 194 | }, | ||
1007 | 195 | +# Web Map Tiles scale varies with latitude by the formula | ||
1008 | 196 | +# (a * 2*pi * PIXELFACT * cos(lat * pi/180)) / (256 * 2^zoom) | ||
1009 | 197 | +# where a is major radius of the Earth according to the WGS84 ellipsoid definition. | ||
1010 | 198 | +# zoom levels lower than 9 (~1:500k) badly distort the Mercator so are not offered. | ||
1011 | 199 | openstreetmap_tah => { | ||
1012 | 200 | - 256*576000 => 1, | ||
1013 | 201 | - 128*576000 => 2, | ||
1014 | 202 | - 64*576000 => 3, | ||
1015 | 203 | - 32*576000 => 4, | ||
1016 | 204 | - 16*576000 => 5, | ||
1017 | 205 | - 8*576000 => 6, | ||
1018 | 206 | - 4*576000 => 7, | ||
1019 | 207 | - 2*576000 => 8, | ||
1020 | 208 | - 576000 => 9, | ||
1021 | 209 | - 288000 => 10, | ||
1022 | 210 | - 144000 => 11, | ||
1023 | 211 | - 72000 => 12, | ||
1024 | 212 | - 36000 => 13, | ||
1025 | 213 | - 18000 => 14, | ||
1026 | 214 | - 9000 => 15, | ||
1027 | 215 | - 4500 => 16, | ||
1028 | 216 | - 2250 => 17 | ||
1029 | 217 | + 600000 => 9, | ||
1030 | 218 | + 300000 => 10, | ||
1031 | 219 | + 150000 => 11, | ||
1032 | 220 | + 75000 => 12, | ||
1033 | 221 | + 40000 => 13, | ||
1034 | 222 | + 20000 => 14, | ||
1035 | 223 | + 10000 => 15, | ||
1036 | 224 | + 5000 => 16, | ||
1037 | 225 | + 2500 => 17 | ||
1038 | 226 | } | ||
1039 | 227 | }; | ||
1040 | 228 | |||
1041 | 229 | @@ -240,8 +237,6 @@ | ||
1042 | 230 | $polite=1; | ||
1043 | 231 | } | ||
1044 | 232 | |||
1045 | 233 | - | ||
1046 | 234 | - | ||
1047 | 235 | if ( $mapserver eq 'geoscience' ) | ||
1048 | 236 | { | ||
1049 | 237 | $scale ||= join(",",keys %{$Scale2Zoom->{'geoscience'}}); | ||
1050 | 238 | @@ -269,22 +264,24 @@ | ||
1051 | 239 | pod2usage(-verbose=>2) if $man; | ||
1052 | 240 | |||
1053 | 241 | sub append_koords($$$$); # {} | ||
1054 | 242 | +sub calc_webtile_scale ($$); # {} | ||
1055 | 243 | sub check_coverage($); # {} | ||
1056 | 244 | sub check_koord_file($); # {} | ||
1057 | 245 | sub debug($); # {} | ||
1058 | 246 | +sub file_count($); # {} | ||
1059 | 247 | sub geoscience_url($$$); # {} | ||
1060 | 248 | -sub landsat_url($$$); # {} | ||
1061 | 249 | -sub resize($$); #{} | ||
1062 | 250 | -sub file_count($); # {} | ||
1063 | 251 | sub get_coords_for_route; # {} | ||
1064 | 252 | sub get_coords_for_track($); # {} | ||
1065 | 253 | +sub get_gpsd_position(); # {} | ||
1066 | 254 | sub get_waypoint($); # {} | ||
1067 | 255 | sub is_map_file($); # {} | ||
1068 | 256 | +sub landsat_url($$$); # {} | ||
1069 | 257 | +sub openstreetmap_tah_url($$$); # {} | ||
1070 | 258 | sub read_gpstool_map_file(); # {} | ||
1071 | 259 | sub read_koord_file($); # {} | ||
1072 | 260 | +sub resize($$); # {} | ||
1073 | 261 | sub update_gpsdrive_map_koord_file(); # {} | ||
1074 | 262 | sub wget_map($$$); # {} | ||
1075 | 263 | -sub get_gpsd_position(); # {} | ||
1076 | 264 | |||
1077 | 265 | STDERR->autoflush(1); | ||
1078 | 266 | STDOUT->autoflush(1); | ||
1079 | 267 | @@ -407,7 +404,9 @@ | ||
1080 | 268 | |||
1081 | 269 | my ($existing,$wanted) = file_count($desired_locations); | ||
1082 | 270 | print "You are about to download $wanted (".($existing+$wanted).") file(s).\n"; | ||
1083 | 271 | - | ||
1084 | 272 | +if ($debug) { | ||
1085 | 273 | + print "Politeness delay set to $polite seconds,\n"; | ||
1086 | 274 | +} | ||
1087 | 275 | if ( $mapserver eq 'geoscience' ){ | ||
1088 | 276 | print "+-----------------------------------------------------------+\n"; | ||
1089 | 277 | print "| Geoscience Maps are Copyright, Commonwealth of Australia |\n"; | ||
1090 | 278 | @@ -419,6 +418,7 @@ | ||
1091 | 279 | print "+----------------------------------------------------------------+\n"; | ||
1092 | 280 | print "| Landsat maps are courtesy JPL/NASA's OnEarth WMS Global Mosaic |\n"; | ||
1093 | 281 | print "| Map prefix will be set automatically based on scale. |\n"; | ||
1094 | 282 | + print "+----------------------------------------------------------------+\n"; | ||
1095 | 283 | # By law, US Government data is without copyright. | ||
1096 | 284 | }elsif ( $mapserver eq 'openstreetmap_tah' ){ | ||
1097 | 285 | print "+-----------------------------------------------------------+\n"; | ||
1098 | 286 | @@ -427,6 +427,8 @@ | ||
1099 | 287 | print "| They are free for use under the terms of the |\n"; | ||
1100 | 288 | print "| Creative Commons \"Attribution-Share Alike 2.0 Generic\" |\n"; | ||
1101 | 289 | print "| license. See http://www.openstreetmap.org for details. |\n"; | ||
1102 | 290 | + print "+-----------------------------------------------------------+\n"; | ||
1103 | 291 | + | ||
1104 | 292 | } elsif ( ! $force) { | ||
1105 | 293 | print "You may violating the map servers terms of use!\n"; | ||
1106 | 294 | print "Please use their service responsible!\n"; | ||
1107 | 295 | @@ -654,14 +656,32 @@ | ||
1108 | 296 | ###################################################################### | ||
1109 | 297 | sub map_filename($$$){ | ||
1110 | 298 | my ($scale,$lati,$long) = @_; | ||
1111 | 299 | + | ||
1112 | 300 | + my $mscale = $scale; | ||
1113 | 301 | + | ||
1114 | 302 | + if ( $mapserver eq 'openstreetmap_tah' ) { | ||
1115 | 303 | + my $zoom = undef; | ||
1116 | 304 | + for my $s ( sort keys %{$Scale2Zoom->{openstreetmap_tah}} ) { | ||
1117 | 305 | + next unless $s == $scale; | ||
1118 | 306 | + $zoom = $Scale2Zoom->{openstreetmap_tah}->{$s}; | ||
1119 | 307 | + last; | ||
1120 | 308 | + } | ||
1121 | 309 | + unless ( $zoom ) { | ||
1122 | 310 | + print "Error calculating Zoomlevel for Scale: $scale\n"; | ||
1123 | 311 | + return (undef); | ||
1124 | 312 | + } | ||
1125 | 313 | + $mscale = $zoom; | ||
1126 | 314 | + } | ||
1127 | 315 | |||
1128 | 316 | - my $filename = "$mapserver/$scale" | ||
1129 | 317 | + my $filename = "$mapserver/$mscale" | ||
1130 | 318 | ."/".int($lati) | ||
1131 | 319 | # ."/".sprintf("%3.1f",$lati) | ||
1132 | 320 | ."/".int($long) | ||
1133 | 321 | - ."/$FILEPREFIX$scale-$lati-$long.$fileext"; | ||
1134 | 322 | - printf("Filename(%.0f,%.5f,%.5f): $filename\n",$scale,$lati,$long) | ||
1135 | 323 | + ."/$FILEPREFIX$mscale-$lati-$long.$fileext"; | ||
1136 | 324 | + | ||
1137 | 325 | + printf("Filename(%.0f,%.5f,%.5f): $filename\n",$mscale,$lati,$long) | ||
1138 | 326 | if $debug; | ||
1139 | 327 | + | ||
1140 | 328 | return $filename; | ||
1141 | 329 | } | ||
1142 | 330 | |||
1143 | 331 | @@ -678,6 +698,9 @@ | ||
1144 | 332 | # mapblast/1000/047/047.0232/9/map_1000-047.0232-0009.8140.gif 47.02320 9.81400 1000 | ||
1145 | 333 | #my $filename = "$mapserver/$scale/".int($lati)."/".sprintf("%3.1f",$lati). | ||
1146 | 334 | #"/".int($long)."/$FILEPREFIX$scale-$lati-$long.gif"; | ||
1147 | 335 | + if ($debug) { | ||
1148 | 336 | + print "---------------\n"; | ||
1149 | 337 | + } | ||
1150 | 338 | |||
1151 | 339 | # redundant?? | ||
1152 | 340 | if ($mapserver eq 'landsat') | ||
1153 | 341 | @@ -1082,7 +1105,7 @@ | ||
1154 | 342 | $lon2 += 360; | ||
1155 | 343 | } | ||
1156 | 344 | |||
1157 | 345 | - debug( "landsat_url(LAT=$lat,LON=$lon,SCALE=$scale,FACTOR=$factor)"); | ||
1158 | 346 | + debug( "landsat_url(LAT=$lat,LON=$lon,SCALE=$scale)"); | ||
1159 | 347 | |||
1160 | 348 | debug( "Calculated Lat1 $lat1"); | ||
1161 | 349 | debug( "Calculated Lat2 $lat2"); | ||
1162 | 350 | @@ -1111,7 +1134,28 @@ | ||
1163 | 351 | return ($url,$scale); | ||
1164 | 352 | } | ||
1165 | 353 | |||
1166 | 354 | + | ||
1167 | 355 | ############################################################################# | ||
1168 | 356 | +# calculate the local map scale based on Web Tile zoom level and latitude | ||
1169 | 357 | +# This same formula is used by OSM, Google Maps, Microsoft Maps, ... | ||
1170 | 358 | +sub calc_webtile_scale ($$){ | ||
1171 | 359 | + my $lat = shift; | ||
1172 | 360 | + my $zoom = shift; | ||
1173 | 361 | + | ||
1174 | 362 | + # major radius of WGS84 ellipsoid (meters) | ||
1175 | 363 | + my $a = $RADIUS_KM * 1000; | ||
1176 | 364 | + | ||
1177 | 365 | + my $zscale = (2*$a*$PI * cos($lat*$D2R) * $PIXELFACT) / (256 * 2**$zoom); | ||
1178 | 366 | + | ||
1179 | 367 | + if ($debug) { | ||
1180 | 368 | + print "Tile scale: $zscale\n"; | ||
1181 | 369 | + } | ||
1182 | 370 | + | ||
1183 | 371 | + return ($zscale); | ||
1184 | 372 | +} | ||
1185 | 373 | + | ||
1186 | 374 | + | ||
1187 | 375 | +############################################################################# | ||
1188 | 376 | sub openstreetmap_tah_url($$$){ | ||
1189 | 377 | my $lati = shift; | ||
1190 | 378 | my $long = shift; | ||
1191 | 379 | @@ -1122,7 +1166,7 @@ | ||
1192 | 380 | for my $s ( sort keys %{$Scale2Zoom->{openstreetmap_tah}} ) { | ||
1193 | 381 | next unless $s == $scale; | ||
1194 | 382 | $zoom = $Scale2Zoom->{openstreetmap_tah}->{$s}; | ||
1195 | 383 | - $mapscale = $s; | ||
1196 | 384 | + $mapscale = calc_webtile_scale($lati, $zoom); | ||
1197 | 385 | last; | ||
1198 | 386 | } | ||
1199 | 387 | |||
1200 | 388 | @@ -1132,10 +1176,9 @@ | ||
1201 | 389 | } | ||
1202 | 390 | |||
1203 | 391 | if ($debug) { | ||
1204 | 392 | - print "\n"; | ||
1205 | 393 | - print "Using openstreetmap_tah zoom ", $zoom, " for requested scale ", $scale, ":1 actual scale ", $mapscale, ":1\n"; | ||
1206 | 394 | - print "lat: $lati\n"; | ||
1207 | 395 | - print "lon: $long\n"; | ||
1208 | 396 | + print "Using openstreetmap_tah zoom ", $zoom, " for requested scale 1:", $scale, ". Actual scale 1:", $mapscale, "\n"; | ||
1209 | 397 | + print "cetner lat: $lati\n"; | ||
1210 | 398 | + print "cetner lon: $long\n"; | ||
1211 | 399 | } | ||
1212 | 400 | |||
1213 | 401 | my $url = "http://tah.openstreetmap.org/MapOf/?lat=$lati&long=$long&z=$zoom&w=1280&h=1024&format=png"; | ||
1214 | 402 | @@ -1903,7 +1946,7 @@ | ||
1215 | 403 | |||
1216 | 404 | gpsfetchmap -w <WAYPOINT NAME> -sc <SCALE> -a <#> -p | ||
1217 | 405 | |||
1218 | 406 | -gpsfetchmap -la <latitude DD.DDDD> -lo <latitude DD.DDDD> -sc <SCALE> -a <#> -p | ||
1219 | 407 | +gpsfetchmap -la <latitude DD.DDDD> -lo <longitude DD.DDDD> -sc <SCALE> -a <#> -p | ||
1220 | 408 | |||
1221 | 409 | 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 | ||
1222 | 410 | |||
1223 | 411 | @@ -1915,7 +1958,7 @@ | ||
1224 | 412 | [-la <latitude DD.DDDD>] [-lo <longitude DD.DDDD>] | ||
1225 | 413 | [-sla <start latitude DD.DDDD>] [-endla <end latitude DD.DDDD>] | ||
1226 | 414 | [-slo <start longitude DD.DDDD>] [-endlo <end longitude DD.DDDD>] | ||
1227 | 415 | - [-sc <SCALE>] [-a <#>] [-p] [-m <MAPSERVER>] | ||
1228 | 416 | + [-sc <SCALE>] [-a <#>] [-p <#>] [-m <MAPSERVER>] | ||
1229 | 417 | [-u <UNIT>] [-md <DIR>] [-W <FILE>] [-t <FILE>] [-r] | ||
1230 | 418 | [-C <FILE>] [-P <PREFIX>] [-F] [-d] [-v] [-h] [-M] [-n] [-U] [-c] | ||
1231 | 419 | |||
1232 | 420 | @@ -2000,7 +2043,7 @@ | ||
1233 | 421 | of longitude. 'units' is read from the configuration file (-C) or as defined | ||
1234 | 422 | by (-u). | ||
1235 | 423 | |||
1236 | 424 | -=item B<-p, --polite> | ||
1237 | 425 | +=item B<-p, --polite <#>> | ||
1238 | 426 | |||
1239 | 427 | This causes the program to sleep one second between downloads to be polite | ||
1240 | 428 | to the mapserver. Takes an optional value of number of seconds to sleep. | ||
1241 | 429 | @@ -2117,6 +2160,13 @@ | ||
1242 | 430 | |||
1243 | 431 | Prints the manual page and exits. | ||
1244 | 432 | |||
1245 | 433 | +=back | ||
1246 | 434 | + | ||
1247 | 435 | + | ||
1248 | 436 | +=head1 OUTPUT | ||
1249 | 437 | + | ||
1250 | 438 | +=over 2 | ||
1251 | 439 | + | ||
1252 | 440 | =item B<Download> | ||
1253 | 441 | |||
1254 | 442 | When downloading Maps the output reads as folows: | ||
1255 | 443 | @@ -2130,5 +2180,16 @@ | ||
1256 | 444 | |||
1257 | 445 | =back | ||
1258 | 446 | |||
1259 | 447 | + | ||
1260 | 448 | +=head1 EXAMPLE | ||
1261 | 449 | + | ||
1262 | 450 | +Download all 1:10000 OpenStreetMaps in a 5 km radius around the | ||
1263 | 451 | +Sydney Convention Centre. Between tile downloads it will let | ||
1264 | 452 | +the server rest for 3 seconds. | ||
1265 | 453 | + | ||
1266 | 454 | +gpsfetchmap --mapserver openstreetmap_tah --polite 3 \ | ||
1267 | 455 | + --lat "-33.8753" --lon 151.2001 --scale 10000 \ | ||
1268 | 456 | + --area 5 --unit kilometers | ||
1269 | 457 | + | ||
1270 | 458 | =cut | ||
1271 | 459 | |||
1272 | 460 | Index: scripts/mapnik/gpsdrive_mapnik_gentiles-in.py | ||
1273 | 461 | =================================================================== | ||
1274 | 462 | --- scripts/mapnik/gpsdrive_mapnik_gentiles-in.py (revision 2473) | ||
1275 | 463 | +++ scripts/mapnik/gpsdrive_mapnik_gentiles-in.py (revision 2479) | ||
1276 | 464 | @@ -7,14 +7,20 @@ | ||
1277 | 465 | |||
1278 | 466 | Options: | ||
1279 | 467 | -h, --help show this help | ||
1280 | 468 | - -b, --bbox boundingbox (lon,lat,lon,lat) - Be carefull! Quote negative values! | ||
1281 | 469 | - -s, --scale scale single/range | ||
1282 | 470 | - 1 = 147456000 | ||
1283 | 471 | - 2 = 73728000 | ||
1284 | 472 | - ... | ||
1285 | 473 | - 15 = 9000 | ||
1286 | 474 | - 16 = 4500 | ||
1287 | 475 | - 17 = 2250 | ||
1288 | 476 | + -b, --bbox boundingbox (minlon,minlat,maxlon,maxlat) | ||
1289 | 477 | + - Be carefull! "Quote" negative values! | ||
1290 | 478 | + -s, --scale scale single/range (zoom level or min-max) | ||
1291 | 479 | + (below "9" Mercator becomes distorted; | ||
1292 | 480 | + actual scale will vary with latitude) | ||
1293 | 481 | + 9 - 1:600,000 | ||
1294 | 482 | + 10 - 1:300,000 | ||
1295 | 483 | + 11 - 1:150,000 | ||
1296 | 484 | + 12 - 1:75,000 | ||
1297 | 485 | + 13 - 1:40,000 | ||
1298 | 486 | + 14 - 1:20,000 | ||
1299 | 487 | + 15 - 1:10,000 | ||
1300 | 488 | + 16 - 1:5,000 | ||
1301 | 489 | + 17 - 1:2,500 | ||
1302 | 490 | --test testrun = generates Munich example | ||
1303 | 491 | |||
1304 | 492 | Examples: | ||
1305 | 493 | @@ -22,7 +28,7 @@ | ||
1306 | 494 | Munich: | ||
1307 | 495 | gpsdrive_mapnik_gentiles.py -b 11.4,48.07,11.7,48.2 -s 10-16 | ||
1308 | 496 | |||
1309 | 497 | - World: | ||
1310 | 498 | + World: (just to demonstrate lat/lon order; scale not recommended) | ||
1311 | 499 | gpsdrive_mapnik_gentiles.py -b "-180.0,-90.0,180.0,90.0" -s 1-6 | ||
1312 | 500 | """ | ||
1313 | 501 | |||
1314 | 502 | @@ -32,12 +38,19 @@ | ||
1315 | 503 | import getopt | ||
1316 | 504 | import string | ||
1317 | 505 | |||
1318 | 506 | -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] | ||
1319 | 507 | |||
1320 | 508 | - | ||
1321 | 509 | DEG_TO_RAD = pi/180 | ||
1322 | 510 | RAD_TO_DEG = 180/pi | ||
1323 | 511 | |||
1324 | 512 | +def calc_scale (lat, zoom): | ||
1325 | 513 | + # GpsDrive's hardcoded pixels per meter ratio | ||
1326 | 514 | + PixelFact = 2817.947378 | ||
1327 | 515 | + # wgs84 major Earth axis | ||
1328 | 516 | + a = 6378137.0 | ||
1329 | 517 | + dynscale = ( a * 2*pi * cos(lat * DEG_TO_RAD) * PixelFact ) / ( 256*pow(2,zoom) ) | ||
1330 | 518 | + print dynscale | ||
1331 | 519 | + return dynscale | ||
1332 | 520 | + | ||
1333 | 521 | def minmax (a,b,c): | ||
1334 | 522 | a = max(a,b) | ||
1335 | 523 | a = min(a,c) | ||
1336 | 524 | @@ -90,17 +103,28 @@ | ||
1337 | 525 | os.mkdir(tile_dir) | ||
1338 | 526 | |||
1339 | 527 | gprj = GoogleProjection(maxZoom+1) | ||
1340 | 528 | + | ||
1341 | 529 | #m = Map(2 * 256,2 * 256) | ||
1342 | 530 | m = Map(1280,1024) | ||
1343 | 531 | load_map(m,mapfile) | ||
1344 | 532 | - prj = Projection("+proj=merc +datum=WGS84") | ||
1345 | 533 | - | ||
1346 | 534 | + | ||
1347 | 535 | + #prj = Projection("+proj=merc +datum=WGS84") | ||
1348 | 536 | + # What follows is from /usr/share/proj/esri.extra, EPSG:900913 | ||
1349 | 537 | + # "Chris' funny epsgish code for the google mercator" | ||
1350 | 538 | + 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") | ||
1351 | 539 | + | ||
1352 | 540 | ll0 = (bbox[0],bbox[3]) | ||
1353 | 541 | ll1 = (bbox[2],bbox[1]) | ||
1354 | 542 | - | ||
1355 | 543 | + | ||
1356 | 544 | for z in range(minZoom,maxZoom + 1): | ||
1357 | 545 | + if z == 9: | ||
1358 | 546 | + print "CAUTION: Mercator projection begins to be noticeably distorted at this zoom level." | ||
1359 | 547 | + elif z < 9: | ||
1360 | 548 | + print "WARNING: Mercator projection is very distorted at this zoom level." | ||
1361 | 549 | + | ||
1362 | 550 | px0 = gprj.fromLLtoPixel(ll0,z) | ||
1363 | 551 | px1 = gprj.fromLLtoPixel(ll1,z) | ||
1364 | 552 | + | ||
1365 | 553 | for x in range(int(px0[0]/640.0),int(px1[0]/640.0)+1): | ||
1366 | 554 | for y in range(int(px0[1]/512.0),int(px1[1]/512.0)+1): | ||
1367 | 555 | p0 = gprj.fromPixelToLL((x * 640.0, (y+1) * 512.0),z) | ||
1368 | 556 | @@ -145,7 +169,7 @@ | ||
1369 | 557 | fh_mapkoord.write(tile_path + " ") | ||
1370 | 558 | fh_mapkoord.write(str((p0[1] + p1[1]) / 2) + " ") | ||
1371 | 559 | fh_mapkoord.write(str((p0[0] + p1[0]) / 2) + " ") | ||
1372 | 560 | - fh_mapkoord.write(str(zoom2scale[z])) | ||
1373 | 561 | + fh_mapkoord.write(str( calc_scale( (p0[1] + p1[1])/2, z) )) | ||
1374 | 562 | fh_mapkoord.write(" " + str(p0[1]) + " " + str(p0[0])) | ||
1375 | 563 | fh_mapkoord.write(" " + str(p1[1]) + " " + str(p1[0])) | ||
1376 | 564 | fh_mapkoord.write("\n") | ||
1377 | 565 | @@ -221,6 +245,7 @@ | ||
1378 | 566 | |||
1379 | 567 | # check for correct values | ||
1380 | 568 | 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]: | ||
1381 | 569 | + # rounding problems... what exactly is this supposed to be checking ??? | ||
1382 | 570 | sys.exit("Boundingbox invalid!") | ||
1383 | 571 | |||
1384 | 572 | if minZoom < 1 or minZoom > 17 or maxZoom < 1 and maxZoom > 17 or minZoom > maxZoom or int(minZoom) <> minZoom or int(maxZoom) <> maxZoom: | ||
1385 | 0 | 573 | ||
1386 | === modified file 'debian/rules' | |||
1387 | --- debian/rules 2009-06-11 19:26:06 +0000 | |||
1388 | +++ debian/rules 2010-07-28 08:11:20 +0000 | |||
1389 | @@ -74,16 +74,10 @@ | |||
1390 | 74 | dh_testroot | 74 | dh_testroot |
1391 | 75 | rm -f build-arch-stamp build-indep-stamp | 75 | rm -f build-arch-stamp build-indep-stamp |
1392 | 76 | [ ! -f Makefile ] || $(MAKE) distclean | 76 | [ ! -f Makefile ] || $(MAKE) distclean |
1393 | 77 | ifneq "$(wildcard /usr/share/misc/config.sub)" "" | ||
1394 | 78 | cp -f /usr/share/misc/config.sub config.sub | ||
1395 | 79 | endif | ||
1396 | 80 | ifneq "$(wildcard /usr/share/misc/config.guess)" "" | ||
1397 | 81 | cp -f /usr/share/misc/config.guess config.guess | ||
1398 | 82 | endif | ||
1399 | 83 | dh_clean | 77 | dh_clean |
1400 | 84 | 78 | ||
1401 | 85 | install: install-arch install-indep | 79 | install: install-arch install-indep |
1403 | 86 | dh_clean -k | 80 | dh_prep |
1404 | 87 | 81 | ||
1405 | 88 | install-arch: build-arch | 82 | install-arch: build-arch |
1406 | 89 | dh_testdir | 83 | dh_testdir |