From: Gerfried Fuchs <alfie@debian.org>
Date: Wed, 2 Aug 2006 14:15:46 +0000 (-0500)
Subject: Imported Debian patch 0.5.6-1
X-Git-Tag: debian/0.5.6-1^0
X-Git-Url: https://git.deb.at/?a=commitdiff_plain;h=ec21e25ffd8fe61704ae3588bcad4570de2946ac;p=pkg%2Fabook.git

Imported Debian patch 0.5.6-1
---

ec21e25ffd8fe61704ae3588bcad4570de2946ac
diff --cc config.guess
index ad5281e,ba66165..c38553d
mode 100755,100644..100644
--- a/config.guess
+++ b/config.guess
@@@ -1,9 -1,9 +1,9 @@@
  #! /bin/sh
  # Attempt to guess a canonical system name.
 -#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 -#   Free Software Foundation, Inc.
 +#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 +#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
  
- timestamp='2005-08-03'
 -timestamp='2001-04-20'
++timestamp='2006-02-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
@@@ -100,27 -94,18 +100,27 @@@ trap 'exit 1' 1 2 1
  # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
  # use `HOST_CC' if defined, but it is deprecated.
  
 +# Portable tmp directory creation inspired by the Autoconf team.
 +
 +set_cc_for_build='
 +trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
 +trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
 +: ${TMPDIR=/tmp} ;
-  { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
++ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
 + { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
 + { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
 + { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
 +dummy=$tmp/dummy ;
 +tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
  case $CC_FOR_BUILD,$HOST_CC,$CC in
 - ,,)    echo "int dummy(){}" > $dummy.c
 -	for c in cc gcc c89 ; do
 -	  ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1
 -	  if test $? = 0 ; then
 -	     CC_FOR_BUILD="$c"; break
 -	  fi
 -	done
 -	rm -f $dummy.c $dummy.o $dummy.rel
 + ,,)    echo "int x;" > $dummy.c ;
 +	for c in cc gcc c89 c99 ; do
 +	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
 +	     CC_FOR_BUILD="$c"; break ;
 +	  fi ;
 +	done ;
  	if test x"$CC_FOR_BUILD" = x ; then
 -	  CC_FOR_BUILD=no_compiler_found
 +	  CC_FOR_BUILD=no_compiler_found ;
  	fi
  	;;
   ,,*)   CC_FOR_BUILD=$CC ;;
@@@ -198,67 -170,11 +198,70 @@@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:
  	# contains redundant information, the shorter form:
  	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
  	echo "${machine}-${os}${release}"
 -	exit 0 ;;
 +	exit ;;
 +    *:OpenBSD:*:*)
 +	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
 +	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
 +	exit ;;
 +    *:ekkoBSD:*:*)
 +	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
 +	exit ;;
++    *:SolidBSD:*:*)
++	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
++	exit ;;
 +    macppc:MirBSD:*:*)
 +	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
 +	exit ;;
 +    *:MirBSD:*:*)
 +	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
 +	exit ;;
      alpha:OSF1:*:*)
 -	if test $UNAME_RELEASE = "V4.0"; then
 +	case $UNAME_RELEASE in
 +	*4.0)
  		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
 -	fi
 +		;;
 +	*5.*)
 +	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
 +		;;
 +	esac
 +	# According to Compaq, /usr/sbin/psrinfo has been available on
 +	# OSF/1 and Tru64 systems produced since 1995.  I hope that
 +	# covers most systems running today.  This code pipes the CPU
 +	# types through head -n 1, so we only detect the type of CPU 0.
 +	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
 +	case "$ALPHA_CPU_TYPE" in
 +	    "EV4 (21064)")
 +		UNAME_MACHINE="alpha" ;;
 +	    "EV4.5 (21064)")
 +		UNAME_MACHINE="alpha" ;;
 +	    "LCA4 (21066/21068)")
 +		UNAME_MACHINE="alpha" ;;
 +	    "EV5 (21164)")
 +		UNAME_MACHINE="alphaev5" ;;
 +	    "EV5.6 (21164A)")
 +		UNAME_MACHINE="alphaev56" ;;
 +	    "EV5.6 (21164PC)")
 +		UNAME_MACHINE="alphapca56" ;;
 +	    "EV5.7 (21164PC)")
 +		UNAME_MACHINE="alphapca57" ;;
 +	    "EV6 (21264)")
 +		UNAME_MACHINE="alphaev6" ;;
 +	    "EV6.7 (21264A)")
 +		UNAME_MACHINE="alphaev67" ;;
 +	    "EV6.8CB (21264C)")
 +		UNAME_MACHINE="alphaev68" ;;
 +	    "EV6.8AL (21264B)")
 +		UNAME_MACHINE="alphaev68" ;;
 +	    "EV6.8CX (21264D)")
 +		UNAME_MACHINE="alphaev68" ;;
 +	    "EV6.9A (21264/EV69A)")
 +		UNAME_MACHINE="alphaev69" ;;
 +	    "EV7 (21364)")
 +		UNAME_MACHINE="alphaev7" ;;
 +	    "EV7.9 (21364A)")
 +		UNAME_MACHINE="alphaev79" ;;
 +	esac
 +	# A Pn.n version is a patched version.
  	# A Vn.n version is a released version.
  	# A Tn.n version is a released field test version.
  	# A Xn.n version is an unreleased experimental baselevel.
@@@ -748,154 -704,158 +751,173 @@@ EO
          FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
          FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
          echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
 -        exit 0 ;;
 -    hp300:OpenBSD:*:*)
 -	echo m68k-unknown-openbsd${UNAME_RELEASE}
 -	exit 0 ;;
 +        exit ;;
 +    5000:UNIX_System_V:4.*:*)
 +        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
 +        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
 +        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
 +	exit ;;
      i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
  	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
 -	exit 0 ;;
 +	exit ;;
      sparc*:BSD/OS:*:*)
  	echo sparc-unknown-bsdi${UNAME_RELEASE}
 -	exit 0 ;;
 +	exit ;;
      *:BSD/OS:*:*)
  	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
 -	exit 0 ;;
 +	exit ;;
      *:FreeBSD:*:*)
--	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
 -	exit 0 ;;
 -    *:OpenBSD:*:*)
 -	echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
 -	exit 0 ;;
++	case ${UNAME_MACHINE} in
++	    pc98)
++		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
++	    *)
++		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
++	esac
 +	exit ;;
      i*:CYGWIN*:*)
  	echo ${UNAME_MACHINE}-pc-cygwin
 -	exit 0 ;;
 +	exit ;;
      i*:MINGW*:*)
  	echo ${UNAME_MACHINE}-pc-mingw32
 -	exit 0 ;;
 +	exit ;;
++    i*:MSYS_NT-*:*:*)
++	echo ${UNAME_MACHINE}-pc-mingw32
++	exit ;;
 +    i*:windows32*:*)
 +    	# uname -m includes "-pc" on this system.
 +    	echo ${UNAME_MACHINE}-mingw32
 +	exit ;;
      i*:PW*:*)
  	echo ${UNAME_MACHINE}-pc-pw32
 -	exit 0 ;;
 +	exit ;;
-     x86:Interix*:[34]*)
- 	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
++    x86:Interix*:[345]*)
++	echo i586-pc-interix${UNAME_RELEASE}
++	exit ;;
++    EM64T:Interix*:[345]*)
++	echo x86_64-unknown-interix${UNAME_RELEASE}
 +	exit ;;
 +    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
 +	echo i${UNAME_MACHINE}-pc-mks
 +	exit ;;
      i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
  	# How do we know it's Interix rather than the generic POSIX subsystem?
  	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
  	# UNAME_MACHINE based on the output of uname instead of i386?
 -	echo i386-pc-interix
 -	exit 0 ;;
 +	echo i586-pc-interix
 +	exit ;;
      i*:UWIN*:*)
  	echo ${UNAME_MACHINE}-pc-uwin
 -	exit 0 ;;
 +	exit ;;
 +    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
 +	echo x86_64-unknown-cygwin
 +	exit ;;
      p*:CYGWIN*:*)
  	echo powerpcle-unknown-cygwin
 -	exit 0 ;;
 +	exit ;;
      prep*:SunOS:5.*:*)
  	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 -	exit 0 ;;
 +	exit ;;
      *:GNU:*:*)
 +	# the GNU system
  	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
 -	exit 0 ;;
 +	exit ;;
 +    *:GNU/*:*:*)
 +	# other systems with GNU libc and userland
 +	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
 +	exit ;;
      i*86:Minix:*:*)
  	echo ${UNAME_MACHINE}-pc-minix
 -	exit 0 ;;
 +	exit ;;
      arm*:Linux:*:*)
  	echo ${UNAME_MACHINE}-unknown-linux-gnu
 -	exit 0 ;;
 +	exit ;;
 +    cris:Linux:*:*)
 +	echo cris-axis-linux-gnu
 +	exit ;;
 +    crisv32:Linux:*:*)
 +	echo crisv32-axis-linux-gnu
 +	exit ;;
 +    frv:Linux:*:*)
 +    	echo frv-unknown-linux-gnu
 +	exit ;;
      ia64:Linux:*:*)
 -	echo ${UNAME_MACHINE}-unknown-linux
 -	exit 0 ;;
 +	echo ${UNAME_MACHINE}-unknown-linux-gnu
 +	exit ;;
 +    m32r*:Linux:*:*)
 +	echo ${UNAME_MACHINE}-unknown-linux-gnu
 +	exit ;;
      m68*:Linux:*:*)
  	echo ${UNAME_MACHINE}-unknown-linux-gnu
 -	exit 0 ;;
 +	exit ;;
      mips:Linux:*:*)
 -	cat >$dummy.c <<EOF
 -#ifdef __cplusplus
 -#include <stdio.h>  /* for printf() prototype */
 -int main (int argc, char *argv[]) {
 -#else
 -int main (argc, argv) int argc; char *argv[]; {
 -#endif
 -#ifdef __MIPSEB__
 -  printf ("%s-unknown-linux-gnu\n", argv[1]);
 -#endif
 -#ifdef __MIPSEL__
 -  printf ("%sel-unknown-linux-gnu\n", argv[1]);
 -#endif
 -  return 0;
 -}
 +	eval $set_cc_for_build
 +	sed 's/^	//' << EOF >$dummy.c
 +	#undef CPU
 +	#undef mips
 +	#undef mipsel
 +	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
 +	CPU=mipsel
 +	#else
 +	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
 +	CPU=mips
 +	#else
 +	CPU=
 +	#endif
 +	#endif
  EOF
- 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
 -	$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0
 -	rm -f $dummy.c $dummy
++	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
++	    /^CPU/{
++		s: ::g
++		p
++	    }'`"
 +	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
  	;;
 -    ppc:Linux:*:*)
 -	# Determine Lib Version
 -	cat >$dummy.c <<EOF
 -#include <features.h>
 -#if defined(__GLIBC__)
 -extern char __libc_version[];
 -extern char __libc_release[];
 -#endif
 -main(argc, argv)
 -     int argc;
 -     char *argv[];
 -{
 -#if defined(__GLIBC__)
 -  printf("%s %s\n", __libc_version, __libc_release);
 -#else
 -  printf("unknown\n");
 -#endif
 -  return 0;
 -}
 +    mips64:Linux:*:*)
 +	eval $set_cc_for_build
 +	sed 's/^	//' << EOF >$dummy.c
 +	#undef CPU
 +	#undef mips64
 +	#undef mips64el
 +	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
 +	CPU=mips64el
 +	#else
 +	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
 +	CPU=mips64
 +	#else
 +	CPU=
 +	#endif
 +	#endif
  EOF
