From: Bdale Garbee Date: Thu, 5 Jun 2008 17:47:52 +0000 (-0600) Subject: Merge branch 'upstream' X-Git-Tag: debian/2.7-1~6 X-Git-Url: https://git.gag.com/?p=debian%2Fcpmtools;a=commitdiff_plain;h=975c05c916276c70d34b5aa14e5f0faca1ae013d Merge branch 'upstream' Conflicts: Makefile.in NEWS config.guess config.sub configure configure.in diskdefs --- 975c05c916276c70d34b5aa14e5f0faca1ae013d diff --cc config.guess index ad5281e,eeb9aef..f32079a --- a/config.guess +++ b/config.guess @@@ -1,9 -1,10 +1,10 @@@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, - # 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. -# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, -# Inc. ++# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 ++# Free Software Foundation, Inc. - timestamp='2005-08-03' -timestamp='2006-11-15' ++timestamp='2008-01-23' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@@ -55,8 -56,8 +56,8 @@@ version=" GNU config.guess ($timestamp) Originally written by Per Bothner. --Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 --Free Software Foundation, Inc. ++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, ++2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@@ -325,7 -330,7 +330,7 @@@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}: sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; -- i86pc:SunOS:5.*:*) ++ i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; sun4*:SunOS:6*:*) @@@ -527,7 -532,7 +532,7 @@@ EO echo rs6000-ibm-aix3.2 fi exit ;; -- *:AIX:*:[45]) ++ *:AIX:*:[456]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 @@@ -769,7 -781,7 +781,7 @@@ EO i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin exit ;; -- i*:MINGW*:*) ++ *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; i*:windows32*:*) @@@ -779,9 -791,12 +791,18 @@@ i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit ;; - x86:Interix*:[34]*) - echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//' - x86:Interix*:[3456]*) - echo i586-pc-interix${UNAME_RELEASE} - exit ;; - EM64T:Interix*:[3456]* | authenticamd:Interix*:[3456]*) - echo x86_64-unknown-interix${UNAME_RELEASE} -- exit ;; ++ *:Interix*:[3456]*) ++ case ${UNAME_MACHINE} in ++ x86) ++ echo i586-pc-interix${UNAME_RELEASE} ++ exit ;; ++ EM64T | authenticamd) ++ echo x86_64-unknown-interix${UNAME_RELEASE} ++ exit ;; ++ IA64) ++ echo ia64-unknown-interix${UNAME_RELEASE} ++ exit ;; ++ esac ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks exit ;; @@@ -815,6 -830,9 +836,16 @@@ echo ${UNAME_MACHINE}-pc-minix exit ;; arm*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu ++ eval $set_cc_for_build ++ if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ ++ | grep -q __ARM_EABI__ ++ then ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ else ++ echo ${UNAME_MACHINE}-unknown-linux-gnueabi ++ fi + exit ;; + avr32*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; cris:Linux:*:*) @@@ -922,6 -951,6 +964,9 @@@ EO x86_64:Linux:*:*) echo x86_64-unknown-linux-gnu exit ;; ++ xtensa*:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; i*86:Linux:*:*) # The BFD linker knows what the default object file format is, so # first see if it will tell us. cd to the root directory to prevent @@@ -1176,6 -1209,9 +1225,15 @@@ EO SX-6:SUPER-UX:*:*) echo sx6-nec-superux${UNAME_RELEASE} exit ;; ++ SX-7:SUPER-UX:*:*) ++ echo sx7-nec-superux${UNAME_RELEASE} ++ exit ;; + SX-8:SUPER-UX:*:*) + echo sx8-nec-superux${UNAME_RELEASE} + exit ;; ++ SX-8R:SUPER-UX:*:*) ++ echo sx8r-nec-superux${UNAME_RELEASE} ++ exit ;; Power*:Rhapsody:*:*) echo powerpc-apple-rhapsody${UNAME_RELEASE} exit ;; @@@ -1424,9 -1462,9 +1484,9 @@@ This script, last modified $timestamp, the operating system you are using. It is advised that you download the most up to date version of the config scripts from -- http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess ++ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD and -- http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub ++ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD If the version you run ($0) is already up to date, please send the following data and any information you think might be diff --cc config.sub index 1c366df,7ccee73..6759825 --- a/config.sub +++ b/config.sub @@@ -1,9 -1,10 +1,10 @@@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, - # 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. -# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, -# Inc. ++# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 ++# Free Software Foundation, Inc. - timestamp='2005-07-08' -timestamp='2006-11-07' ++timestamp='2008-01-16' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@@ -71,8 -72,8 +72,8 @@@ Report bugs and patches to on +Tue, 15 Jan 2002 02:23:43 -0700. + +It was downloaded from http://www.moria.de/~michael/cpmtools/ + +Upstream Author: Michael Haardt + +Copyright: + - Copyright 1997, 1998, 1999, 2000, 2001 Michael Haardt ++ Copyright 1997-2007 Michael Haardt + + The Windows port is copyright 2000, 2001 John Elliott + + The getopt.[ch] and getopt1.c files are + Copyright (C) 1989,90,91,92,93,94,96,97,98 Free Software Foundation, Inc. + ++ The install.sh file is Copyright (C) 1994 X Consortium ++ +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 dated June, 1991. ++the Free Software Foundation; either version 3 of the License, or ++(at your option) any later version. + +On Debian GNU/Linux systems, the complete text of the GNU General Public +License can be found in the `/usr/share/common-licenses' directory. + diff --cc diskdefs index a607c44,7d8a444..020dfbf --- a/diskdefs +++ b/diskdefs @@@ -231,20 -231,30 +231,48 @@@ diskdef p11 tracks 160 sectrk 18 blocksize 2048 ++<<<<<<< HEAD:diskdefs + maxdir 128 + skew 1 + boottrk 1 + os 3 +end + + +diskdef p112a ++======= + maxdir 256 + skew 1 + boottrk 2 + os 3 + end + + diskdef p112-old ++>>>>>>> 224b4e6d27a3af235500d9d8028ddbd3a60af7ed:diskdefs seclen 512 tracks 160 sectrk 18 blocksize 2048 ++<<<<<<< HEAD:diskdefs + maxdir 256 ++======= + maxdir 128 ++>>>>>>> 224b4e6d27a3af235500d9d8028ddbd3a60af7ed:diskdefs skew 1 boottrk 1 os 3 end ++<<<<<<< HEAD:diskdefs ++======= + + diskdef kpii + seclen 512 + tracks 40 + sectrk 10 + blocksize 1024 + maxdir 32 + skew 0 + boottrk 1 + os 2.2 + end ++>>>>>>> 224b4e6d27a3af235500d9d8028ddbd3a60af7ed:diskdefs