Codebase list goffice / 3093151
Imported Debian snapshot 0.8.7-1 J.H.M. Dassen (Ray) authored 13 years ago Dmitry Smirnov committed 10 years ago
4 changed file(s) with 708 addition(s) and 702 deletion(s). Raw diff Collapse all Expand all
+6
-0
debian/changelog less more
0 goffice (0.8.7-1) unstable; urgency=low
1
2 * New upstream stable release.
3
4 -- J.H.M. Dassen (Ray) <jdassen@debian.org> Tue, 29 Jun 2010 17:28:05 +0200
5
06 goffice (0.8.6-1) unstable; urgency=low
17
28 * New upstream stable release.
+0
-701
debian/patches/refresh-config-sub-guess-0.8.6-1 less more
0 diff -ru goffice-0.8.6.orig/config.guess goffice-0.8.6/config.guess
1 --- goffice-0.8.6.orig/config.guess 2010-05-30 20:42:16.000000000 +0200
2 +++ goffice-0.8.6/config.guess 2010-06-19 12:52:28.000000000 +0200
3 @@ -1,10 +1,10 @@
4 #! /bin/sh
5 # Attempt to guess a canonical system name.
6 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
7 -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
8 +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
9 # Free Software Foundation, Inc.
10
11 -timestamp='2009-04-27'
12 +timestamp='2009-12-30'
13
14 # This file is free software; you can redistribute it and/or modify it
15 # under the terms of the GNU General Public License as published by
16 @@ -27,16 +27,16 @@
17 # the same distribution terms that you use for the rest of that program.
18
19
20 -# Originally written by Per Bothner <per@bothner.com>.
21 -# Please send patches to <config-patches@gnu.org>. Submit a context
22 -# diff and a properly formatted ChangeLog entry.
23 +# Originally written by Per Bothner. Please send patches (context
24 +# diff format) to <config-patches@gnu.org> and include a ChangeLog
25 +# entry.
26 #
27 # This script attempts to guess a canonical system name similar to
28 # config.sub. If it succeeds, it prints the system name on stdout, and
29 # exits with 0. Otherwise, it exits with 1.
30 #
31 -# The plan is that this can be called by configure scripts if you
32 -# don't specify an explicit build system type.
33 +# You can get the latest version of this script from:
34 +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
35
36 me=`echo "$0" | sed -e 's,.*/,,'`
37
38 @@ -56,8 +56,9 @@
39 GNU config.guess ($timestamp)
40
41 Originally written by Per Bothner.
42 -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
43 -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
44 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
45 +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
46 +Software Foundation, Inc.
47
48 This is free software; see the source for copying conditions. There is NO
49 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
50 @@ -139,16 +140,6 @@
51 UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
52 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
53
54 -case "${UNAME_MACHINE}" in
55 - i?86)
56 - test -z "$VENDOR" && VENDOR=pc
57 - ;;
58 - *)
59 - test -z "$VENDOR" && VENDOR=unknown
60 - ;;
61 -esac
62 -test -f /etc/SuSE-release -o -f /.buildenv && VENDOR=suse
63 -
64 # Note: order is significant - the case branches are not exclusive.
65
66 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
67 @@ -180,7 +171,7 @@
68 arm*|i386|m68k|ns32k|sh3*|sparc|vax)
69 eval $set_cc_for_build
70 if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
71 - | grep __ELF__ >/dev/null
72 + | grep -q __ELF__
73 then
74 # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
75 # Return netbsd for either. FIX?
76 @@ -343,6 +334,9 @@
77 sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
78 echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
79 exit ;;
80 + i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
81 + echo i386-pc-auroraux${UNAME_RELEASE}
82 + exit ;;
83 i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
84 eval $set_cc_for_build
85 SUN_ARCH="i386"
86 @@ -666,7 +660,7 @@
87 # => hppa64-hp-hpux11.23
88
89 if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
90 - grep __LP64__ >/dev/null
91 + grep -q __LP64__
92 then
93 HP_ARCH="hppa2.0w"
94 else
95 @@ -817,12 +811,12 @@
96 i*:PW*:*)
97 echo ${UNAME_MACHINE}-pc-pw32
98 exit ;;
99 - *:Interix*:[3456]*)
100 + *:Interix*:*)
101 case ${UNAME_MACHINE} in
102 x86)
103 echo i586-pc-interix${UNAME_RELEASE}
104 exit ;;
105 - EM64T | authenticamd | genuineintel)
106 + authenticamd | genuineintel | EM64T)
107 echo x86_64-unknown-interix${UNAME_RELEASE}
108 exit ;;
109 IA64)
110 @@ -832,6 +826,9 @@
111 [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
112 echo i${UNAME_MACHINE}-pc-mks
113 exit ;;
114 + 8664:Windows_NT:*)
115 + echo x86_64-pc-mks
116 + exit ;;
117 i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
118 # How do we know it's Interix rather than the generic POSIX subsystem?
119 # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
120 @@ -861,18 +858,32 @@
121 i*86:Minix:*:*)
122 echo ${UNAME_MACHINE}-pc-minix
123 exit ;;
124 + alpha:Linux:*:*)
125 + case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
126 + EV5) UNAME_MACHINE=alphaev5 ;;
127 + EV56) UNAME_MACHINE=alphaev56 ;;
128 + PCA56) UNAME_MACHINE=alphapca56 ;;
129 + PCA57) UNAME_MACHINE=alphapca56 ;;
130 + EV6) UNAME_MACHINE=alphaev6 ;;
131 + EV67) UNAME_MACHINE=alphaev67 ;;
132 + EV68*) UNAME_MACHINE=alphaev68 ;;
133 + esac
134 + objdump --private-headers /bin/sh | grep -q ld.so.1
135 + if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
136 + echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
137 + exit ;;
138 arm*:Linux:*:*)
139 eval $set_cc_for_build
140 if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
141 | grep -q __ARM_EABI__
142 then
143 - echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
144 + echo ${UNAME_MACHINE}-unknown-linux-gnu
145 else
146 - echo ${UNAME_MACHINE}-${VENDOR}-linux-gnueabi
147 + echo ${UNAME_MACHINE}-unknown-linux-gnueabi
148 fi
149 exit ;;
150 avr32*:Linux:*:*)
151 - echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
152 + echo ${UNAME_MACHINE}-unknown-linux-gnu
153 exit ;;
154 cris:Linux:*:*)
155 echo cris-axis-linux-gnu
156 @@ -881,181 +892,91 @@
157 echo crisv32-axis-linux-gnu
158 exit ;;
159 frv:Linux:*:*)
160 - echo frv-${VENDOR}-linux-gnu
161 + echo frv-unknown-linux-gnu
162 + exit ;;
163 + i*86:Linux:*:*)
164 + LIBC=gnu
165 + eval $set_cc_for_build
166 + sed 's/^ //' << EOF >$dummy.c
167 + #ifdef __dietlibc__
168 + LIBC=dietlibc
169 + #endif
170 +EOF
171 + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
172 + echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
173 exit ;;
174 ia64:Linux:*:*)
175 - echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
176 + echo ${UNAME_MACHINE}-unknown-linux-gnu
177 exit ;;
178 m32r*:Linux:*:*)
179 - echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
180 + echo ${UNAME_MACHINE}-unknown-linux-gnu
181 exit ;;
182 m68*:Linux:*:*)
183 - echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
184 + echo ${UNAME_MACHINE}-unknown-linux-gnu
185 exit ;;
186 - mips:Linux:*:*)
187 - eval $set_cc_for_build
188 - sed 's/^ //' << EOF >$dummy.c
189 - #undef CPU
190 - #undef mips
191 - #undef mipsel
192 - #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
193 - CPU=mipsel
194 - #else
195 - #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
196 - CPU=mips
197 - #else
198 - CPU=
199 - #endif
200 - #endif
201 -EOF
202 - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
203 - /^CPU/{
204 - s: ::g
205 - p
206 - }'`"
207 - test x"${CPU}" != x && { echo "${CPU}-${VENDOR}-linux-gnu"; exit; }
208 - ;;
209 - mips64:Linux:*:*)
210 + mips:Linux:*:* | mips64:Linux:*:*)
211 eval $set_cc_for_build
212 sed 's/^ //' << EOF >$dummy.c
213 #undef CPU
214 - #undef mips64
215 - #undef mips64el
216 + #undef ${UNAME_MACHINE}
217 + #undef ${UNAME_MACHINE}el
218 #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
219 - CPU=mips64el
220 + CPU=${UNAME_MACHINE}el
221 #else
222 #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
223 - CPU=mips64
224 + CPU=${UNAME_MACHINE}
225 #else
226 CPU=
227 #endif
228 #endif
229 EOF
230 - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
231 - /^CPU/{
232 - s: ::g
233 - p
234 - }'`"
235 - test x"${CPU}" != x && { echo "${CPU}-${VENDOR}-linux-gnu"; exit; }
236 + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
237 + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
238 ;;
239 or32:Linux:*:*)
240 - echo or32-${VENDOR}-linux-gnu
241 - exit ;;
242 - ppc:Linux:*:*)
243 - echo powerpc-${VENDOR}-linux-gnu
244 - exit ;;
245 - ppc64:Linux:*:*)
246 - echo powerpc64-${VENDOR}-linux-gnu
247 - exit ;;
248 - alpha:Linux:*:*)
249 - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
250 - EV5) UNAME_MACHINE=alphaev5 ;;
251 - EV56) UNAME_MACHINE=alphaev56 ;;
252 - PCA56) UNAME_MACHINE=alphapca56 ;;
253 - PCA57) UNAME_MACHINE=alphapca56 ;;
254 - EV6) UNAME_MACHINE=alphaev6 ;;
255 - EV67) UNAME_MACHINE=alphaev67 ;;
256 - EV68*) UNAME_MACHINE=alphaev68 ;;
257 - esac
258 - objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
259 - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
260 - echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu${LIBC}
261 + echo or32-unknown-linux-gnu
262 exit ;;
263 padre:Linux:*:*)
264 echo sparc-unknown-linux-gnu
265 exit ;;
266 + parisc64:Linux:*:* | hppa64:Linux:*:*)
267 + echo hppa64-unknown-linux-gnu
268 + exit ;;
269 parisc:Linux:*:* | hppa:Linux:*:*)
270 # Look for CPU level
271 case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
272 - PA7*) echo hppa1.1-${VENDOR}-linux-gnu ;;
273 - PA8*) echo hppa2.0-${VENDOR}-linux-gnu ;;
274 - *) echo hppa-${VENDOR}-linux-gnu ;;
275 + PA7*) echo hppa1.1-unknown-linux-gnu ;;
276 + PA8*) echo hppa2.0-unknown-linux-gnu ;;
277 + *) echo hppa-unknown-linux-gnu ;;
278 esac
279 exit ;;
280 - parisc64:Linux:*:* | hppa64:Linux:*:*)
281 - echo hppa64-${VENDOR}-linux-gnu
282 + ppc64:Linux:*:*)
283 + echo powerpc64-unknown-linux-gnu
284 + exit ;;
285 + ppc:Linux:*:*)
286 + echo powerpc-unknown-linux-gnu
287 exit ;;
288 s390:Linux:*:* | s390x:Linux:*:*)
289 echo ${UNAME_MACHINE}-ibm-linux
290 exit ;;
291 sh64*:Linux:*:*)
292 - echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
293 + echo ${UNAME_MACHINE}-unknown-linux-gnu
294 exit ;;
295 sh*:Linux:*:*)
296 - echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
297 + echo ${UNAME_MACHINE}-unknown-linux-gnu
298 exit ;;
299 sparc:Linux:*:* | sparc64:Linux:*:*)
300 - echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
301 + echo ${UNAME_MACHINE}-unknown-linux-gnu
302 exit ;;
303 vax:Linux:*:*)
304 echo ${UNAME_MACHINE}-dec-linux-gnu
305 exit ;;
306 x86_64:Linux:*:*)
307 - echo x86_64-${VENDOR}-linux-gnu
308 + echo x86_64-unknown-linux-gnu
309 exit ;;
310 xtensa*:Linux:*:*)
311 - echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
312 + echo ${UNAME_MACHINE}-unknown-linux-gnu
313 exit ;;
314 - i*86:Linux:*:*)
315 - # The BFD linker knows what the default object file format is, so
316 - # first see if it will tell us. cd to the root directory to prevent
317 - # problems with other programs or directories called `ld' in the path.
318 - # Set LC_ALL=C to ensure ld outputs messages in English.
319 - ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
320 - | sed -ne '/supported targets:/!d
321 - s/[ ][ ]*/ /g
322 - s/.*supported targets: *//
323 - s/ .*//
324 - p'`
325 - case "$ld_supported_targets" in
326 - elf32-i386)
327 - TENTATIVE="${UNAME_MACHINE}-${VENDOR}-linux-gnu"
328 - ;;
329 - a.out-i386-linux)
330 - echo "${UNAME_MACHINE}-${VENDOR}-linux-gnuaout"
331 - exit ;;
332 - "")
333 - # Either a pre-BFD a.out linker (linux-gnuoldld) or
334 - # one that does not give us useful --help.
335 - echo "${UNAME_MACHINE}-${VENDOR}-linux-gnuoldld"
336 - exit ;;
337 - esac
338 - # Determine whether the default compiler is a.out or elf
339 - eval $set_cc_for_build
340 - sed 's/^ //' << EOF >$dummy.c
341 - #include <features.h>
342 - #ifdef __ELF__
343 - # ifdef __GLIBC__
344 - # if __GLIBC__ >= 2
345 - LIBC=gnu
346 - # else
347 - LIBC=gnulibc1
348 - # endif
349 - # else
350 - LIBC=gnulibc1
351 - # endif
352 - #else
353 - #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
354 - LIBC=gnu
355 - #else
356 - LIBC=gnuaout
357 - #endif
358 - #endif
359 - #ifdef __dietlibc__
360 - LIBC=dietlibc
361 - #endif
362 -EOF
363 - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
364 - /^LIBC/{
365 - s: ::g
366 - p
367 - }'`"
368 - test x"${LIBC}" != x && {
369 - echo "${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}"
370 - exit
371 - }
372 - test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
373 - ;;
374 i*86:DYNIX/ptx:4*:*)
375 # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
376 # earlier versions are messed up and put the nodename in both
377 @@ -1076,16 +997,16 @@
378 echo ${UNAME_MACHINE}-pc-os2-emx
379 exit ;;
380 i*86:XTS-300:*:STOP)
381 - echo ${UNAME_MACHINE}-${VENDOR}-stop
382 + echo ${UNAME_MACHINE}-unknown-stop
383 exit ;;
384 i*86:atheos:*:*)
385 - echo ${UNAME_MACHINE}-${VENDOR}-atheos
386 + echo ${UNAME_MACHINE}-unknown-atheos
387 exit ;;
388 i*86:syllable:*:*)
389 echo ${UNAME_MACHINE}-pc-syllable
390 exit ;;
391 - i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
392 - echo i386-${VENDOR}-lynxos${UNAME_RELEASE}
393 + i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
394 + echo i386-unknown-lynxos${UNAME_RELEASE}
395 exit ;;
396 i*86:*DOS:*:*)
397 echo ${UNAME_MACHINE}-pc-msdosdjgpp
398 @@ -1105,7 +1026,7 @@
399 *Pentium) UNAME_MACHINE=i586 ;;
400 *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
401 esac
402 - echo ${UNAME_MACHINE}-${VENDOR}-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
403 + echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
404 exit ;;
405 i*86:*:3.2:*)
406 if test -f /usr/options/cb.name; then
407 @@ -1144,7 +1065,7 @@
408 if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
409 echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
410 else # Add other i860-SVR4 vendors below as they are discovered.
411 - echo i860-${VENDOR}-sysv${UNAME_RELEASE} # Unknown i860-SVR4
412 + echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4
413 fi
414 exit ;;
415 mini*:CTIX:SYS*5:*)
416 @@ -1181,19 +1102,19 @@
417 /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
418 && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
419 m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
420 - echo m68k-${VENDOR}-lynxos${UNAME_RELEASE}
421 + echo m68k-unknown-lynxos${UNAME_RELEASE}
422 exit ;;
423 mc68030:UNIX_System_V:4.*:*)
424 echo m68k-atari-sysv4
425 exit ;;
426 TSUNAMI:LynxOS:2.*:*)
427 - echo sparc-${VENDOR}-lynxos${UNAME_RELEASE}
428 + echo sparc-unknown-lynxos${UNAME_RELEASE}
429 exit ;;
430 rs6000:LynxOS:2.*:*)
431 - echo rs6000-${VENDOR}-lynxos${UNAME_RELEASE}
432 + echo rs6000-unknown-lynxos${UNAME_RELEASE}
433 exit ;;
434 - PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
435 - echo powerpc-${VENDOR}-lynxos${UNAME_RELEASE}
436 + PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
437 + echo powerpc-unknown-lynxos${UNAME_RELEASE}
438 exit ;;
439 SM[BE]S:UNIX_SV:*:*)
440 echo mips-dde-sysv${UNAME_RELEASE}
441 @@ -1243,7 +1164,7 @@
442 if [ -d /usr/nec ]; then
443 echo mips-nec-sysv${UNAME_RELEASE}
444 else
445 - echo mips-${VENDOR}-sysv${UNAME_RELEASE}
446 + echo mips-unknown-sysv${UNAME_RELEASE}
447 fi
448 exit ;;
449 BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
450 @@ -1285,6 +1206,16 @@
451 *:Darwin:*:*)
452 UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
453 case $UNAME_PROCESSOR in
454 + i386)
455 + eval $set_cc_for_build
456 + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
457 + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
458 + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
459 + grep IS_64BIT_ARCH >/dev/null
460 + then
461 + UNAME_PROCESSOR="x86_64"
462 + fi
463 + fi ;;
464 unknown) UNAME_PROCESSOR=powerpc ;;
465 esac
466 echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
467 @@ -1324,13 +1255,13 @@
468 else
469 UNAME_MACHINE="$cputype"
470 fi
471 - echo ${UNAME_MACHINE}-${VENDOR}-plan9
472 + echo ${UNAME_MACHINE}-unknown-plan9
473 exit ;;
474 *:TOPS-10:*:*)
475 - echo pdp10-${VENDOR}-tops10
476 + echo pdp10-unknown-tops10
477 exit ;;
478 *:TENEX:*:*)
479 - echo pdp10-${VENDOR}-tenex
480 + echo pdp10-unknown-tenex
481 exit ;;
482 KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
483 echo pdp10-dec-tops20
484 @@ -1339,16 +1270,16 @@
485 echo pdp10-xkl-tops20
486 exit ;;
487 *:TOPS-20:*:*)
488 - echo pdp10-${VENDOR}-tops20
489 + echo pdp10-unknown-tops20
490 exit ;;
491 *:ITS:*:*)
492 - echo pdp10-${VENDOR}-its
493 + echo pdp10-unknown-its
494 exit ;;
495 SEI:*:*:SEIUX)
496 echo mips-sei-seiux${UNAME_RELEASE}
497 exit ;;
498 *:DragonFly:*:*)
499 - echo ${UNAME_MACHINE}-${VENDOR}-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
500 + echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
501 exit ;;
502 *:*VMS:*:*)
503 UNAME_MACHINE=`(uname -p) 2>/dev/null`
504 diff -ru goffice-0.8.6.orig/config.sub goffice-0.8.6/config.sub
505 --- goffice-0.8.6.orig/config.sub 2010-05-30 20:42:16.000000000 +0200
506 +++ goffice-0.8.6/config.sub 2010-06-19 12:52:28.000000000 +0200
507 @@ -1,10 +1,10 @@
508 #! /bin/sh
509 # Configuration validation subroutine script.
510 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
511 -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
512 +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
513 # Free Software Foundation, Inc.
514
515 -timestamp='2009-04-17'
516 +timestamp='2010-01-22'
517
518 # This file is (in principle) common to ALL GNU software.
519 # The presence of a machine in this file suggests that SOME GNU software
520 @@ -32,13 +32,16 @@
521
522
523 # Please send patches to <config-patches@gnu.org>. Submit a context
524 -# diff and a properly formatted ChangeLog entry.
525 +# diff and a properly formatted GNU ChangeLog entry.
526 #
527 # Configuration subroutine to validate and canonicalize a configuration type.
528 # Supply the specified configuration type as an argument.
529 # If it is invalid, we print an error message on stderr and exit with code 1.
530 # Otherwise, we print the canonical config type on stdout and succeed.
531
532 +# You can get the latest version of this script from:
533 +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
534 +
535 # This file is supposed to be the same for all GNU packages
536 # and recognize all the CPU types, system types and aliases
537 # that are meaningful with *any* GNU software.
538 @@ -72,8 +75,9 @@
539 version="\
540 GNU config.sub ($timestamp)
541
542 -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
543 -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
544 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
545 +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
546 +Software Foundation, Inc.
547
548 This is free software; see the source for copying conditions. There is NO
549 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
550 @@ -149,10 +153,13 @@
551 -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
552 -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
553 -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
554 - -apple | -axis | -knuth | -cray)
555 + -apple | -axis | -knuth | -cray | -microblaze)
556 os=
557 basic_machine=$1
558 ;;
559 + -bluegene*)
560 + os=-cnk
561 + ;;
562 -sim | -cisco | -oki | -wec | -winbond)
563 os=
564 basic_machine=$1
565 @@ -281,6 +288,7 @@
566 | pdp10 | pdp11 | pj | pjl \
567 | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
568 | pyramid \
569 + | rx \
570 | score \
571 | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
572 | sh64 | sh64le \
573 @@ -288,13 +296,14 @@
574 | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
575 | spu | strongarm \
576 | tahoe | thumb | tic4x | tic80 | tron \
577 + | ubicom32 \
578 | v850 | v850e \
579 | we32k \
580 | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
581 | z8k | z80)
582 basic_machine=$basic_machine-unknown
583 ;;
584 - m6811 | m68hc11 | m6812 | m68hc12)
585 + m6811 | m68hc11 | m6812 | m68hc12 | picochip)
586 # Motorola 68HC11/12.
587 basic_machine=$basic_machine-unknown
588 os=-none
589 @@ -337,7 +346,7 @@
590 | lm32-* \
591 | m32c-* | m32r-* | m32rle-* \
592 | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
593 - | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
594 + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
595 | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
596 | mips16-* \
597 | mips64-* | mips64el-* \
598 @@ -365,15 +374,17 @@
599 | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
600 | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
601 | pyramid-* \
602 - | romp-* | rs6000-* \
603 + | romp-* | rs6000-* | rx-* \
604 | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
605 | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
606 | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
607 | sparclite-* \
608 | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
609 | tahoe-* | thumb-* \
610 - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
611 + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
612 + | tile-* | tilegx-* \
613 | tron-* \
614 + | ubicom32-* \
615 | v850-* | v850e-* | vax-* \
616 | we32k-* \
617 | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
618 @@ -467,6 +478,10 @@
619 basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
620 os=-linux
621 ;;
622 + bluegene*)
623 + basic_machine=powerpc-ibm
624 + os=-cnk
625 + ;;
626 c90)
627 basic_machine=c90-cray
628 os=-unicos
629 @@ -719,6 +734,9 @@
630 basic_machine=ns32k-utek
631 os=-sysv
632 ;;
633 + microblaze)
634 + basic_machine=microblaze-xilinx
635 + ;;
636 mingw32)
637 basic_machine=i386-pc
638 os=-mingw32
639 @@ -1069,6 +1087,11 @@
640 basic_machine=tic6x-unknown
641 os=-coff
642 ;;
643 + # This must be matched before tile*.
644 + tilegx*)
645 + basic_machine=tilegx-unknown
646 + os=-linux-gnu
647 + ;;
648 tile*)
649 basic_machine=tile-unknown
650 os=-linux-gnu
651 @@ -1240,6 +1263,9 @@
652 # First match some system type aliases
653 # that might get confused with valid system types.
654 # -solaris* is a basic system type, with this one exception.
655 + -auroraux)
656 + os=-auroraux
657 + ;;
658 -solaris1 | -solaris1.*)
659 os=`echo $os | sed -e 's|solaris1|sunos4|'`
660 ;;
661 @@ -1260,9 +1286,9 @@
662 # Each alternative MUST END IN A *, to match a version number.
663 # -sysv* is not here because it comes later, after sysvr4.
664 -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
665 - | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
666 - | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
667 - | -kopensolaris* \
668 + | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
669 + | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
670 + | -sym* | -kopensolaris* \
671 | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
672 | -aos* | -aros* \
673 | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
674 @@ -1283,7 +1309,7 @@
675 | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
676 | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
677 | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
678 - | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
679 + | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
680 # Remember, each alternative MUST END IN *, to match a version number.
681 ;;
682 -qnx*)
683 @@ -1416,6 +1442,8 @@
684 -dicos*)
685 os=-dicos
686 ;;
687 + -nacl*)
688 + ;;
689 -none)
690 ;;
691 *)
692 @@ -1613,7 +1641,7 @@
693 -sunos*)
694 vendor=sun
695 ;;
696 - -aix*)
697 + -cnk*|-aix*)
698 vendor=ibm
699 ;;
700 -beos*)
+701
-0
debian/patches/refresh-config-sub-guess-0.8.7-1 less more
0 diff -ru goffice-0.8.7.orig/config.guess goffice-0.8.7/config.guess
1 --- goffice-0.8.7.orig/config.guess 2010-06-17 02:23:07.000000000 +0200
2 +++ goffice-0.8.7/config.guess 2010-06-29 17:27:00.000000000 +0200
3 @@ -1,10 +1,10 @@
4 #! /bin/sh
5 # Attempt to guess a canonical system name.
6 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
7 -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
8 +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
9 # Free Software Foundation, Inc.
10
11 -timestamp='2009-04-27'
12 +timestamp='2009-12-30'
13
14 # This file is free software; you can redistribute it and/or modify it
15 # under the terms of the GNU General Public License as published by
16 @@ -27,16 +27,16 @@
17 # the same distribution terms that you use for the rest of that program.
18
19
20 -# Originally written by Per Bothner <per@bothner.com>.
21 -# Please send patches to <config-patches@gnu.org>. Submit a context
22 -# diff and a properly formatted ChangeLog entry.
23 +# Originally written by Per Bothner. Please send patches (context
24 +# diff format) to <config-patches@gnu.org> and include a ChangeLog
25 +# entry.
26 #
27 # This script attempts to guess a canonical system name similar to
28 # config.sub. If it succeeds, it prints the system name on stdout, and
29 # exits with 0. Otherwise, it exits with 1.
30 #
31 -# The plan is that this can be called by configure scripts if you
32 -# don't specify an explicit build system type.
33 +# You can get the latest version of this script from:
34 +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
35
36 me=`echo "$0" | sed -e 's,.*/,,'`
37
38 @@ -56,8 +56,9 @@
39 GNU config.guess ($timestamp)
40
41 Originally written by Per Bothner.
42 -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
43 -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
44 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
45 +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
46 +Software Foundation, Inc.
47
48 This is free software; see the source for copying conditions. There is NO
49 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
50 @@ -139,16 +140,6 @@
51 UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
52 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
53
54 -case "${UNAME_MACHINE}" in
55 - i?86)
56 - test -z "$VENDOR" && VENDOR=pc
57 - ;;
58 - *)
59 - test -z "$VENDOR" && VENDOR=unknown
60 - ;;
61 -esac
62 -test -f /etc/SuSE-release -o -f /.buildenv && VENDOR=suse
63 -
64 # Note: order is significant - the case branches are not exclusive.
65
66 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
67 @@ -180,7 +171,7 @@
68 arm*|i386|m68k|ns32k|sh3*|sparc|vax)
69 eval $set_cc_for_build
70 if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
71 - | grep __ELF__ >/dev/null
72 + | grep -q __ELF__
73 then
74 # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
75 # Return netbsd for either. FIX?
76 @@ -343,6 +334,9 @@
77 sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
78 echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
79 exit ;;
80 + i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
81 + echo i386-pc-auroraux${UNAME_RELEASE}
82 + exit ;;
83 i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
84 eval $set_cc_for_build
85 SUN_ARCH="i386"
86 @@ -666,7 +660,7 @@
87 # => hppa64-hp-hpux11.23
88
89 if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
90 - grep __LP64__ >/dev/null
91 + grep -q __LP64__
92 then
93 HP_ARCH="hppa2.0w"
94 else
95 @@ -817,12 +811,12 @@
96 i*:PW*:*)
97 echo ${UNAME_MACHINE}-pc-pw32
98 exit ;;
99 - *:Interix*:[3456]*)
100 + *:Interix*:*)
101 case ${UNAME_MACHINE} in
102 x86)
103 echo i586-pc-interix${UNAME_RELEASE}
104 exit ;;
105 - EM64T | authenticamd | genuineintel)
106 + authenticamd | genuineintel | EM64T)
107 echo x86_64-unknown-interix${UNAME_RELEASE}
108 exit ;;
109 IA64)
110 @@ -832,6 +826,9 @@
111 [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
112 echo i${UNAME_MACHINE}-pc-mks
113 exit ;;
114 + 8664:Windows_NT:*)
115 + echo x86_64-pc-mks
116 + exit ;;
117 i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
118 # How do we know it's Interix rather than the generic POSIX subsystem?
119 # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
120 @@ -861,18 +858,32 @@
121 i*86:Minix:*:*)
122 echo ${UNAME_MACHINE}-pc-minix
123 exit ;;
124 + alpha:Linux:*:*)
125 + case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
126 + EV5) UNAME_MACHINE=alphaev5 ;;
127 + EV56) UNAME_MACHINE=alphaev56 ;;
128 + PCA56) UNAME_MACHINE=alphapca56 ;;
129 + PCA57) UNAME_MACHINE=alphapca56 ;;
130 + EV6) UNAME_MACHINE=alphaev6 ;;
131 + EV67) UNAME_MACHINE=alphaev67 ;;
132 + EV68*) UNAME_MACHINE=alphaev68 ;;
133 + esac
134 + objdump --private-headers /bin/sh | grep -q ld.so.1
135 + if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
136 + echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
137 + exit ;;
138 arm*:Linux:*:*)
139 eval $set_cc_for_build
140 if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
141 | grep -q __ARM_EABI__
142 then
143 - echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
144 + echo ${UNAME_MACHINE}-unknown-linux-gnu
145 else
146 - echo ${UNAME_MACHINE}-${VENDOR}-linux-gnueabi
147 + echo ${UNAME_MACHINE}-unknown-linux-gnueabi
148 fi
149 exit ;;
150 avr32*:Linux:*:*)
151 - echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
152 + echo ${UNAME_MACHINE}-unknown-linux-gnu
153 exit ;;
154 cris:Linux:*:*)
155 echo cris-axis-linux-gnu
156 @@ -881,181 +892,91 @@
157 echo crisv32-axis-linux-gnu
158 exit ;;
159 frv:Linux:*:*)
160 - echo frv-${VENDOR}-linux-gnu
161 + echo frv-unknown-linux-gnu
162 + exit ;;
163 + i*86:Linux:*:*)
164 + LIBC=gnu
165 + eval $set_cc_for_build
166 + sed 's/^ //' << EOF >$dummy.c
167 + #ifdef __dietlibc__
168 + LIBC=dietlibc
169 + #endif
170 +EOF
171 + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
172 + echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
173 exit ;;
174 ia64:Linux:*:*)
175 - echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
176 + echo ${UNAME_MACHINE}-unknown-linux-gnu
177 exit ;;
178 m32r*:Linux:*:*)
179 - echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
180 + echo ${UNAME_MACHINE}-unknown-linux-gnu
181 exit ;;
182 m68*:Linux:*:*)
183 - echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
184 + echo ${UNAME_MACHINE}-unknown-linux-gnu
185 exit ;;
186 - mips:Linux:*:*)
187 - eval $set_cc_for_build
188 - sed 's/^ //' << EOF >$dummy.c
189 - #undef CPU
190 - #undef mips
191 - #undef mipsel
192 - #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
193 - CPU=mipsel
194 - #else
195 - #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
196 - CPU=mips
197 - #else
198 - CPU=
199 - #endif
200 - #endif
201 -EOF
202 - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
203 - /^CPU/{
204 - s: ::g
205 - p
206 - }'`"
207 - test x"${CPU}" != x && { echo "${CPU}-${VENDOR}-linux-gnu"; exit; }
208 - ;;
209 - mips64:Linux:*:*)
210 + mips:Linux:*:* | mips64:Linux:*:*)
211 eval $set_cc_for_build
212 sed 's/^ //' << EOF >$dummy.c
213 #undef CPU
214 - #undef mips64
215 - #undef mips64el
216 + #undef ${UNAME_MACHINE}
217 + #undef ${UNAME_MACHINE}el
218 #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
219 - CPU=mips64el
220 + CPU=${UNAME_MACHINE}el
221 #else
222 #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
223 - CPU=mips64
224 + CPU=${UNAME_MACHINE}
225 #else
226 CPU=
227 #endif
228 #endif
229 EOF
230 - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
231 - /^CPU/{
232 - s: ::g
233 - p
234 - }'`"
235 - test x"${CPU}" != x && { echo "${CPU}-${VENDOR}-linux-gnu"; exit; }
236 + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
237 + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
238 ;;
239 or32:Linux:*:*)
240 - echo or32-${VENDOR}-linux-gnu
241 - exit ;;
242 - ppc:Linux:*:*)
243 - echo powerpc-${VENDOR}-linux-gnu
244 - exit ;;
245 - ppc64:Linux:*:*)
246 - echo powerpc64-${VENDOR}-linux-gnu
247 - exit ;;
248 - alpha:Linux:*:*)
249 - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
250 - EV5) UNAME_MACHINE=alphaev5 ;;
251 - EV56) UNAME_MACHINE=alphaev56 ;;
252 - PCA56) UNAME_MACHINE=alphapca56 ;;
253 - PCA57) UNAME_MACHINE=alphapca56 ;;
254 - EV6) UNAME_MACHINE=alphaev6 ;;
255 - EV67) UNAME_MACHINE=alphaev67 ;;
256 - EV68*) UNAME_MACHINE=alphaev68 ;;
257 - esac
258 - objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
259 - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
260 - echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu${LIBC}
261 + echo or32-unknown-linux-gnu
262 exit ;;
263 padre:Linux:*:*)
264 echo sparc-unknown-linux-gnu
265 exit ;;
266 + parisc64:Linux:*:* | hppa64:Linux:*:*)
267 + echo hppa64-unknown-linux-gnu
268 + exit ;;
269 parisc:Linux:*:* | hppa:Linux:*:*)
270 # Look for CPU level
271 case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
272 - PA7*) echo hppa1.1-${VENDOR}-linux-gnu ;;
273 - PA8*) echo hppa2.0-${VENDOR}-linux-gnu ;;
274 - *) echo hppa-${VENDOR}-linux-gnu ;;
275 + PA7*) echo hppa1.1-unknown-linux-gnu ;;
276 + PA8*) echo hppa2.0-unknown-linux-gnu ;;
277 + *) echo hppa-unknown-linux-gnu ;;
278 esac
279 exit ;;
280 - parisc64:Linux:*:* | hppa64:Linux:*:*)
281 - echo hppa64-${VENDOR}-linux-gnu
282 + ppc64:Linux:*:*)
283 + echo powerpc64-unknown-linux-gnu
284 + exit ;;
285 + ppc:Linux:*:*)
286 + echo powerpc-unknown-linux-gnu
287 exit ;;
288 s390:Linux:*:* | s390x:Linux:*:*)
289 echo ${UNAME_MACHINE}-ibm-linux
290 exit ;;
291 sh64*:Linux:*:*)
292 - echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
293 + echo ${UNAME_MACHINE}-unknown-linux-gnu
294 exit ;;
295 sh*:Linux:*:*)
296 - echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
297 + echo ${UNAME_MACHINE}-unknown-linux-gnu
298 exit ;;
299 sparc:Linux:*:* | sparc64:Linux:*:*)
300 - echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
301 + echo ${UNAME_MACHINE}-unknown-linux-gnu
302 exit ;;
303 vax:Linux:*:*)
304 echo ${UNAME_MACHINE}-dec-linux-gnu
305 exit ;;
306 x86_64:Linux:*:*)
307 - echo x86_64-${VENDOR}-linux-gnu
308 + echo x86_64-unknown-linux-gnu
309 exit ;;
310 xtensa*:Linux:*:*)
311 - echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
312 + echo ${UNAME_MACHINE}-unknown-linux-gnu
313 exit ;;
314 - i*86:Linux:*:*)
315 - # The BFD linker knows what the default object file format is, so
316 - # first see if it will tell us. cd to the root directory to prevent
317 - # problems with other programs or directories called `ld' in the path.
318 - # Set LC_ALL=C to ensure ld outputs messages in English.
319 - ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
320 - | sed -ne '/supported targets:/!d
321 - s/[ ][ ]*/ /g
322 - s/.*supported targets: *//
323 - s/ .*//
324 - p'`
325 - case "$ld_supported_targets" in
326 - elf32-i386)
327 - TENTATIVE="${UNAME_MACHINE}-${VENDOR}-linux-gnu"
328 - ;;
329 - a.out-i386-linux)
330 - echo "${UNAME_MACHINE}-${VENDOR}-linux-gnuaout"
331 - exit ;;
332 - "")
333 - # Either a pre-BFD a.out linker (linux-gnuoldld) or
334 - # one that does not give us useful --help.
335 - echo "${UNAME_MACHINE}-${VENDOR}-linux-gnuoldld"
336 - exit ;;
337 - esac
338 - # Determine whether the default compiler is a.out or elf
339 - eval $set_cc_for_build
340 - sed 's/^ //' << EOF >$dummy.c
341 - #include <features.h>
342 - #ifdef __ELF__
343 - # ifdef __GLIBC__
344 - # if __GLIBC__ >= 2
345 - LIBC=gnu
346 - # else
347 - LIBC=gnulibc1
348 - # endif
349 - # else
350 - LIBC=gnulibc1
351 - # endif
352 - #else
353 - #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
354 - LIBC=gnu
355 - #else
356 - LIBC=gnuaout
357 - #endif
358 - #endif
359 - #ifdef __dietlibc__
360 - LIBC=dietlibc
361 - #endif
362 -EOF
363 - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
364 - /^LIBC/{
365 - s: ::g
366 - p
367 - }'`"
368 - test x"${LIBC}" != x && {
369 - echo "${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}"
370 - exit
371 - }
372 - test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
373 - ;;
374 i*86:DYNIX/ptx:4*:*)
375 # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
376 # earlier versions are messed up and put the nodename in both
377 @@ -1076,16 +997,16 @@
378 echo ${UNAME_MACHINE}-pc-os2-emx
379 exit ;;
380 i*86:XTS-300:*:STOP)
381 - echo ${UNAME_MACHINE}-${VENDOR}-stop
382 + echo ${UNAME_MACHINE}-unknown-stop
383 exit ;;
384 i*86:atheos:*:*)
385 - echo ${UNAME_MACHINE}-${VENDOR}-atheos
386 + echo ${UNAME_MACHINE}-unknown-atheos
387 exit ;;
388 i*86:syllable:*:*)
389 echo ${UNAME_MACHINE}-pc-syllable
390 exit ;;
391 - i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
392 - echo i386-${VENDOR}-lynxos${UNAME_RELEASE}
393 + i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
394 + echo i386-unknown-lynxos${UNAME_RELEASE}
395 exit ;;
396 i*86:*DOS:*:*)
397 echo ${UNAME_MACHINE}-pc-msdosdjgpp
398 @@ -1105,7 +1026,7 @@
399 *Pentium) UNAME_MACHINE=i586 ;;
400 *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
401 esac
402 - echo ${UNAME_MACHINE}-${VENDOR}-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
403 + echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
404 exit ;;
405 i*86:*:3.2:*)
406 if test -f /usr/options/cb.name; then
407 @@ -1144,7 +1065,7 @@
408 if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
409 echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
410 else # Add other i860-SVR4 vendors below as they are discovered.
411 - echo i860-${VENDOR}-sysv${UNAME_RELEASE} # Unknown i860-SVR4
412 + echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4
413 fi
414 exit ;;
415 mini*:CTIX:SYS*5:*)
416 @@ -1181,19 +1102,19 @@
417 /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
418 && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
419 m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
420 - echo m68k-${VENDOR}-lynxos${UNAME_RELEASE}
421 + echo m68k-unknown-lynxos${UNAME_RELEASE}
422 exit ;;
423 mc68030:UNIX_System_V:4.*:*)
424 echo m68k-atari-sysv4
425 exit ;;
426 TSUNAMI:LynxOS:2.*:*)
427 - echo sparc-${VENDOR}-lynxos${UNAME_RELEASE}
428 + echo sparc-unknown-lynxos${UNAME_RELEASE}
429 exit ;;
430 rs6000:LynxOS:2.*:*)
431 - echo rs6000-${VENDOR}-lynxos${UNAME_RELEASE}
432 + echo rs6000-unknown-lynxos${UNAME_RELEASE}
433 exit ;;
434 - PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
435 - echo powerpc-${VENDOR}-lynxos${UNAME_RELEASE}
436 + PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
437 + echo powerpc-unknown-lynxos${UNAME_RELEASE}
438 exit ;;
439 SM[BE]S:UNIX_SV:*:*)
440 echo mips-dde-sysv${UNAME_RELEASE}
441 @@ -1243,7 +1164,7 @@
442 if [ -d /usr/nec ]; then
443 echo mips-nec-sysv${UNAME_RELEASE}
444 else
445 - echo mips-${VENDOR}-sysv${UNAME_RELEASE}
446 + echo mips-unknown-sysv${UNAME_RELEASE}
447 fi
448 exit ;;
449 BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
450 @@ -1285,6 +1206,16 @@
451 *:Darwin:*:*)
452 UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
453 case $UNAME_PROCESSOR in
454 + i386)
455 + eval $set_cc_for_build
456 + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
457 + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
458 + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
459 + grep IS_64BIT_ARCH >/dev/null
460 + then
461 + UNAME_PROCESSOR="x86_64"
462 + fi
463 + fi ;;
464 unknown) UNAME_PROCESSOR=powerpc ;;
465 esac
466 echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
467 @@ -1324,13 +1255,13 @@
468 else
469 UNAME_MACHINE="$cputype"
470 fi
471 - echo ${UNAME_MACHINE}-${VENDOR}-plan9
472 + echo ${UNAME_MACHINE}-unknown-plan9
473 exit ;;
474 *:TOPS-10:*:*)
475 - echo pdp10-${VENDOR}-tops10
476 + echo pdp10-unknown-tops10
477 exit ;;
478 *:TENEX:*:*)
479 - echo pdp10-${VENDOR}-tenex
480 + echo pdp10-unknown-tenex
481 exit ;;
482 KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
483 echo pdp10-dec-tops20
484 @@ -1339,16 +1270,16 @@
485 echo pdp10-xkl-tops20
486 exit ;;
487 *:TOPS-20:*:*)
488 - echo pdp10-${VENDOR}-tops20
489 + echo pdp10-unknown-tops20
490 exit ;;
491 *:ITS:*:*)
492 - echo pdp10-${VENDOR}-its
493 + echo pdp10-unknown-its
494 exit ;;
495 SEI:*:*:SEIUX)
496 echo mips-sei-seiux${UNAME_RELEASE}
497 exit ;;
498 *:DragonFly:*:*)
499 - echo ${UNAME_MACHINE}-${VENDOR}-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
500 + echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
501 exit ;;
502 *:*VMS:*:*)
503 UNAME_MACHINE=`(uname -p) 2>/dev/null`
504 diff -ru goffice-0.8.7.orig/config.sub goffice-0.8.7/config.sub
505 --- goffice-0.8.7.orig/config.sub 2010-06-17 02:23:07.000000000 +0200
506 +++ goffice-0.8.7/config.sub 2010-06-29 17:27:00.000000000 +0200
507 @@ -1,10 +1,10 @@
508 #! /bin/sh
509 # Configuration validation subroutine script.
510 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
511 -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
512 +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
513 # Free Software Foundation, Inc.
514
515 -timestamp='2009-04-17'
516 +timestamp='2010-01-22'
517
518 # This file is (in principle) common to ALL GNU software.
519 # The presence of a machine in this file suggests that SOME GNU software
520 @@ -32,13 +32,16 @@
521
522
523 # Please send patches to <config-patches@gnu.org>. Submit a context
524 -# diff and a properly formatted ChangeLog entry.
525 +# diff and a properly formatted GNU ChangeLog entry.
526 #
527 # Configuration subroutine to validate and canonicalize a configuration type.
528 # Supply the specified configuration type as an argument.
529 # If it is invalid, we print an error message on stderr and exit with code 1.
530 # Otherwise, we print the canonical config type on stdout and succeed.
531
532 +# You can get the latest version of this script from:
533 +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
534 +
535 # This file is supposed to be the same for all GNU packages
536 # and recognize all the CPU types, system types and aliases
537 # that are meaningful with *any* GNU software.
538 @@ -72,8 +75,9 @@
539 version="\
540 GNU config.sub ($timestamp)
541
542 -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
543 -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
544 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
545 +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
546 +Software Foundation, Inc.
547
548 This is free software; see the source for copying conditions. There is NO
549 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
550 @@ -149,10 +153,13 @@
551 -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
552 -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
553 -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
554 - -apple | -axis | -knuth | -cray)
555 + -apple | -axis | -knuth | -cray | -microblaze)
556 os=
557 basic_machine=$1
558 ;;
559 + -bluegene*)
560 + os=-cnk
561 + ;;
562 -sim | -cisco | -oki | -wec | -winbond)
563 os=
564 basic_machine=$1
565 @@ -281,6 +288,7 @@
566 | pdp10 | pdp11 | pj | pjl \
567 | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
568 | pyramid \
569 + | rx \
570 | score \
571 | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
572 | sh64 | sh64le \
573 @@ -288,13 +296,14 @@
574 | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
575 | spu | strongarm \
576 | tahoe | thumb | tic4x | tic80 | tron \
577 + | ubicom32 \
578 | v850 | v850e \
579 | we32k \
580 | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
581 | z8k | z80)
582 basic_machine=$basic_machine-unknown
583 ;;
584 - m6811 | m68hc11 | m6812 | m68hc12)
585 + m6811 | m68hc11 | m6812 | m68hc12 | picochip)
586 # Motorola 68HC11/12.
587 basic_machine=$basic_machine-unknown
588 os=-none
589 @@ -337,7 +346,7 @@
590 | lm32-* \
591 | m32c-* | m32r-* | m32rle-* \
592 | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
593 - | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
594 + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
595 | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
596 | mips16-* \
597 | mips64-* | mips64el-* \
598 @@ -365,15 +374,17 @@
599 | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
600 | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
601 | pyramid-* \
602 - | romp-* | rs6000-* \
603 + | romp-* | rs6000-* | rx-* \
604 | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
605 | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
606 | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
607 | sparclite-* \
608 | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
609 | tahoe-* | thumb-* \
610 - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
611 + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
612 + | tile-* | tilegx-* \
613 | tron-* \
614 + | ubicom32-* \
615 | v850-* | v850e-* | vax-* \
616 | we32k-* \
617 | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
618 @@ -467,6 +478,10 @@
619 basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
620 os=-linux
621 ;;
622 + bluegene*)
623 + basic_machine=powerpc-ibm
624 + os=-cnk
625 + ;;
626 c90)
627 basic_machine=c90-cray
628 os=-unicos
629 @@ -719,6 +734,9 @@
630 basic_machine=ns32k-utek
631 os=-sysv
632 ;;
633 + microblaze)
634 + basic_machine=microblaze-xilinx
635 + ;;
636 mingw32)
637 basic_machine=i386-pc
638 os=-mingw32
639 @@ -1069,6 +1087,11 @@
640 basic_machine=tic6x-unknown
641 os=-coff
642 ;;
643 + # This must be matched before tile*.
644 + tilegx*)
645 + basic_machine=tilegx-unknown
646 + os=-linux-gnu
647 + ;;
648 tile*)
649 basic_machine=tile-unknown
650 os=-linux-gnu
651 @@ -1240,6 +1263,9 @@
652 # First match some system type aliases
653 # that might get confused with valid system types.
654 # -solaris* is a basic system type, with this one exception.
655 + -auroraux)
656 + os=-auroraux
657 + ;;
658 -solaris1 | -solaris1.*)
659 os=`echo $os | sed -e 's|solaris1|sunos4|'`
660 ;;
661 @@ -1260,9 +1286,9 @@
662 # Each alternative MUST END IN A *, to match a version number.
663 # -sysv* is not here because it comes later, after sysvr4.
664 -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
665 - | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
666 - | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
667 - | -kopensolaris* \
668 + | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
669 + | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
670 + | -sym* | -kopensolaris* \
671 | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
672 | -aos* | -aros* \
673 | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
674 @@ -1283,7 +1309,7 @@
675 | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
676 | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
677 | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
678 - | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
679 + | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
680 # Remember, each alternative MUST END IN *, to match a version number.
681 ;;
682 -qnx*)
683 @@ -1416,6 +1442,8 @@
684 -dicos*)
685 os=-dicos
686 ;;
687 + -nacl*)
688 + ;;
689 -none)
690 ;;
691 *)
692 @@ -1613,7 +1641,7 @@
693 -sunos*)
694 vendor=sun
695 ;;
696 - -aix*)
697 + -cnk*|-aix*)
698 vendor=ibm
699 ;;
700 -beos*)
+1
-1
debian/patches/series less more
0 refresh-config-sub-guess-0.8.6-1
0 refresh-config-sub-guess-0.8.7-1