- 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
 -	LIBC=""
 -	$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null
 -	if test "$?" = 0 ; then
 -		./$dummy | grep 1\.99 > /dev/null
 -		if test "$?" = 0 ; then LIBC="libc1" ; fi
 -	fi
 -	rm -f $dummy.c $dummy
 -	echo powerpc-unknown-linux-gnu${LIBC}
 -	exit 0 ;;
++	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
++	    /^CPU/{
++		s: ::g
++		p
++	    }'`"
 +	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 +	;;
 +    or32:Linux:*:*)
 +	echo or32-unknown-linux-gnu
 +	exit ;;
 +    ppc:Linux:*:*)
 +	echo powerpc-unknown-linux-gnu
 +	exit ;;
 +    ppc64:Linux:*:*)
 +	echo powerpc64-unknown-linux-gnu
 +	exit ;;
      alpha:Linux:*:*)
 -	cat <<EOF >$dummy.s
 -	  .data
 -	  \$Lformat:
 -		.byte 37,100,45,37,120,10,0	# "%d-%x\n"
 -	   .text
 -		.globl main
 -		.align 4
 -		.ent main
 -	    main:
 -		.frame \$30,16,\$26,0
 -		ldgp \$29,0(\$27)
 -		.prologue 1
 -		.long 0x47e03d80 # implver \$0
 -		lda \$2,-1
 -		.long 0x47e20c21 # amask \$2,\$1
 -		lda \$16,\$Lformat
 -		mov \$0,\$17
 -		not \$1,\$18
 -		jsr \$26,printf
 -		ldgp \$29,0(\$26)
 -		mov 0,\$16
 -		jsr \$26,exit
 -		.end main
 -EOF
 -	LIBC=""
 -	$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
 -	if test "$?" = 0 ; then
 -		case `./$dummy` in
 -		0-0)	UNAME_MACHINE="alpha" ;;
 -		1-0)	UNAME_MACHINE="alphaev5" ;;
 -		1-1)    UNAME_MACHINE="alphaev56" ;;
 -		1-101)	UNAME_MACHINE="alphapca56" ;;
 -		2-303)	UNAME_MACHINE="alphaev6" ;;
 -		2-307)	UNAME_MACHINE="alphaev67" ;;
 -		esac
 -		objdump --private-headers $dummy | \
 -		  grep ld.so.1 > /dev/null
 -		if test "$?" = 0 ; then
 -			LIBC="libc1"
 -		fi
 -	fi
 -	rm -f $dummy.s $dummy
 +	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
 +	  EV5)   UNAME_MACHINE=alphaev5 ;;
 +	  EV56)  UNAME_MACHINE=alphaev56 ;;
 +	  PCA56) UNAME_MACHINE=alphapca56 ;;
 +	  PCA57) UNAME_MACHINE=alphapca56 ;;
 +	  EV6)   UNAME_MACHINE=alphaev6 ;;
 +	  EV67)  UNAME_MACHINE=alphaev67 ;;
 +	  EV68*) UNAME_MACHINE=alphaev68 ;;
 +        esac
 +	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
 +	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
  	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
 -	exit 0 ;;
 +	exit ;;
      parisc:Linux:*:* | hppa:Linux:*:*)
  	# Look for CPU level
  	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
@@@ -903,90 -863,93 +925,97 @@@
  	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
  	  *)    echo hppa-unknown-linux-gnu ;;
  	esac
 -	exit 0 ;;
 +	exit ;;
      parisc64:Linux:*:* | hppa64:Linux:*:*)
  	echo hppa64-unknown-linux-gnu
 -	exit 0 ;;
 +	exit ;;
      s390:Linux:*:* | s390x:Linux:*:*)
  	echo ${UNAME_MACHINE}-ibm-linux
 -	exit 0 ;;
 +	exit ;;
 +    sh64*:Linux:*:*)
 +    	echo ${UNAME_MACHINE}-unknown-linux-gnu
 +	exit ;;
      sh*:Linux:*:*)
  	echo ${UNAME_MACHINE}-unknown-linux-gnu
 -	exit 0 ;;
 +	exit ;;
      sparc:Linux:*:* | sparc64:Linux:*:*)
  	echo ${UNAME_MACHINE}-unknown-linux-gnu
 -	exit 0 ;;
 +	exit ;;
++    vax:Linux:*:*)
++	echo ${UNAME_MACHINE}-dec-linux-gnu
++	exit ;;
      x86_64:Linux:*:*)
  	echo x86_64-unknown-linux-gnu
 -	exit 0 ;;
 +	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
  	# problems with other programs or directories called `ld' in the path.
 -	ld_supported_emulations=`cd /; ld --help 2>&1 \
 -			 | sed -ne '/supported emulations:/!d
 +	# Set LC_ALL=C to ensure ld outputs messages in English.
 +	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
 +			 | sed -ne '/supported targets:/!d
  				    s/[ 	][ 	]*/ /g
 -				    s/.*supported emulations: *//
 +				    s/.*supported targets: *//
  				    s/ .*//
  				    p'`
 -        case "$ld_supported_emulations" in
 -	  i*86linux)
 -		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
 -		exit 0
 -		;;
 -	  elf_i*86)
 +        case "$ld_supported_targets" in
 +	  elf32-i386)
  		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
  		;;
 -	  i*86coff)
 +	  a.out-i386-linux)
 +		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
 +		exit ;;
 +	  coff-i386)
  		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
 -		exit 0
 -		;;
 -	esac
 -	# Either a pre-BFD a.out linker (linux-gnuoldld)
 -	# or one that does not give us useful --help.
 -	# GCC wants to distinguish between linux-gnuoldld and linux-gnuaout.
 -	# If ld does not provide *any* "supported emulations:"
 -	# that means it is gnuoldld.
 -	test -z "$ld_supported_emulations" && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0
 -	case "${UNAME_MACHINE}" in
 -	i*86)
 -	  VENDOR=pc;
 -	  ;;
 -	*)
 -	  VENDOR=unknown;
 -	  ;;
 +		exit ;;
 +	  "")
 +		# Either a pre-BFD a.out linker (linux-gnuoldld) or
 +		# one that does not give us useful --help.
 +		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
 +		exit ;;
  	esac
  	# Determine whether the default compiler is a.out or elf
 -	cat >$dummy.c <<EOF
 -#include <features.h>
 -#ifdef __cplusplus
 -#include <stdio.h>  /* for printf() prototype */
 -	int main (int argc, char *argv[]) {
 -#else
 -	int main (argc, argv) int argc; char *argv[]; {
 -#endif
 -#ifdef __ELF__
 -# ifdef __GLIBC__
 -#  if __GLIBC__ >= 2
 -    printf ("%s-${VENDOR}-linux-gnu\n", argv[1]);
 -#  else
 -    printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
 -#  endif
 -# else
 -   printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
 -# endif
 -#else
 -  printf ("%s-${VENDOR}-linux-gnuaout\n", argv[1]);
 -#endif
 -  return 0;
 -}
 +	eval $set_cc_for_build
 +	sed 's/^	//' << EOF >$dummy.c
 +	#include <features.h>
 +	#ifdef __ELF__
 +	# ifdef __GLIBC__
 +	#  if __GLIBC__ >= 2
 +	LIBC=gnu
 +	#  else
 +	LIBC=gnulibc1
 +	#  endif
 +	# else
 +	LIBC=gnulibc1
 +	# endif
 +	#else
- 	#ifdef __INTEL_COMPILER
++	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__sun)
 +	LIBC=gnu
 +	#else
 +	LIBC=gnuaout
 +	#endif
 +	#endif
 +	#ifdef __dietlibc__
 +	LIBC=dietlibc
 +	#endif
  EOF
- 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
 -	$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0
 -	rm -f $dummy.c $dummy
 -	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
++	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
++	    /^LIBC/{
++		s: ::g
++		p
++	    }'`"
 +	test x"${LIBC}" != x && {
 +		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
 +		exit
 +	}
 +	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
  	;;
 -# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.  earlier versions
 -# are messed up and put the nodename in both sysname and nodename.
      i*86:DYNIX/ptx:4*:*)
 +	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
 +	# earlier versions are messed up and put the nodename in both
 +	# sysname and nodename.
  	echo i386-sequent-sysv4
 -	exit 0 ;;
 +	exit ;;
      i*86:UNIX_SV:4.2MP:2.*)
          # Unixware is an offshoot of SVR4, but it has its own version
          # number series starting with 2...
@@@ -1157,65 -1092,52 +1186,64 @@@
  	else
  	        echo mips-unknown-sysv${UNAME_RELEASE}
  	fi
 -        exit 0 ;;
 +        exit ;;
      BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
  	echo powerpc-be-beos
 -	exit 0 ;;
 +	exit ;;
      BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
  	echo powerpc-apple-beos
 -	exit 0 ;;
 +	exit ;;
      BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
  	echo i586-pc-beos
 -	exit 0 ;;
 +	exit ;;
      SX-4:SUPER-UX:*:*)
  	echo sx4-nec-superux${UNAME_RELEASE}
 -	exit 0 ;;
 +	exit ;;
      SX-5:SUPER-UX:*:*)
  	echo sx5-nec-superux${UNAME_RELEASE}
 -	exit 0 ;;
 +	exit ;;
 +    SX-6:SUPER-UX:*:*)
 +	echo sx6-nec-superux${UNAME_RELEASE}
 +	exit ;;
      Power*:Rhapsody:*:*)
  	echo powerpc-apple-rhapsody${UNAME_RELEASE}
 -	exit 0 ;;
 +	exit ;;
      *:Rhapsody:*:*)
  	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
 -	exit 0 ;;
 +	exit ;;
      *:Darwin:*:*)
 -	echo `uname -p`-apple-darwin${UNAME_RELEASE}
 -	exit 0 ;;
 +	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
 +	case $UNAME_PROCESSOR in
- 	    *86) UNAME_PROCESSOR=i686 ;;
 +	    unknown) UNAME_PROCESSOR=powerpc ;;
 +	esac
 +	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
 +	exit ;;
      *:procnto*:*:* | *:QNX:[0123456789]*:*)
 -	if test "${UNAME_MACHINE}" = "x86pc"; then
 +	UNAME_PROCESSOR=`uname -p`
 +	if test "$UNAME_PROCESSOR" = "x86"; then
 +		UNAME_PROCESSOR=i386
  		UNAME_MACHINE=pc
  	fi
 -	echo `uname -p`-${UNAME_MACHINE}-nto-qnx
 -	exit 0 ;;
 +	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
 +	exit ;;
      *:QNX:*:4*)
  	echo i386-pc-qnx
 -	exit 0 ;;
 -    NSR-[KW]:NONSTOP_KERNEL:*:*)
 +	exit ;;
 +    NSE-?:NONSTOP_KERNEL:*:*)
 +	echo nse-tandem-nsk${UNAME_RELEASE}
 +	exit ;;
 +    NSR-?:NONSTOP_KERNEL:*:*)
  	echo nsr-tandem-nsk${UNAME_RELEASE}
 -	exit 0 ;;
 +	exit ;;
      *:NonStop-UX:*:*)
  	echo mips-compaq-nonstopux
 -	exit 0 ;;
 +	exit ;;
      BS2000:POSIX*:*:*)
  	echo bs2000-siemens-sysv
 -	exit 0 ;;
 +	exit ;;
      DS/*:UNIX_System_V:*:*)
  	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
 -	exit 0 ;;
 +	exit ;;
      *:Plan9:*:*)
  	# "uname -m" is not consistent, so use $cputype instead. 386
  	# is converted to i386 for consistency with other x86
@@@ -1226,44 -1148,30 +1254,47 @@@
  	    UNAME_MACHINE="$cputype"
  	fi
  	echo ${UNAME_MACHINE}-unknown-plan9
 -	exit 0 ;;
 -    i*86:OS/2:*:*)
 -	# If we were able to find `uname', then EMX Unix compatibility
 -	# is probably installed.
 -	echo ${UNAME_MACHINE}-pc-os2-emx
 -	exit 0 ;;
 +	exit ;;
      *:TOPS-10:*:*)
  	echo pdp10-unknown-tops10
 -	exit 0 ;;
 +	exit ;;
      *:TENEX:*:*)
  	echo pdp10-unknown-tenex
 -	exit 0 ;;
 +	exit ;;
      KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
  	echo pdp10-dec-tops20
 -	exit 0 ;;
 +	exit ;;
      XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
  	echo pdp10-xkl-tops20
 -	exit 0 ;;
 +	exit ;;
      *:TOPS-20:*:*)
  	echo pdp10-unknown-tops20
 -	exit 0 ;;
 +	exit ;;
      *:ITS:*:*)
  	echo pdp10-unknown-its
 -	exit 0 ;;
 +	exit ;;
 +    SEI:*:*:SEIUX)
 +        echo mips-sei-seiux${UNAME_RELEASE}
 +	exit ;;
 +    *:DragonFly:*:*)
 +	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
 +	exit ;;
 +    *:*VMS:*:*)
 +    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
 +	case "${UNAME_MACHINE}" in
 +	    A*) echo alpha-dec-vms ; exit ;;
 +	    I*) echo ia64-dec-vms ; exit ;;
 +	    V*) echo vax-dec-vms ; exit ;;
 +	esac ;;
 +    *:XENIX:*:SysV)
 +	echo i386-pc-xenix
 +	exit ;;
 +    i*86:skyos:*:*)
 +	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
 +	exit ;;
++    i*86:rdos:*:*)
++	echo ${UNAME_MACHINE}-pc-rdos
++	exit ;;
  esac
  
  #echo '(No uname command or uname output not recognized.)' 1>&2
diff --cc config.sub
index 1c366df,a06a480..ad9f395
mode 100755,100644..100644
--- a/config.sub
+++ b/config.sub
@@@ -1,9 -1,9 +1,9 @@@
  #! /bin/sh
  # Configuration validation subroutine script.
 -#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 -#   Free Software Foundation, Inc.
 +#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 +#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
  
- timestamp='2005-07-08'
 -timestamp='2001-04-20'
++timestamp='2006-02-23'
  
  # This file is (in principle) common to ALL GNU software.
  # The presence of a machine in this file suggests that SOME GNU software
@@@ -119,8 -117,7 +119,9 @@@ esa
  # Here we must recognize all the valid KERNEL-OS combinations.
  maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
  case $maybe_os in
-   nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
-   kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
 -  nto-qnx* | linux-gnu* | storm-chaos* | os2-emx*)
++  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
++  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
++  storm-chaos* | os2-emx* | rtmk-nova*)
      os=-$maybe_os
      basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
      ;;
@@@ -171,6 -160,6 +172,10 @@@ case $os i
  	-hiux*)
  		os=-hiuxwe2
  		;;
++	-sco6)
++		os=-sco5v6
++		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
++		;;
  	-sco5)
  		os=-sco3.2v5
  		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@@ -187,6 -176,6 +192,10 @@@
  		# Don't forget version if it is 3.2v4 or newer.
  		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
  		;;
++	-sco5v6*)
++		# Don't forget version if it is 3.2v4 or newer.
++		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
++		;;
  	-sco*)
  		os=-sco3.2v2
  		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@@ -226,57 -215,26 +235,58 @@@ esa
  case $basic_machine in
  	# Recognize the basic CPU types without company name.
  	# Some are omitted here because they have special meanings below.
 -	tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc \
 -	        | arm | arme[lb] | arm[bl]e | armv[2345] | armv[345][lb] | strongarm | xscale \
 -		| pyramid | mn10200 | mn10300 | tron | a29k \
 -		| 580 | i960 | h8300 \
 -		| x86 | ppcbe | mipsbe | mipsle | shbe | shle \
 -		| hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \
 -		| hppa64 \
 -		| alpha | alphaev[4-8] | alphaev56 | alphapca5[67] \
 -		| alphaev6[78] \
 -		| we32k | ns16k | clipper | i370 | sh | sh[34] \
 -		| powerpc | powerpcle \
 -		| 1750a | dsp16xx | pdp10 | pdp11 \
 -		| mips16 | mips64 | mipsel | mips64el \
 -		| mips64orion | mips64orionel | mipstx39 | mipstx39el \
 -		| mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \
 -		| mips64vr5000 | miprs64vr5000el | mcore | s390 | s390x \
 -		| sparc | sparclet | sparclite | sparc64 | sparcv9 | sparcv9b \
 -		| v850 | c4x \
 -		| thumb | d10v | d30v | fr30 | avr | openrisc | tic80 \
 -		| pj | pjl | h8500)
 +	1750a | 580 \
 +	| a29k \
 +	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
 +	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
 +	| am33_2.0 \
 +	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
 +	| bfin \
 +	| c4x | clipper \
 +	| d10v | d30v | dlx | dsp16xx \
 +	| fr30 | frv \
 +	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 +	| i370 | i860 | i960 | ia64 \
 +	| ip2k | iq2000 \
- 	| m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
++	| m32r | m32rle | m68000 | m68k | m88k | maxq | mb | microblaze | mcore \
 +	| mips | mipsbe | mipseb | mipsel | mipsle \
 +	| mips16 \
 +	| mips64 | mips64el \
 +	| mips64vr | mips64vrel \
 +	| mips64orion | mips64orionel \
 +	| mips64vr4100 | mips64vr4100el \
 +	| mips64vr4300 | mips64vr4300el \
 +	| mips64vr5000 | mips64vr5000el \
 +	| mips64vr5900 | mips64vr5900el \
 +	| mipsisa32 | mipsisa32el \
 +	| mipsisa32r2 | mipsisa32r2el \
 +	| mipsisa64 | mipsisa64el \
 +	| mipsisa64r2 | mipsisa64r2el \
 +	| mipsisa64sb1 | mipsisa64sb1el \
 +	| mipsisa64sr71k | mipsisa64sr71kel \
 +	| mipstx39 | mipstx39el \
 +	| mn10200 | mn10300 \
- 	| ms1 \
++	| mt \
 +	| msp430 \
++	| nios | nios2 \
 +	| ns16k | ns32k \
 +	| or32 \
 +	| pdp10 | pdp11 | pj | pjl \
 +	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 +	| pyramid \
 +	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
 +	| sh64 | sh64le \
 +	| sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
 +	| sparcv8 | sparcv9 | sparcv9b \
 +	| strongarm \
 +	| tahoe | thumb | tic4x | tic80 | tron \
 +	| v850 | v850e \
 +	| we32k \
 +	| x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
 +	| z8k)
 +		basic_machine=$basic_machine-unknown
 +		;;
 +	m32c)
  		basic_machine=$basic_machine-unknown
  		;;
  	m6811 | m68hc11 | m6812 | m68hc12)
@@@ -284,8 -242,8 +294,11 @@@
  		basic_machine=$basic_machine-unknown
  		os=-none
  		;;
 -	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | w65)
 +	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
 +		;;
++	ms1)
++		basic_machine=mt-unknown
+ 		;;
  
  	# We use `pc' rather than `unknown'
  	# because (1) that's what they normally are, and
@@@ -299,67 -257,31 +312,68 @@@
  		exit 1
  		;;
  	# Recognize the basic CPU types with company name.
 -	# FIXME: clean up the formatting here.
 -	vax-* | tahoe-* | i*86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \
 -	      | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | c[123]* \
 -	      | arm-*  | armbe-* | armle-* | armv*-* | strongarm-* | xscale-* \
 -	      | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
 -	      | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \
 -	      | xmp-* | ymp-* \
 -	      | x86-* | ppcbe-* | mipsbe-* | mipsle-* | shbe-* | shle-* \
 -	      | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* \
 -	      | hppa2.0n-* | hppa64-* \
 -	      | alpha-* | alphaev[4-8]-* | alphaev56-* | alphapca5[67]-* \
 -	      | alphaev6[78]-* \
 -	      | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \
 -	      | clipper-* | orion-* \
 -	      | sparclite-* | pdp10-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
 -	      | sparc64-* | sparcv9-* | sparcv9b-* | sparc86x-* \
 -	      | mips16-* | mips64-* | mipsel-* \
 -	      | mips64el-* | mips64orion-* | mips64orionel-* \
 -	      | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \
 -	      | mipstx39-* | mipstx39el-* | mcore-* \
 -	      | f30[01]-* | f700-* | s390-* | s390x-* | sv1-* | t3e-* \
 -	      | [cjt]90-* \
 -	      | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \
 -	      | thumb-* | v850-* | d30v-* | tic30-* | tic80-* | c30-* | fr30-* \
 -	      | bs2000-* | tic54x-* | c54x-* | x86_64-* | pj-* | pjl-*)
 +	580-* \
 +	| a29k-* \
 +	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
 +	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
 +	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
 +	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
 +	| avr-* \
 +	| bfin-* | bs2000-* \
 +	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
 +	| clipper-* | craynv-* | cydra-* \
 +	| d10v-* | d30v-* | dlx-* \
 +	| elxsi-* \
 +	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
 +	| h8300-* | h8500-* \
 +	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
 +	| i*86-* | i860-* | i960-* | ia64-* \
 +	| ip2k-* | iq2000-* \
 +	| m32r-* | m32rle-* \
 +	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
 +	| m88110-* | m88k-* | maxq-* | mcore-* \
 +	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
 +	| mips16-* \
 +	| mips64-* | mips64el-* \
 +	| mips64vr-* | mips64vrel-* \
 +	| mips64orion-* | mips64orionel-* \
 +	| mips64vr4100-* | mips64vr4100el-* \
 +	| mips64vr4300-* | mips64vr4300el-* \
 +	| mips64vr5000-* | mips64vr5000el-* \
 +	| mips64vr5900-* | mips64vr5900el-* \
 +	| mipsisa32-* | mipsisa32el-* \
 +	| mipsisa32r2-* | mipsisa32r2el-* \
 +	| mipsisa64-* | mipsisa64el-* \
 +	| mipsisa64r2-* | mipsisa64r2el-* \
 +	| mipsisa64sb1-* | mipsisa64sb1el-* \
 +	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
 +	| mipstx39-* | mipstx39el-* \
 +	| mmix-* \
- 	| ms1-* \
++	| mt-* \
 +	| msp430-* \
++	| nios-* | nios2-* \
 +	| none-* | np1-* | ns16k-* | ns32k-* \
 +	| orion-* \
 +	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 +	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
 +	| pyramid-* \
 +	| romp-* | rs6000-* \
 +	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
 +	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
 +	| sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
 +	| sparclite-* \
 +	| sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
 +	| tahoe-* | thumb-* \
 +	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
 +	| tron-* \
 +	| v850-* | v850e-* | vax-* \
 +	| we32k-* \
 +	| x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
 +	| xstormy16-* | xtensa-* \
 +	| ymp-* \
 +	| z8k-*)
 +		;;
 +	m32c-*)
  		;;
  	# Recognize the various machine names and aliases which stand
  	# for a CPU type and a company and sometimes even an OS.
@@@ -696,6 -594,6 +710,9 @@@
  		basic_machine=i386-pc
  		os=-msdos
  		;;
++	ms1-*)
++		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
++		;;
  	mvs)
  		basic_machine=i370-ibm
  		os=-mvs
@@@ -800,22 -691,19 +817,28 @@@
  	pbb)
  		basic_machine=m68k-tti
  		;;
 -        pc532 | pc532-*)
 +	pc532 | pc532-*)
  		basic_machine=ns32k-pc532
  		;;
 -	pentium | p5 | k5 | k6 | nexgen)
++	pc98)
++		basic_machine=i386-pc
++		;;
++	pc98-*)
++		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
++		;;
 +	pentium | p5 | k5 | k6 | nexgen | viac3)
  		basic_machine=i586-pc
  		;;
 -	pentiumpro | p6 | 6x86 | athlon)
 +	pentiumpro | p6 | 6x86 | athlon | athlon_*)
  		basic_machine=i686-pc
  		;;
 -	pentiumii | pentium2)
 +	pentiumii | pentium2 | pentiumiii | pentium3)
  		basic_machine=i686-pc
  		;;
 -	pentium-* | p5-* | k5-* | k6-* | nexgen-*)
 +	pentium4)
 +		basic_machine=i786-pc
 +		;;
 +	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
  		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
  		;;
  	pentiumpro-* | p6-* | 6x86-* | athlon-*)
@@@ -859,6 -734,6 +882,10 @@@
  		basic_machine=i586-unknown
  		os=-pw32
  		;;
++	rdos)
++		basic_machine=i386-pc
++		os=-rdos
++		;;
  	rom68k)
  		basic_machine=m68k-rom68k
  		os=-coff
@@@ -1174,21 -1014,15 +1201,23 @@@ case $os i
  	      | -aos* \
  	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
  	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
- 	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
 -	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
 -	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
++	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
++	      | -openbsd* | -solidbsd* \
 +	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
 +	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
  	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
  	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 +	      | -chorusos* | -chorusrdb* \
  	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
- 	      | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
 -	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
 -	      | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
++	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
++	      | -uxpv* | -beos* | -mpeix* | -udk* \
 +	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
  	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
 -	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* | -os2*)
 +	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
 +	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 +	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 +	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
- 	      | -skyos* | -haiku*)
++	      | -skyos* | -haiku* | -rdos*)
  	# Remember, each alternative MUST END IN *, to match a version number.
  		;;
  	-qnx*)
diff --cc debian/changelog
index dfdb5b8,0000000..41ea460
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,253 -1,0 +1,267 @@@
++abook (0.5.6-1) unstable; urgency=low
++
++  * New upstream release.
++  * Updated config.{guess,sub}.
++  * Bumped Standards-Version to 3.7.2, no changes needed.
++  * Used debconf for mutt query inclusion instead of outdated upgrade note
++    that would only affect upgrades from oldstable (woody) (closes: #377633).
++  * new debconf translations: Romanian by Eddy Petrişor (closes: #380505),
++    Czech by Miroslav Kure, Brazilian Portuguese by Felipe Augusto van de
++    Wiel, Vietnamese by Clytie Siddall, Hungarian by Attila Szervñc, German by
++    myself.
++
++ -- Gerfried Fuchs <alfie@debian.org>  Wed, 02 Aug 2006 09:15:46 -0500
++
 +abook (0.5.5-1) unstable; urgency=low
 +
 +  * New upstream release.
 +  * New debconf translation:
 +    - Spanish by César Gómez Martín (closes: #333758)
 +  * Applied patch to fix some incorrect entries in the help screen.
 +  * Updated config.sub and config.guess.
 +
 + -- Gerfried Fuchs <alfie@debian.org>  Mon, 12 Dec 2005 12:35:38 +0100
 +
 +abook (0.5.4-3) unstable; urgency=low
 +
 +  * Added alternative for debconf-2.0 (closes: #331730)
 +  * Removed article from synopsis.
 +  * New debconf translation:
 +    - Swedish by Daniel Nylander (closes: #331292)
 +
 + -- Gerfried Fuchs <alfie@debian.org>  Mon, 10 Oct 2005 13:17:09 +0200
 +
 +abook (0.5.4-2) unstable; urgency=low
 +
 +  * The "lintian bugs R us" release:
 +    - Moved menu file from /usr/lib/menu to /usr/share/menu.
 +    - Removed bashism in postrm and config.
 +
 + -- Gerfried Fuchs <alfie@debian.org>  Mon, 05 Sep 2005 12:33:49 +0200
 +
 +abook (0.5.4-1) unstable; urgency=low
 +
 +  * New upstream release (closes: #314611)
 +  * Bumped standards version, no changes needed.
 +  * New debconf translation:
 +    - Vietnamese by Clytie Siddall (closes: #313019)
 +    - Italian by Luca Bruno (closes: #316911)
 +  * Changed Build-Depends from libreadline4-dev to
 +    libreadline5-dev | libreadline-dev (closes: #326392)
 +
 + -- Gerfried Fuchs <alfie@debian.org>  Mon, 05 Sep 2005 12:17:19 +0200
 +
 +abook (0.5.3-3) unstable; urgency=high
 +
 +  * New debconf translation:
 +    - Finnish by Matti Pöllä (closes: #303820)
 +    - Vietnamese by Clytie Siddall (closes: #307595)
 +
 + -- Gerfried Fuchs <alfie@debian.org>  Tue, 10 May 2005 12:42:58 +0200
 +
 +abook (0.5.3-2) unstable; urgency=low
 +
 +  * Updated config.sub and config.guess (closes: #299212)
 +
 + -- Gerfried Fuchs <alfie@debian.org>  Mon, 14 Mar 2005 14:38:39 +0100
 +
 +abook (0.5.3-1) unstable; urgency=medium
 +
 +  * New upstream release: fixes import from mutt aliases (closes: #254969)
 +
 + -- Gerfried Fuchs <alfie@debian.org>  Mon, 11 Oct 2004 10:19:14 +0200
 +
 +abook (0.5.2-3) unstable; urgency=medium
 +
 +  * Switched to libncursesw5-dev instead to support utf8 properly
 +    (closes: #271626)
 +
 + -- Gerfried Fuchs <alfie@debian.org>  Fri, 17 Sep 2004 16:02:51 +0200
 +
 +abook (0.5.2-2) unstable; urgency=low
 +
 +  * Updated watch file -- hope it works longer this time.
 +  * New debconf translations:
 +    - Catalan by Josep Monés i Teixidor (closes: #247151)
 +    - Czech by Ondra Kudlik (closes: #260615)
 +
 + -- Gerfried Fuchs <alfie@debian.org>  Mon,  3 May 2004 17:26:28 +0200
 +
 +abook (0.5.2-1) unstable; urgency=low
 +
 +  * New upstream release:
 +    - five custom fields added (closes: #158428)
 +    - abookrc manual page update (closes: #231909)
 +  * debian/menu: Quoted all the values
 +
 + -- Gerfried Fuchs <alfie@debian.org>  Mon, 19 Apr 2004 20:27:48 +0200
 +
 +abook (0.5.1-2) unstable; urgency=low
 +
 +  *  Added patch from Jaakko Heinonen to fix segfault in memory handling
 +     (closes: #226581)
 +  * Two new po-debconf translations:
 +    - Japanese done by Hideki Yamane (closes: #227389)
 +    - Danish done by Morten Brix Pedersen (closes: #227789)
 +
 + -- Gerfried Fuchs <alfie@debian.org>  Mon, 26 Jan 2004 13:53:34 +0000
 +
 +abook (0.5.1-1) unstable; urgency=low
 +
 +  * New upstream release (closes: #224901)
 +
 + -- Gerfried Fuchs <alfie@debian.org>  Thu, 25 Dec 2003 17:12:51 +0000
 +
 +abook (0.5.0-4) unstable; urgency=low
 +
 +  * Added Portuguese po-debconf translation,
 +    done by Bruno Rodrigues (closes: #216257)
 +
 + -- Gerfried Fuchs <alfie@debian.org>  Thu, 30 Oct 2003 11:15:32 +0000
 +
 +abook (0.5.0-3) unstable; urgency=low
 +
 +  * Added po-debconf translations:
 +    - Dutch by Michiel Sikkes (closes: #214001)
 +    - Russian by Ilgiz Kalmetev (closes: #214353)
 +    Thanks to you all.
 +
 + -- Gerfried Fuchs <alfie@debian.org>  Mon,  6 Oct 2003 08:52:34 +0000
 +
 +abook (0.5.0-2) unstable; urgency=low
 +
 +  * Added po-debconf translations:
 +    - Polish by Bartosz Zapalowski (closes: #208953)
 +    - Frensh by Pierre Machard (closes: #205120)
 +    - Brazilian Portuguese by Andre Luis Lopes (closes: #205838)
 +  * Updated to policy 3.6.1 (no changes needed).
 +
 + -- Gerfried Fuchs <alfie@debian.org>  Mon, 22 Sep 2003 10:42:44 +0000
 +
 +abook (0.5.0-1) unstable; urgency=low
 +
 +  * New upstream release (closes: #201836)
 +  * Updated to policy 3.6.0.
 +  * Build-Depends on libreadline4-dev now (closes: #136230, #163268)
 +    To get the old data simply press cursor up.
 +  * Added debconf hint message that old addressbook must be imported and
 +    can be deleted afterwards, location and format change.
 +  * de-debhelper-ized the package: DEB_BUILD_OPTIONS noopt and nostrip should
 +    be supported now, too.
 +  * removed emacs cruft from end of this file.
 +  * Add vim script into binary distribution, to contrib directory.
 +
 + -- Gerfried Fuchs <alfie@debian.org>  Thu, 07 Aug 2003 23:49:52 +0200
 +
 +abook (0.4.17-1) unstable; urgency=low
 +
 +  * New maintainer.
 +  * New upstream release (closes: #131309) which closes: #152905
 +  * debian/control:
 +    -) Removed fullstop from short description.
 +    -) Updated to policy 3.5.9
 +  * debian/rules:
 +    -) moved compat level into debian/compat
 +    -) moved example files into debian/examples
 +    -) removed comented out dh_ lines that never will make it into the package
 +  * debian/menu:
 +    -) added longtitle
 +  * added debian/watch file
 +
 + -- Gerfried Fuchs <alfie@debian.org>  Fri, 28 Mar 2003 11:52:20 +0100
 +
 +abook (0.4.16-1) unstable; urgency=low
 +
 +  * New upstream release
 +  * Closes: #129867, #133482
 +
 + -- Alan Ford <alan@whirlnet.co.uk>  Sun, 17 Mar 2002 14:51:50 +0000
 +
 +abook (0.4.15-1) unstable; urgency=low
 +
 +  * New upstream release. Closes: #131309
 +  * Added some contrib files in /usr/share/doc/abook/
 +
 + -- Alan Ford <alan@whirlnet.co.uk>  Sun,  4 Nov 2001 14:50:38 +0000
 +
 +abook (0.4.14-1) unstable; urgency=low
 +
 +  * New upstream release
 +
 + -- Alan Ford <alan@whirlnet.co.uk>  Sat, 29 Sep 2001 22:49:00 +0100
 +
 +abook (0.4.13-1) unstable; urgency=low
 +
 +  * New upstream release
 +
 + -- Alan Ford <alan@whirlnet.co.uk>  Wed, 20 Jun 2001 22:16:42 +0100
 +
 +abook (0.4.12-1) unstable; urgency=low
 +
 +  * New upstream release
 +
 + -- Alan Ford <alan@whirlnet.co.uk>  Tue, 20 Mar 2001 21:51:22 +0000
 +
 +abook (0.4.11-1) unstable; urgency=low
 +
 +  * New upstream release
 +
 + -- Alan Ford <alan@whirlnet.co.uk>  Tue,  2 Jan 2001 17:08:46 +0000
 +
 +abook (0.4.10-1) unstable; urgency=low
 +
 +  * New upstream release
 +  * Fixes segfault bug. Closes: #70083
 +
 + -- Alan Ford <alan@whirlnet.co.uk>  Sat, 16 Sep 2000 09:52:19 +0100
 +
 +abook (0.4.9-1) unstable; urgency=low
 +
 +  * New upstream release
 +
 + -- Alan Ford <alan@whirlnet.co.uk>  Thu, 27 Jul 2000 23:00:07 +0100
 +
 +abook (0.4.8-1) unstable; urgency=low
 +
 +  * New upstream release
 +
 + -- Alan Ford <alan@whirlnet.co.uk>  Wed, 21 Jun 2000 16:33:48 +0100
 +
 +abook (0.4.7-1) unstable; urgency=low
 +
 +  * New upstream release
 +
 + -- Alan Ford <alan@whirlnet.co.uk>  Sun, 28 May 2000 16:10:59 +0100
 +
 +abook (0.4.6-1) unstable; urgency=low
 +
 +  * New upstream release
 +  * Makes fields less US-specific. Closes: #62797
 +
 + -- Alan Ford <alan@whirlnet.co.uk>  Thu, 11 May 2000 20:03:40 +0100
 +
 +abook (0.4.5-1) unstable; urgency=low
 +
 +  * New upstream release
 +  * Removed generic INSTALL from doc directory. Closes: #62789
 +
 + -- Alan Ford <alan@whirlnet.co.uk>  Fri, 21 Apr 2000 11:50:59 +0100
 +
 +abook (0.4.4-1) unstable; urgency=low
 +
 +  * New upstream release
 +  * Fixes segfault bug. Closes: #62022
 +
 + -- Alan Ford <alan@whirlnet.co.uk>  Sun,  9 Apr 2000 10:39:06 +0100
 +
 +abook (0.4.3-1) unstable; urgency=low
 +
 +  * New upstream release
 +
 + -- Alan Ford <alan@whirlnet.co.uk>  Sun,  2 Apr 2000 12:06:23 +0100
 +
 +abook (0.4.2-1) unstable; urgency=low
 +
 +  * Initial Release.
 +
 + -- Alan Ford <alan@whirlnet.co.uk>  Sat, 18 Mar 2000 12:38:34 +0000
diff --cc debian/config
index 05bb732,0000000..5a2484f
mode 100644,000000..100644
--- a/debian/config
+++ b/debian/config
@@@ -1,17 -1,0 +1,16 @@@
 +#!/bin/sh -e
 +# config script for abook
 +
 +action=$1
 +version=$2
 +
 +# Source debconf library.
 +. /usr/share/debconf/confmodule
 +
- if [ "$action" = "configure" ] && [ -n "$version" ]; then
- 	if dpkg --compare-versions "$version" lt "0.5.0"; then
- 		db_input medium abook/files_moved || true
- 		db_go
- 	fi
- fi
++db_unregister abook/files_moved || true
++
++# create the /etc/Muttrc.d/ snippet?
++db_input medium abook/muttrc.d || true
++db_go
 +
 +exit 0
diff --cc debian/control
index aa525a9,0000000..27d24ca
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,15 -1,0 +1,15 @@@
 +Source: abook
 +Section: mail
 +Priority: optional
 +Maintainer: Gerfried Fuchs <alfie@debian.org>
- Standards-Version: 3.6.2
++Standards-Version: 3.7.2
 +Build-Depends: libncursesw5-dev, libreadline5-dev | libreadline-dev, po-debconf
 +
 +Package: abook
 +Architecture: any
 +Depends: ${shlibs:Depends}, ${misc:Depends}, debconf (>= 0.5) | debconf-2.0
 +Enhances: mutt
 +Description: text-based ncurses address book application
 + abook is a text-based ncurses address book application. It provides many
 + different fields of user info. abook is designed for use with mutt, but 
 + can be used independently.
diff --cc debian/po/cs.po
index 0f6ae31,0000000..9825e31
mode 100644,000000..100644
--- a/debian/po/cs.po
+++ b/debian/po/cs.po
@@@ -1,43 -1,0 +1,36 @@@
- # Translators, if you are not familiar with the PO format, gettext
- # documentation is worth reading, especially sections dedicated to
- # this format, e.g. by running:
- # info -n '(gettext)PO Files'
- # info -n '(gettext)Header Entry'
- # Some information specific to po-debconf are available at
- # /usr/share/doc/po-debconf/README-trans
- # or http://www.debian.org/intl/l10n/po-debconf/README-trans
- # Developers do not need to manually edit POT or PO files.
- # , fuzzy
- # Kepi <kepi@orthank.net>, 2004.
- # 
- # 
++# Czech translation of abook debconf templates.
++# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
++# This file is distributed under the same license as the abook package.
++# Miroslav Kure <kurem@debian.cz>, 2006.
++#
 +msgid ""
 +msgstr ""
- "Project-Id-Version: abook 0.5.2-1\n"
++"Project-Id-Version: abook\n"
 +"Report-Msgid-Bugs-To: abook@packages.debian.org\n"
- "POT-Creation-Date: 2004-06-09 18:46+0200\n"
- "PO-Revision-Date: 2004-07-21 14:02+0200\n"
- "Last-Translator: Ondra Kudlik <kepi@orthank.net>\n"
- "Language-Team: Czech <provoz@debian.cz>\n"
++"POT-Creation-Date: 2006-07-30 06:46-0500\n"
++"PO-Revision-Date: 2006-08-02 07:24-0500\n"
++"Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
++"Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
 +"MIME-Version: 1.0\n"
 +"Content-Type: text/plain; charset=UTF-8\n"
 +"Content-Transfer-Encoding: 8bit\n"
 +
- #. Type: note
++#. Type: boolean
 +#. Description
- #: ../templates:3
- msgid "Place of addressbook file changed, need to import the old one."
- msgstr "Místo uložení adresáře se změnilo, je potřeba importovat starý."
++#: ../templates:1001
++msgid "Do you want to enable abook system wide for mutt?"
++msgstr "Chcete celosystémově povolit v muttu podporu abooku?"
 +
- #. Type: note
++#. Type: boolean
 +#. Description
- #: ../templates:3
++#: ../templates:1001
 +msgid ""
- "From version 0.5.0 on abook uses a dot directory in your home directory to "
- "store its addressbook and abookrc file. The former even changed its format "
- "so you need to import your old file when you start abook after the upgrade."
++"abook offers the posibility to be used as query backend from within mutt.  "
++"If you acknowledge this question the package will create an /etc/Muttrc.d/"
++"abook.rc file that enables querying the abook database and adding mail "
++"addresses to abook with pressing \"A\" from pager mode."
 +msgstr ""
- "Od verze 0.5.0 používá abook k uložení seznamu adres a konfiguračního "
- "souboru adresář začínající tečkou ve vašem domovském adresáři. Předchozí "
- "seznam adres také změnil formát, takže je potřeba po aktualizaci v programu "
- "importovat váš starý soubor."
++"abook je možné používat rovnou z muttu jako úložiště kontaktů. Odpovíte-li "
++"kladně, balík vytvoří soubor /etc/Muttrc.d/abook.rc, ve kterém se povolí "
++"dotazování do databáze abooku a také možnost přidávání nových adres klávesou "
++"\"A\" z prohlížecího režimu."
diff --cc debian/po/de.po
index 3e621fc,0000000..8c23eca
mode 100644,000000..100644
--- a/debian/po/de.po
+++ b/debian/po/de.po
@@@ -1,45 -1,0 +1,45 @@@
 +#
 +#    Translators, if you are not familiar with the PO format, gettext
 +#    documentation is worth reading, especially sections dedicated to
 +#    this format, e.g. by running:
 +#         info -n '(gettext)PO Files'
 +#         info -n '(gettext)Header Entry'
 +#
 +#    Some information specific to po-debconf are available at
 +#            /usr/share/doc/po-debconf/README-trans
 +#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
 +#
 +#    Developers do not need to manually edit POT or PO files.
 +#
 +msgid ""
 +msgstr ""
 +"Project-Id-Version: abook 0.5.0\n"
 +"Report-Msgid-Bugs-To: abook@packages.debian.org\n"
- "POT-Creation-Date: 2004-06-09 18:46+0200\n"
- "PO-Revision-Date: 2003-08-07 21:50+0200\n"
++"POT-Creation-Date: 2006-07-30 06:46-0500\n"
++"PO-Revision-Date: 2006-08-02 07:24-0500\n"
 +"Last-Translator: Gerfried Fuchs <alfie@debian.org>\n"
 +"Language-Team: German <debian-l10n-german@lists.debian.org>\n"
 +"MIME-Version: 1.0\n"
 +"Content-Type: text/plain; charset=ISO-8859-15\n"
 +"Content-Transfer-Encoding: 8bit\n"
 +
- #. Type: note
++#. Type: boolean
 +#. Description
- #: ../templates:3
- msgid "Place of addressbook file changed, need to import the old one."
- msgstr ""
- "Der Ort der addressbook-Datei hat sich geändert, die alte muss importiert "
- "werden."
++#: ../templates:1001
++msgid "Do you want to enable abook system wide for mutt?"
++msgstr "Wollen Sie abook Systemweit in mutt aktivieren?"
 +
- #. Type: note
++#. Type: boolean
 +#. Description
- #: ../templates:3
++#: ../templates:1001
 +msgid ""
- "From version 0.5.0 on abook uses a dot directory in your home directory to "
- "store its addressbook and abookrc file. The former even changed its format "
- "so you need to import your old file when you start abook after the upgrade."
++"abook offers the posibility to be used as query backend from within mutt.  "
++"If you acknowledge this question the package will create an /etc/Muttrc.d/"
++"abook.rc file that enables querying the abook database and adding mail "
++"addresses to abook with pressing \"A\" from pager mode."
 +msgstr ""
- "Seit Version 0.5.0 verwendet abook ein Punkt-Verzeichnis in Ihrem Heimat-"
- "Verzeichnis, um seine addressbook und abookrc Dateien zu speichern. Es hat "
- "sich auch das Format der ersten Datei geändert, daher müssen Sie Ihre alte "
- "Datei importieren, wenn Sie abook nach der Aktualisierung starten."
++"abook bietet die Möglichkeit, als externe Adressenabfrage in mutt verwendet "
++"zu werden. Falls Sie dieser Frage zustimmen, wird das Paket eine /etc/Muttrc."
++"d/abook.rc-Datei erstellen, die die Abfrage der abook-Datenbank und das "
++"Hinzufügen von Adressen in abook durch Drücken von »A« im Pager-Modus "
++"aktiviert."
diff --cc debian/po/hu.po
index 0000000,0000000..9998bfb
new file mode 100644
--- /dev/null
+++ b/debian/po/hu.po
@@@ -1,0 -1,0 +1,34 @@@
++msgid ""
++msgstr ""
++"Project-Id-Version: \n"
++"Report-Msgid-Bugs-To: abook@packages.debian.org\n"
++"POT-Creation-Date: 2006-07-30 06:46-0500\n"
++"PO-Revision-Date: 2006-08-02 07:24-0500\n"
++"Last-Translator: SZERVÑC Attila <sas@321.hu>\n"
++"Language-Team: Hungarian <debian-l10n-hungarian@lists.debian.org>\n"
++"MIME-Version: 1.0\n"
++"Content-Type: text/plain; charset=utf-8\n"
++"Content-Transfer-Encoding: 8bit\n"
++"Plural-Forms: nplurals=1; plural=0;\n"
++"X-Poedit-Language: Hungarian\n"
++"X-Poedit-Country: HUNGARY\n"
++
++#. Type: boolean
++#. Description
++#: ../templates:1001
++msgid "Do you want to enable abook system wide for mutt?"
++msgstr "Engedélyezed az abook rendszer-szintű elérését a mutt számára?"
++
++#. Type: boolean
++#. Description
++#: ../templates:1001
++msgid ""
++"abook offers the posibility to be used as query backend from within mutt.  "
++"If you acknowledge this question the package will create an /etc/Muttrc.d/"
++"abook.rc file that enables querying the abook database and adding mail "
++"addresses to abook with pressing \"A\" from pager mode."
++msgstr ""
++"Az abook lehetővé teszi, hogy a mutt lekérdező motornak használja. Ha "
++"jóváhagyod e kérdést, a csomag létrehoz egy /etc/Muttrc.d/abook.rc fájlt, "
++"mely lehetővé teszi az abook adatbázis lekérdezését és email-címek "
++"hozzáadását az \"A\" gomb leütésével a lapozó módban."
diff --cc debian/po/pt_BR.po
index 6706661,0000000..3b55e9e
mode 100644,000000..100644
--- a/debian/po/pt_BR.po
+++ b/debian/po/pt_BR.po
@@@ -1,45 -1,0 +1,37 @@@
- #
- #    Translators, if you are not familiar with the PO format, gettext
- #    documentation is worth reading, especially sections dedicated to
- #    this format, e.g. by running:
- #         info -n '(gettext)PO Files'
- #         info -n '(gettext)Header Entry'
- #
- #    Some information specific to po-debconf are available at
- #            /usr/share/doc/po-debconf/README-trans
- #         or http://www.debian.org/intl/l10n/po-debconf/README-trans
- #
- #    Developers do not need to manually edit POT or PO files.
++# abook Brazilian Portuguese translation 
++# Copyright (C) 2006 THE PACKAGE'S COPYRIGHT HOLDER
++# This file is distributed under the same license as the abook package.
++# Felipe Augusto van de Wiel (faw) <faw@cathedrallabs.org>, 2006.
 +#
 +msgid ""
 +msgstr ""
- "Project-Id-Version: abook_0.5.0-1\n"
++"Project-Id-Version: abook\n"
 +"Report-Msgid-Bugs-To: abook@packages.debian.org\n"
- "POT-Creation-Date: 2004-06-09 18:46+0200\n"
- "PO-Revision-Date: 2003-08-16 21:12-0300\n"
- "Last-Translator: André Luís Lopes <andrelop@debian.org>\n"
- "Language-Team: Debian-BR Project <debian-l10n-portuguese@lists.debian.org>\n"
++"POT-Creation-Date: 2006-07-30 06:46-0500\n"
++"PO-Revision-Date: 2006-08-02 07:24-0500\n"
++"Last-Translator: Felipe Augusto van de Wiel (faw) <faw@cathedrallabs.org>\n"
++"Language-Team: l10n portuguese <debian-l10n-portuguese@lists.debian.org>\n"
 +"MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=ISO-8859-1\n"
++"Content-Type: text/plain; charset=UTF-8\n"
 +"Content-Transfer-Encoding: 8bit\n"
++"pt_BR UTF-8\n"
 +
- #. Type: note
++#. Type: boolean
 +#. Description
- #: ../templates:3
- msgid "Place of addressbook file changed, need to import the old one."
- msgstr ""
- "A localização do livro de endereços mudou, necessário importar o livro antigo"
++#: ../templates:1001
++msgid "Do you want to enable abook system wide for mutt?"
++msgstr "Você gostaria de ativar o abook para o mutt em todo o sistema?"
 +
- #. Type: note
++#. Type: boolean
 +#. Description
- #: ../templates:3
++#: ../templates:1001
 +msgid ""
- "From version 0.5.0 on abook uses a dot directory in your home directory to "
- "store its addressbook and abookrc file. The former even changed its format "
- "so you need to import your old file when you start abook after the upgrade."
++"abook offers the posibility to be used as query backend from within mutt.  "
++"If you acknowledge this question the package will create an /etc/Muttrc.d/"
++"abook.rc file that enables querying the abook database and adding mail "
++"addresses to abook with pressing \"A\" from pager mode."
 +msgstr ""
- "A partir da versão 0.5.0 o abook começou a utilizar um diretório iniciado "
- "por um ponto no diretório pessoal dos usuários para armazenar seu livro de "
- "endereço e o arquivo abookrc. O livro de endereços mudou seu formato, "
- "portanto é preciso importar seu arquivo antigo quando você iniciar o abook "
- "após a atualização."
++"abook oferece a possibilidade de ser usado como catálogo de consulta a "
++"partir do mutt. Se você aceitar esta opção, o pacote criará um arquivo /etc/"
++"Muttrc.d/abook.rc que ativará a consulta à base de dados abook e permitirá a "
++"adição de endereços de e-mail ao abook pressionando \"A\" no modo \"pager\"."
diff --cc debian/po/ro.po
index 0000000,0000000..a10123b
new file mode 100644
--- /dev/null
+++ b/debian/po/ro.po
@@@ -1,0 -1,0 +1,37 @@@
++# Romanian translation
++# This file is distributed under the same license as the abook package.
++#
++# Eddy Petrisor <eddy_petrisor@yahoo.com>, 2006.
++msgid ""
++msgstr ""
++"Project-Id-Version: abook\n"
++"Report-Msgid-Bugs-To: abook@packages.debian.org\n"
++"POT-Creation-Date: 2006-07-30 06:46-0500\n"
++"PO-Revision-Date: 2006-08-02 07:25-0500\n"
++"Last-Translator: Eddy Petrişor <eddy.petrisor@gmail.com>\n"
++"Language-Team: Romanian <debian-l10n-romanian@lists.debian.org>\n"
++"MIME-Version: 1.0\n"
++"Content-Type: text/plain; charset=UTF-8\n"
++"Content-Transfer-Encoding: 8bit\n"
++"X-Generator: KBabel 1.11.2\n"
++
++#. Type: boolean
++#. Description
++#: ../templates:1001
++msgid "Do you want to enable abook system wide for mutt?"
++msgstr "Doriţi să activaţi abook pentru mutt pe întregul sistem?"
++
++#. Type: boolean
++#. Description
++#: ../templates:1001
++msgid ""
++"abook offers the posibility to be used as query backend from within mutt.  "
++"If you acknowledge this question the package will create an /etc/Muttrc.d/"
++"abook.rc file that enables querying the abook database and adding mail "
++"addresses to abook with pressing \"A\" from pager mode."
++msgstr ""
++"abook oferă posibilitatea să fie folosit ca suport pentru interogări din "
++"mutt. Dacă răspundeţi afirmativ la această întrebare, pachetul va crea un "
++"fişier /etc/Muttrc.d/abook.rc care activează interogările asupra bazei de "
++"date abook şi care adaugă adresele de poştă electronică în abook la apăsarea "
++"tastei „A” din modul de paginaţie."
diff --cc debian/po/templates.pot
index fbfff2d,0000000..7f4a6b8
mode 100644,000000..100644
--- a/debian/po/templates.pot
+++ b/debian/po/templates.pot
@@@ -1,40 -1,0 +1,33 @@@
- #
- #    Translators, if you are not familiar with the PO format, gettext
- #    documentation is worth reading, especially sections dedicated to
- #    this format, e.g. by running:
- #         info -n '(gettext)PO Files'
- #         info -n '(gettext)Header Entry'
- #
- #    Some information specific to po-debconf are available at
- #            /usr/share/doc/po-debconf/README-trans
- #         or http://www.debian.org/intl/l10n/po-debconf/README-trans
- #
- #    Developers do not need to manually edit POT or PO files.
++# SOME DESCRIPTIVE TITLE.
++# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
++# This file is distributed under the same license as the abook package.
++# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 +#
 +#, fuzzy
 +msgid ""
 +msgstr ""
- "Project-Id-Version: abook 0.5.4-1\n"
++"Project-Id-Version: abook VERSION\n"
 +"Report-Msgid-Bugs-To: abook@packages.debian.org\n"
- "POT-Creation-Date: 2004-06-09 18:46+0200\n"
++"POT-Creation-Date: 2006-07-30 06:46-0500\n"
 +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 +"Language-Team: LANGUAGE <LL@li.org>\n"
 +"MIME-Version: 1.0\n"
 +"Content-Type: text/plain; charset=CHARSET\n"
 +"Content-Transfer-Encoding: 8bit\n"
 +
- #. Type: note
++#. Type: boolean
 +#. Description
- #: ../templates:3
- msgid "Place of addressbook file changed, need to import the old one."
++#: ../templates:1001
++msgid "Do you want to enable abook system wide for mutt?"
 +msgstr ""
 +
- #. Type: note
++#. Type: boolean
 +#. Description
- #: ../templates:3
++#: ../templates:1001
 +msgid ""
- "From version 0.5.0 on abook uses a dot directory in your home directory to "
- "store its addressbook and abookrc file. The former even changed its format "
- "so you need to import your old file when you start abook after the upgrade."
++"abook offers the posibility to be used as query backend from within mutt.  "
++"If you acknowledge this question the package will create an /etc/Muttrc.d/"
++"abook.rc file that enables querying the abook database and adding mail "
++"addresses to abook with pressing \"A\" from pager mode."
 +msgstr ""
diff --cc debian/po/vi.po
index d43ff92,0000000..e5bd15b
mode 100644,000000..100644
--- a/debian/po/vi.po
+++ b/debian/po/vi.po
@@@ -1,35 -1,0 +1,37 @@@
- # Vietnamese Translation for abook.
- # Copyright © 2005 Free Software Foundation, Inc.
- # Clytie Siddall <clytie@riverland.net.au>, 2005.
++# Vietnamese translation for abook (debconf).
++# Copyright © 2006 Free Software Foundation, Inc.
++# Clytie Siddall <clytie@riverland.net.au>, 2006.
 +#
 +msgid ""
 +msgstr ""
- "Project-Id-Version: abook 0.5.3-2\n"
++"Project-Id-Version: abook\n"
 +"Report-Msgid-Bugs-To: abook@packages.debian.org\n"
- "POT-Creation-Date: 2004-06-09 18:46+0200\n"
- "PO-Revision-Date: 2005-05-04 14:27+0930\n"
++"POT-Creation-Date: 2006-07-30 06:46-0500\n"
++"PO-Revision-Date: 2006-08-02 07:25-0500\n"
 +"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
- "Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\n"
++"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
 +"MIME-Version: 1.0\n"
 +"Content-Type: text/plain; charset=utf-8\n"
 +"Content-Transfer-Encoding: 8bit\n"
 +"Plural-Forms: nplurals=1; plural=0\n"
++"X-Generator: LocFactoryEditor 1.6b36\n"
 +
- #. Type: note
++#. Type: boolean
 +#. Description
- #: ../templates:3
- msgid "Place of addressbook file changed, need to import the old one."
- msgstr "Đã thay đổi vị trí tập tin sổ địa chỉ nên cần phải nạp sổ cũ."
++#: ../templates:1001
++msgid "Do you want to enable abook system wide for mutt?"
++msgstr "Bạn có muốn bật chạy abook cho mutt trên toàn bộ hệ thống không?"
 +
- #. Type: note
++#. Type: boolean
 +#. Description
- #: ../templates:3
++#: ../templates:1001
 +msgid ""
- "From version 0.5.0 on abook uses a dot directory in your home directory to "
- "store its addressbook and abookrc file. The former even changed its format "
- "so you need to import your old file when you start abook after the upgrade."
++"abook offers the posibility to be used as query backend from within mutt.  "
++"If you acknowledge this question the package will create an /etc/Muttrc.d/"
++"abook.rc file that enables querying the abook database and adding mail "
++"addresses to abook with pressing \"A\" from pager mode."
 +msgstr ""
- "Trong phiên bản 0.5.0 và sau, trình abook sử dụng một thư mục «chấm» trong "
- "thư mục chính của bạn, để cất giữ sổ địa chỉ và tập tin abookrc (tài nguyên) "
- "của nó. Đã thay đổi dạng sổ địa chỉ nên bạn cần phải nạp tập tin cũ khi khởi "
- "chạy abook sau khi nâng cấp."
++"Trình abook cung cấp khả năng chạy nó như là hậu phương truy vấn từ bên "
++"trong « mutt ». Nếu bạn đồng ý, gói này sẽ tạo tập tin tài nguyên </etc/"
++"Muttrc.d/abook.rc> sẽ cho bạn có khả năng truy vấn co sở dữ liệu abook, cũng "
++"thêm địa chỉ thư vào abook bằng cách bấm « A » trong chế độ máy nhắn tin."
diff --cc debian/postinst
index 0d8063c,0000000..fc02555
mode 100644,000000..100644
--- a/debian/postinst
+++ b/debian/postinst
@@@ -1,15 -1,0 +1,50 @@@
 +#!/bin/sh -e
 +# postinst for abook
 +
 +# Source debconf library.
 +if [ -e /usr/share/debconf/confmodule ]; then
 +	. /usr/share/debconf/confmodule
 +fi
 +
- if [ "$1" != configure ]; then
- 	exit 0
++action=$1
++if [ "${DEBCONF_RECONFIGURE}" = "1" ]; then
++	# workaround until reconfigure is really available
++	action=reconfigure
 +fi
++version=$2
 +
- if [ -x /usr/bin/update-menus ]; then
++# if we got reinstalled after a remove, enable the config snippet again
++if [ "$action" = 'configure' ] && [ -e /etc/Muttrc.d/abook.rc.removed ] && [ ! -e /etc/Muttrc.d/abook.rc ]; then
++	mv /etc/Muttrc.d/abook.rc.removed /etc/Muttrc.d/abook.rc || true
++fi
++
++# only on new install, upgrade from < 0.5.6 or reconfigure
++if dpkg --compare-versions "$version" lt "0.5.6" || [ "$action" = "reconfigure" ]; then
++	mutt=true
++	if [ -e /usr/share/debconf/confmodule ]; then
++		db_get abook/muttrc.d
++		mutt="$RET"
++	fi
++
++	case "$mutt" in
++	    true)
++		if [ ! -e /etc/Muttrc.d/abook.rc ] ; then
++			mkdir /etc/Muttrc.d 2> /dev/null || true
++			cat > /etc/Muttrc.d/abook.rc << EOF
++set query_command="abook --mutt-query '%s'"
++macro pager A |'abook --add-email'\n
++EOF
++		fi
++		;;
++	    false)
++		rm /etc/Muttrc.d/abook.rc 2> /dev/null || true
++		rmdir /etc/Muttrc.d 2> /dev/null || true
++		;;
++	esac
++fi
++
++
++# menu entry
++if [ "$action" = 'configure' ] && [ -x /usr/bin/update-menus ]; then
 +	update-menus
 +fi
diff --cc debian/postrm
index e6df067,0000000..76b3870
mode 100644,000000..100644
--- a/debian/postrm
+++ b/debian/postrm
@@@ -1,11 -1,0 +1,27 @@@
 +#!/bin/sh -e
 +# postrm for abook
 +
 +if [ -x "`which update-menus 2>/dev/null`" ]; then
 +	update-menus
 +fi
 +
- if [ "$1" = 'purge' ] && [ -e /usr/share/debconf/confmodule ]; then
- 	. /usr/share/debconf/confmodule
- 	db_purge
- fi
++action=$1
++
++case "$action" in
++    remove)
++	if [ ! -e /etc/Muttrc.d/abook.rc.removed ]; then
++		# only disable the config snippet
++		mv /etc/Muttrc.d/abook.rc /etc/Muttrc.d/abook.rc.removed || true
++	fi
++	;;
++    purge)
++	rm /etc/Muttrc.d/abook.rc.removed 2> /dev/null || true
++	rm /etc/Muttrc.d/abook.rc 2> /dev/null || true
++	rmdir /etc/Muttrc.d 2> /dev/null || true
++	# remove debconf data on purge
++	if [ -e /usr/share/debconf/confmodule ]; then
++		. /usr/share/debconf/confmodule
++		db_purge
++	fi
++	;;
++esac
diff --cc debian/templates
index eed02dd,0000000..8493ba5
mode 100644,000000..100644
--- a/debian/templates
+++ b/debian/templates
@@@ -1,6 -1,0 +1,8 @@@
- Template: abook/files_moved
- Type: note
- _Description: Place of addressbook file changed, need to import the old one.
-  From version 0.5.0 on abook uses a dot directory in your home directory to
-  store its addressbook and abookrc file. The former even changed its format so
-  you need to import your old file when you start abook after the upgrade.
++Template: abook/muttrc.d
++Type: boolean
++Default: true
++_Description: Do you want to enable abook system wide for mutt?
++ abook offers the posibility to be used as query backend from within mutt.  If
++ you acknowledge this question the package will create an
++ /etc/Muttrc.d/abook.rc file that enables querying the abook database and
++ adding mail addresses to abook with pressing "A" from pager mode.