Imported Debian patch 0.28-5

author: Y Giridhar Appaji Nag <giridhar@appaji.net> 2008-03-06 08:46:28 +0530
committer: Andrew Shadura <andrew.shadura@collabora.co.uk> 2016-06-21 11:57:28 +0200
commit: b3e7e0ff387f2f526b29039c0eaa9b6c07b6f9fc (patch)
tree: 16ef9b7cf00f35c41b83a32380ff97ff68c9054b
parent: f9134c0be076c5d2ed4084382a73115d7709e5c5 (diff)
43 files changed, 1817 insertions, 3362 deletions
diff --git a/config.guess b/config.guess
deleted file mode 100644
index 278f9e9..0000000
--- a/config.guess
+++ /dev/null
@@ -1,1516 +0,0 @@
-#! /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, 2006 Free Software Foundation,
-#   Inc.
-
-timestamp='2007-07-22'
-
-# 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
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-
-# Originally written by Per Bothner <per@bothner.com>.
-# Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
-#
-# This script attempts to guess a canonical system name similar to
-# config.sub.  If it succeeds, it prints the system name on stdout, and
-# exits with 0.  Otherwise, it exits with 1.
-#
-# The plan is that this can be called by configure scripts if you
-# don't specify an explicit build system type.
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION]
-
-Output the configuration name of the system \`$me' is run on.
-
-Operation modes:
-  -h, --help         print this help, then exit
-  -t, --time-stamp   print date of last modification, then exit
-  -v, --version      print version number, then exit
-
-Report bugs and patches to <config-patches@gnu.org>."
-
-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.
-
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit ;;
-    --version | -v )
-       echo "$version" ; exit ;;
-    --help | --h* | -h )
-       echo "$usage"; exit ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )	# Use stdin as input.
-       break ;;
-    -* )
-       echo "$me: invalid option $1$help" >&2
-       exit 1 ;;
-    * )
-       break ;;
-  esac
-done
-
-if test $# != 0; then
-  echo "$me: too many arguments$help" >&2
-  exit 1
-fi
-
-trap 'exit 1' 1 2 15
-
-# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
-# compiler to aid in system detection is discouraged as it requires
-# temporary files to be created and, as you can see below, it is a
-# headache to deal with in a portable fashion.
-
-# 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 "$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 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 ;
-	fi
-	;;
- ,,*)   CC_FOR_BUILD=$CC ;;
- ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac ; set_cc_for_build= ;'
-
-# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
-# (ghazi@noc.rutgers.edu 1994-08-24)
-if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
-	PATH=$PATH:/.attbin ; export PATH
-fi
-
-UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
-UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
-UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
-UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
-
-# Note: order is significant - the case branches are not exclusive.
-
-case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
-    *:NetBSD:*:*)
-	# NetBSD (nbsd) targets should (where applicable) match one or
-	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
-	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
-	# switched to ELF, *-*-netbsd* would select the old
-	# object file format.  This provides both forward
-	# compatibility and a consistent mechanism for selecting the
-	# object file format.
-	#
-	# Note: NetBSD doesn't particularly care about the vendor
-	# portion of the name.  We always set it to "unknown".
-	sysctl="sysctl -n hw.machine_arch"
-	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
-	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
-	case "${UNAME_MACHINE_ARCH}" in
-	    armeb) machine=armeb-unknown ;;
-	    arm*) machine=arm-unknown ;;
-	    sh3el) machine=shl-unknown ;;
-	    sh3eb) machine=sh-unknown ;;
-	    sh5el) machine=sh5le-unknown ;;
-	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
-	esac
-	# The Operating System including object format, if it has switched
-	# to ELF recently, or will in the future.
-	case "${UNAME_MACHINE_ARCH}" in
-	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
-		eval $set_cc_for_build
-		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-			| grep __ELF__ >/dev/null
-		then
-		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
-		    # Return netbsd for either.  FIX?
-		    os=netbsd
-		else
-		    os=netbsdelf
-		fi
-		;;
-	    *)
-	        os=netbsd
-		;;
-	esac
-	# The OS release
-	# Debian GNU/NetBSD machines have a different userland, and
-	# thus, need a distinct triplet. However, they do not need
-	# kernel version information, so it can be replaced with a
-	# suitable tag, in the style of linux-gnu.
-	case "${UNAME_VERSION}" in
-	    Debian*)
-		release='-gnu'
-		;;
-	    *)
-		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-		;;
-	esac
-	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
-	# contains redundant information, the shorter form:
-	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
-	echo "${machine}-${os}${release}"
-	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 powerpc-unknown-mirbsd${UNAME_RELEASE}
-	exit ;;
-    *:MirBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
-	exit ;;
-    alpha:OSF1:*:*)
-	case $UNAME_RELEASE in
-	*4.0)
-		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
-		;;
-	*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.
-	# 1.2 uses "1.2" for uname -r.
-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	exit ;;
-    Alpha\ *:Windows_NT*:*)
-	# How do we know it's Interix rather than the generic POSIX subsystem?
-	# Should we change UNAME_MACHINE based on the output of uname instead
-	# of the specific Alpha model?
-	echo alpha-pc-interix
-	exit ;;
-    21064:Windows_NT:50:3)
-	echo alpha-dec-winnt3.5
-	exit ;;
-    Amiga*:UNIX_System_V:4.0:*)
-	echo m68k-unknown-sysv4
-	exit ;;
-    *:[Aa]miga[Oo][Ss]:*:*)
-	echo ${UNAME_MACHINE}-unknown-amigaos
-	exit ;;
-    *:[Mm]orph[Oo][Ss]:*:*)
-	echo ${UNAME_MACHINE}-unknown-morphos
-	exit ;;
-    *:OS/390:*:*)
-	echo i370-ibm-openedition
-	exit ;;
-    *:z/VM:*:*)
-	echo s390-ibm-zvmoe
-	exit ;;
-    *:OS400:*:*)
-        echo powerpc-ibm-os400
-	exit ;;
-    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
-	echo arm-acorn-riscix${UNAME_RELEASE}
-	exit ;;
-    arm:riscos:*:*|arm:RISCOS:*:*)
-	echo arm-unknown-riscos
-	exit ;;
-    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
-	echo hppa1.1-hitachi-hiuxmpp
-	exit ;;
-    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
-	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
-	if test "`(/bin/universe) 2>/dev/null`" = att ; then
-		echo pyramid-pyramid-sysv3
-	else
-		echo pyramid-pyramid-bsd
-	fi
-	exit ;;
-    NILE*:*:*:dcosx)
-	echo pyramid-pyramid-svr4
-	exit ;;
-    DRS?6000:unix:4.0:6*)
-	echo sparc-icl-nx6
-	exit ;;
-    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
-	case `/usr/bin/uname -p` in
-	    sparc) echo sparc-icl-nx7; exit ;;
-	esac ;;
-    sun4H:SunOS:5.*:*)
-	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
-	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
-	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    sun4*:SunOS:6*:*)
-	# According to config.sub, this is the proper way to canonicalize
-	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
-	# it's likely to be more like Solaris than SunOS4.
-	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    sun4*:SunOS:*:*)
-	case "`/usr/bin/arch -k`" in
-	    Series*|S4*)
-		UNAME_RELEASE=`uname -v`
-		;;
-	esac
-	# Japanese Language versions have a version number like `4.1.3-JL'.
-	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
-	exit ;;
-    sun3*:SunOS:*:*)
-	echo m68k-sun-sunos${UNAME_RELEASE}
-	exit ;;
-    sun*:*:4.2BSD:*)
-	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
-	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
-	case "`/bin/arch`" in
-	    sun3)
-		echo m68k-sun-sunos${UNAME_RELEASE}
-		;;
-	    sun4)
-		echo sparc-sun-sunos${UNAME_RELEASE}
-		;;
-	esac
-	exit ;;
-    aushp:SunOS:*:*)
-	echo sparc-auspex-sunos${UNAME_RELEASE}
-	exit ;;
-    # The situation for MiNT is a little confusing.  The machine name
-    # can be virtually everything (everything which is not
-    # "atarist" or "atariste" at least should have a processor
-    # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
-    # to the lowercase version "mint" (or "freemint").  Finally
-    # the system name "TOS" denotes a system which is actually not
-    # MiNT.  But MiNT is downward compatible to TOS, so this should
-    # be no problem.
-    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
-	exit ;;
-    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
-	echo m68k-atari-mint${UNAME_RELEASE}
-        exit ;;
-    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
-	exit ;;
-    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-        echo m68k-milan-mint${UNAME_RELEASE}
-        exit ;;
-    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-        echo m68k-hades-mint${UNAME_RELEASE}
-        exit ;;
-    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-        echo m68k-unknown-mint${UNAME_RELEASE}
-        exit ;;
-    m68k:machten:*:*)
-	echo m68k-apple-machten${UNAME_RELEASE}
-	exit ;;
-    powerpc:machten:*:*)
-	echo powerpc-apple-machten${UNAME_RELEASE}
-	exit ;;
-    RISC*:Mach:*:*)
-	echo mips-dec-mach_bsd4.3
-	exit ;;
-    RISC*:ULTRIX:*:*)
-	echo mips-dec-ultrix${UNAME_RELEASE}
-	exit ;;
-    VAX*:ULTRIX*:*:*)
-	echo vax-dec-ultrix${UNAME_RELEASE}
-	exit ;;
-    2020:CLIX:*:* | 2430:CLIX:*:*)
-	echo clipper-intergraph-clix${UNAME_RELEASE}
-	exit ;;
-    mips:*:*:UMIPS | mips:*:*:RISCos)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-#ifdef __cplusplus
-#include <stdio.h>  /* for printf() prototype */
-	int main (int argc, char *argv[]) {
-#else
-	int main (argc, argv) int argc; char *argv[]; {
-#endif
-	#if defined (host_mips) && defined (MIPSEB)
-	#if defined (SYSTYPE_SYSV)
-	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
-	#endif
-	#if defined (SYSTYPE_SVR4)
-	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
-	#endif
-	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
-	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
-	#endif
-	#endif
-	  exit (-1);
-	}
-EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c &&
-	  dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
-	  SYSTEM_NAME=`$dummy $dummyarg` &&
-	    { echo "$SYSTEM_NAME"; exit; }
-	echo mips-mips-riscos${UNAME_RELEASE}
-	exit ;;
-    Motorola:PowerMAX_OS:*:*)
-	echo powerpc-motorola-powermax
-	exit ;;
-    Motorola:*:4.3:PL8-*)
-	echo powerpc-harris-powermax
-	exit ;;
-    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
-	echo powerpc-harris-powermax
-	exit ;;
-    Night_Hawk:Power_UNIX:*:*)
-	echo powerpc-harris-powerunix
-	exit ;;
-    m88k:CX/UX:7*:*)
-	echo m88k-harris-cxux7
-	exit ;;
-    m88k:*:4*:R4*)
-	echo m88k-motorola-sysv4
-	exit ;;
-    m88k:*:3*:R3*)
-	echo m88k-motorola-sysv3
-	exit ;;
-    AViiON:dgux:*:*)
-        # DG/UX returns AViiON for all architectures
-        UNAME_PROCESSOR=`/usr/bin/uname -p`
-	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
-	then
-	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
-	       [ ${TARGET_BINARY_INTERFACE}x = x ]
-	    then
-		echo m88k-dg-dgux${UNAME_RELEASE}
-	    else
-		echo m88k-dg-dguxbcs${UNAME_RELEASE}
-	    fi
-	else
-	    echo i586-dg-dgux${UNAME_RELEASE}
-	fi
- 	exit ;;
-    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
-	echo m88k-dolphin-sysv3
-	exit ;;
-    M88*:*:R3*:*)
-	# Delta 88k system running SVR3
-	echo m88k-motorola-sysv3
-	exit ;;
-    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
-	echo m88k-tektronix-sysv3
-	exit ;;
-    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
-	echo m68k-tektronix-bsd
-	exit ;;
-    *:IRIX*:*:*)
-	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
-	exit ;;
-    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
-	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
-	exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
-    i*86:AIX:*:*)
-	echo i386-ibm-aix
-	exit ;;
-    ia64:AIX:*:*)
-	if [ -x /usr/bin/oslevel ] ; then
-		IBM_REV=`/usr/bin/oslevel`
-	else
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-	fi
-	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
-	exit ;;
-    *:AIX:2:3)
-	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
-		eval $set_cc_for_build
-		sed 's/^		//' << EOF >$dummy.c
-		#include <sys/systemcfg.h>
-
-		main()
-			{
-			if (!__power_pc())
-				exit(1);
-			puts("powerpc-ibm-aix3.2.5");
-			exit(0);
-			}
-EOF
-		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
-		then
-			echo "$SYSTEM_NAME"
-		else
-			echo rs6000-ibm-aix3.2.5
-		fi
-	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
-		echo rs6000-ibm-aix3.2.4
-	else
-		echo rs6000-ibm-aix3.2
-	fi
-	exit ;;
-    *:AIX:*:[45])
-	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
-	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
-		IBM_ARCH=rs6000
-	else
-		IBM_ARCH=powerpc
-	fi
-	if [ -x /usr/bin/oslevel ] ; then
-		IBM_REV=`/usr/bin/oslevel`
-	else
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-	fi
-	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
-	exit ;;
-    *:AIX:*:*)
-	echo rs6000-ibm-aix
-	exit ;;
-    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
-	echo romp-ibm-bsd4.4
-	exit ;;
-    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
-	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
-	exit ;;                             # report: romp-ibm BSD 4.3
-    *:BOSX:*:*)
-	echo rs6000-bull-bosx
-	exit ;;
-    DPX/2?00:B.O.S.:*:*)
-	echo m68k-bull-sysv3
-	exit ;;
-    9000/[34]??:4.3bsd:1.*:*)
-	echo m68k-hp-bsd
-	exit ;;
-    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
-	echo m68k-hp-bsd4.4
-	exit ;;
-    9000/[34678]??:HP-UX:*:*)
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-	case "${UNAME_MACHINE}" in
-	    9000/31? )            HP_ARCH=m68000 ;;
-	    9000/[34]?? )         HP_ARCH=m68k ;;
-	    9000/[678][0-9][0-9])
-		if [ -x /usr/bin/getconf ]; then
-		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
-                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-                    case "${sc_cpu_version}" in
-                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
-                      532)                      # CPU_PA_RISC2_0
-                        case "${sc_kernel_bits}" in
-                          32) HP_ARCH="hppa2.0n" ;;
-                          64) HP_ARCH="hppa2.0w" ;;
-			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
-                        esac ;;
-                    esac
-		fi
-		if [ "${HP_ARCH}" = "" ]; then
-		    eval $set_cc_for_build
-		    sed 's/^              //' << EOF >$dummy.c
-
-              #define _HPUX_SOURCE
-              #include <stdlib.h>
-              #include <unistd.h>
-
-              int main ()
-              {
-              #if defined(_SC_KERNEL_BITS)
-                  long bits = sysconf(_SC_KERNEL_BITS);
-              #endif
-                  long cpu  = sysconf (_SC_CPU_VERSION);
-
-                  switch (cpu)
-              	{
-              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-              	case CPU_PA_RISC2_0:
-              #if defined(_SC_KERNEL_BITS)
-              	    switch (bits)
-              		{
-              		case 64: puts ("hppa2.0w"); break;
-              		case 32: puts ("hppa2.0n"); break;
-              		default: puts ("hppa2.0"); break;
-              		} break;
-              #else  /* !defined(_SC_KERNEL_BITS) */
-              	    puts ("hppa2.0"); break;
-              #endif
-              	default: puts ("hppa1.0"); break;
-              	}
-                  exit (0);
-              }
-EOF
-		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
-		    test -z "$HP_ARCH" && HP_ARCH=hppa
-		fi ;;
-	esac
-	if [ ${HP_ARCH} = "hppa2.0w" ]
-	then
-	    eval $set_cc_for_build
-
-	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
-	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
-	    # generating 64-bit code.  GNU and HP use different nomenclature:
-	    #
-	    # $ CC_FOR_BUILD=cc ./config.guess
-	    # => hppa2.0w-hp-hpux11.23
-	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
-	    # => hppa64-hp-hpux11.23
-
-	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
-		grep __LP64__ >/dev/null
-	    then
-		HP_ARCH="hppa2.0w"
-	    else
-		HP_ARCH="hppa64"
-	    fi
-	fi
-	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
-	exit ;;
-    ia64:HP-UX:*:*)
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-	echo ia64-hp-hpux${HPUX_REV}
-	exit ;;
-    3050*:HI-UX:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <unistd.h>
-	int
-	main ()
-	{
-	  long cpu = sysconf (_SC_CPU_VERSION);
-	  /* The order matters, because CPU_IS_HP_MC68K erroneously returns
-	     true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
-	     results, however.  */
-	  if (CPU_IS_PA_RISC (cpu))
-	    {
-	      switch (cpu)
-		{
-		  case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
-		  case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
-		  case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
-		  default: puts ("hppa-hitachi-hiuxwe2"); break;
-		}
-	    }
-	  else if (CPU_IS_HP_MC68K (cpu))
-	    puts ("m68k-hitachi-hiuxwe2");
-	  else puts ("unknown-hitachi-hiuxwe2");
-	  exit (0);
-	}
-EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
-		{ echo "$SYSTEM_NAME"; exit; }
-	echo unknown-hitachi-hiuxwe2
-	exit ;;
-    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
-	echo hppa1.1-hp-bsd
-	exit ;;
-    9000/8??:4.3bsd:*:*)
-	echo hppa1.0-hp-bsd
-	exit ;;
-    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
-	echo hppa1.0-hp-mpeix
-	exit ;;
-    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
-	echo hppa1.1-hp-osf
-	exit ;;
-    hp8??:OSF1:*:*)
-	echo hppa1.0-hp-osf
-	exit ;;
-    i*86:OSF1:*:*)
-	if [ -x /usr/sbin/sysversion ] ; then
-	    echo ${UNAME_MACHINE}-unknown-osf1mk
-	else
-	    echo ${UNAME_MACHINE}-unknown-osf1
-	fi
-	exit ;;
-    parisc*:Lites*:*:*)
-	echo hppa1.1-hp-lites
-	exit ;;
-    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
-	echo c1-convex-bsd
-        exit ;;
-    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-        exit ;;
-    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
-	echo c34-convex-bsd
-        exit ;;
-    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
-	echo c38-convex-bsd
-        exit ;;
-    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
-	echo c4-convex-bsd
-        exit ;;
-    CRAY*Y-MP:*:*:*)
-	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    CRAY*[A-Z]90:*:*:*)
-	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
-	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
-	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
-	      -e 's/\.[^.]*$/.X/'
-	exit ;;
-    CRAY*TS:*:*:*)
-	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    CRAY*T3E:*:*:*)
-	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    CRAY*SV1:*:*:*)
-	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    *:UNICOS/mp:*:*)
-	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
-	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-        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 ;;
-    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 ;;
-    sparc*:BSD/OS:*:*)
-	echo sparc-unknown-bsdi${UNAME_RELEASE}
-	exit ;;
-    *:BSD/OS:*:*)
-	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
-	exit ;;
-    *:FreeBSD:*:*)
-	case ${UNAME_MACHINE} in
-	    pc98)
-		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-	    amd64)
-		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-	    *)
-		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-	esac
-	exit ;;
-    i*:CYGWIN*:*)
-	echo ${UNAME_MACHINE}-pc-cygwin
-	exit ;;
-    *:MINGW*:*)
-	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 ;;
-    *:Interix*:[3456]*)
-    	case ${UNAME_MACHINE} in
-	    x86)
-		echo i586-pc-interix${UNAME_RELEASE}
-		exit ;;
-	    EM64T | authenticamd)
-		echo x86_64-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 ;;
-    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 i586-pc-interix
-	exit ;;
-    i*:UWIN*:*)
-	echo ${UNAME_MACHINE}-pc-uwin
-	exit ;;
-    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
-	echo x86_64-unknown-cygwin
-	exit ;;
-    p*:CYGWIN*:*)
-	echo powerpcle-unknown-cygwin
-	exit ;;
-    prep*:SunOS:5.*:*)
-	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    *:GNU:*:*)
-	# the GNU system
-	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
-	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 ;;
-    arm*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    avr32*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	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-gnu
-	exit ;;
-    m32r*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    m68*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    mips:Linux:*:*)
-	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 | sed -n '
-	    /^CPU/{
-		s: ::g
-		p
-	    }'`"
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
-	;;
-    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 | 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:*:*)
-	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 ;;
-    parisc:Linux:*:* | hppa:Linux:*:*)
-	# Look for CPU level
-	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
-	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
-	  *)    echo hppa-unknown-linux-gnu ;;
-	esac
-	exit ;;
-    parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-gnu
-	exit ;;
-    s390:Linux:*:* | s390x:Linux:*:*)
-	echo ${UNAME_MACHINE}-ibm-linux
-	exit ;;
-    sh64*:Linux:*:*)
-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    sh*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    sparc:Linux:*:* | sparc64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    vax:Linux:*:*)
-	echo ${UNAME_MACHINE}-dec-linux-gnu
-	exit ;;
-    x86_64:Linux:*:*)
-	echo x86_64-unknown-linux-gnu
-	exit ;;
-    xtensa:Linux:*:*)
-    	echo xtensa-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
-	# problems with other programs or directories called `ld' in the path.
-	# 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 targets: *//
-				    s/ .*//
-				    p'`
-        case "$ld_supported_targets" in
-	  elf32-i386)
-		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
-		;;
-	  a.out-i386-linux)
-		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-		exit ;;
-	  coff-i386)
-		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
-		exit ;;
-	  "")
-		# Either a pre-BFD a.out linker (linux-gnuoldld) or
-		# one that does not give us useful --help.
-		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
-		exit ;;
-	esac
-	# Determine whether the default compiler is a.out or elf
-	eval $set_cc_for_build
-	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
-	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
-	LIBC=gnu
-	#else
-	LIBC=gnuaout
-	#endif
-	#endif
-	#ifdef __dietlibc__
-	LIBC=dietlibc
-	#endif
-EOF
-	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; }
-	;;
-    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 ;;
-    i*86:UNIX_SV:4.2MP:2.*)
-        # Unixware is an offshoot of SVR4, but it has its own version
-        # number series starting with 2...
-        # I am not positive that other SVR4 systems won't match this,
-	# I just have to hope.  -- rms.
-        # Use sysv4.2uw... so that sysv4* matches it.
-	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
-	exit ;;
-    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 ;;
-    i*86:XTS-300:*:STOP)
-	echo ${UNAME_MACHINE}-unknown-stop
-	exit ;;
-    i*86:atheos:*:*)
-	echo ${UNAME_MACHINE}-unknown-atheos
-	exit ;;
-    i*86:syllable:*:*)
-	echo ${UNAME_MACHINE}-pc-syllable
-	exit ;;
-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
-	echo i386-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    i*86:*DOS:*:*)
-	echo ${UNAME_MACHINE}-pc-msdosdjgpp
-	exit ;;
-    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
-	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
-	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
-		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
-	else
-		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
-	fi
-	exit ;;
-    i*86:*:5:[678]*)
-    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
-	case `/bin/uname -X | grep "^Machine"` in
-	    *486*)	     UNAME_MACHINE=i486 ;;
-	    *Pentium)	     UNAME_MACHINE=i586 ;;
-	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
-	esac
-	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
-	exit ;;
-    i*86:*:3.2:*)
-	if test -f /usr/options/cb.name; then
-		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
-		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
-	elif /bin/uname -X 2>/dev/null >/dev/null ; then
-		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
-		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
-		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
-			&& UNAME_MACHINE=i586
-		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
-			&& UNAME_MACHINE=i686
-		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
-			&& UNAME_MACHINE=i686
-		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
-	else
-		echo ${UNAME_MACHINE}-pc-sysv32
-	fi
-	exit ;;
-    pc:*:*:*)
-	# Left here for compatibility:
-        # uname -m prints for DJGPP always 'pc', but it prints nothing about
-        # the processor, so we play safe by assuming i386.
-	echo i386-pc-msdosdjgpp
-        exit ;;
-    Intel:Mach:3*:*)
-	echo i386-pc-mach3
-	exit ;;
-    paragon:*:*:*)
-	echo i860-intel-osf1
-	exit ;;
-    i860:*:4.*:*) # i860-SVR4
-	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
-	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
-	else # Add other i860-SVR4 vendors below as they are discovered.
-	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
-	fi
-	exit ;;
-    mini*:CTIX:SYS*5:*)
-	# "miniframe"
-	echo m68010-convergent-sysv
-	exit ;;
-    mc68k:UNIX:SYSTEM5:3.51m)
-	echo m68k-convergent-sysv
-	exit ;;
-    M680?0:D-NIX:5.3:*)
-	echo m68k-diab-dnix
-	exit ;;
-    M68*:*:R3V[5678]*:*)
-	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
-    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
-	OS_REL=''
-	test -r /etc/.relid \
-	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
-	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
-    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-          && { echo i486-ncr-sysv4; exit; } ;;
-    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
-	echo m68k-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    mc68030:UNIX_System_V:4.*:*)
-	echo m68k-atari-sysv4
-	exit ;;
-    TSUNAMI:LynxOS:2.*:*)
-	echo sparc-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    rs6000:LynxOS:2.*:*)
-	echo rs6000-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
-	echo powerpc-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    SM[BE]S:UNIX_SV:*:*)
-	echo mips-dde-sysv${UNAME_RELEASE}
-	exit ;;
-    RM*:ReliantUNIX-*:*:*)
-	echo mips-sni-sysv4
-	exit ;;
-    RM*:SINIX-*:*:*)
-	echo mips-sni-sysv4
-	exit ;;
-    *:SINIX-*:*:*)
-	if uname -p 2>/dev/null >/dev/null ; then
-		UNAME_MACHINE=`(uname -p) 2>/dev/null`
-		echo ${UNAME_MACHINE}-sni-sysv4
-	else
-		echo ns32k-sni-sysv
-	fi
-	exit ;;
-    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-                      # says <Richard.M.Bartel@ccMail.Census.GOV>
-        echo i586-unisys-sysv4
-        exit ;;
-    *:UNIX_System_V:4*:FTX*)
-	# From Gerald Hewes <hewes@openmarket.com>.
-	# How about differentiating between stratus architectures? -djm
-	echo hppa1.1-stratus-sysv4
-	exit ;;
-    *:*:*:FTX*)
-	# From seanf@swdc.stratus.com.
-	echo i860-stratus-sysv4
-	exit ;;
-    i*86:VOS:*:*)
-	# From Paul.Green@stratus.com.
-	echo ${UNAME_MACHINE}-stratus-vos
-	exit ;;
-    *:VOS:*:*)
-	# From Paul.Green@stratus.com.
-	echo hppa1.1-stratus-vos
-	exit ;;
-    mc68*:A/UX:*:*)
-	echo m68k-apple-aux${UNAME_RELEASE}
-	exit ;;
-    news*:NEWS-OS:6*:*)
-	echo mips-sony-newsos6
-	exit ;;
-    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
-	if [ -d /usr/nec ]; then
-	        echo mips-nec-sysv${UNAME_RELEASE}
-	else
-	        echo mips-unknown-sysv${UNAME_RELEASE}
-	fi
-        exit ;;
-    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
-	echo powerpc-be-beos
-	exit ;;
-    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
-	echo powerpc-apple-beos
-	exit ;;
-    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
-	echo i586-pc-beos
-	exit ;;
-    SX-4:SUPER-UX:*:*)
-	echo sx4-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-5:SUPER-UX:*:*)
-	echo sx5-nec-superux${UNAME_RELEASE}
-	exit ;;
-    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 ;;
-    *:Rhapsody:*:*)
-	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
-	exit ;;
-    *:Darwin:*:*)
-	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-	case $UNAME_PROCESSOR in
-	    unknown) UNAME_PROCESSOR=powerpc ;;
-	esac
-	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
-	exit ;;
-    *:procnto*:*:* | *:QNX:[0123456789]*:*)
-	UNAME_PROCESSOR=`uname -p`
-	if test "$UNAME_PROCESSOR" = "x86"; then
-		UNAME_PROCESSOR=i386
-		UNAME_MACHINE=pc
-	fi
-	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
-	exit ;;
-    *:QNX:*:4*)
-	echo i386-pc-qnx
-	exit ;;
-    NSE-?:NONSTOP_KERNEL:*:*)
-	echo nse-tandem-nsk${UNAME_RELEASE}
-	exit ;;
-    NSR-?:NONSTOP_KERNEL:*:*)
-	echo nsr-tandem-nsk${UNAME_RELEASE}
-	exit ;;
-    *:NonStop-UX:*:*)
-	echo mips-compaq-nonstopux
-	exit ;;
-    BS2000:POSIX*:*:*)
-	echo bs2000-siemens-sysv
-	exit ;;
-    DS/*:UNIX_System_V:*:*)
-	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
-	exit ;;
-    *:Plan9:*:*)
-	# "uname -m" is not consistent, so use $cputype instead. 386
-	# is converted to i386 for consistency with other x86
-	# operating systems.
-	if test "$cputype" = "386"; then
-	    UNAME_MACHINE=i386
-	else
-	    UNAME_MACHINE="$cputype"
-	fi
-	echo ${UNAME_MACHINE}-unknown-plan9
-	exit ;;
-    *:TOPS-10:*:*)
-	echo pdp10-unknown-tops10
-	exit ;;
-    *:TENEX:*:*)
-	echo pdp10-unknown-tenex
-	exit ;;
-    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
-	echo pdp10-dec-tops20
-	exit ;;
-    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
-	echo pdp10-xkl-tops20
-	exit ;;
-    *:TOPS-20:*:*)
-	echo pdp10-unknown-tops20
-	exit ;;
-    *:ITS:*:*)
-	echo pdp10-unknown-its
-	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
-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
-
-eval $set_cc_for_build
-cat >$dummy.c <<EOF
-#ifdef _SEQUENT_
-# include <sys/types.h>
-# include <sys/utsname.h>
-#endif
-main ()
-{
-#if defined (sony)
-#if defined (MIPSEB)
-  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
-     I don't know....  */
-  printf ("mips-sony-bsd\n"); exit (0);
-#else
-#include <sys/param.h>
-  printf ("m68k-sony-newsos%s\n",
-#ifdef NEWSOS4
-          "4"
-#else
-	  ""
-#endif
-         ); exit (0);
-#endif
-#endif
-
-#if defined (__arm) && defined (__acorn) && defined (__unix)
-  printf ("arm-acorn-riscix\n"); exit (0);
-#endif
-
-#if defined (hp300) && !defined (hpux)
-  printf ("m68k-hp-bsd\n"); exit (0);
-#endif
-
-#if defined (NeXT)
-#if !defined (__ARCHITECTURE__)
-#define __ARCHITECTURE__ "m68k"
-#endif
-  int version;
-  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
-  if (version < 4)
-    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
-  else
-    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
-  exit (0);
-#endif
-
-#if defined (MULTIMAX) || defined (n16)
-#if defined (UMAXV)
-  printf ("ns32k-encore-sysv\n"); exit (0);
-#else
-#if defined (CMU)
-  printf ("ns32k-encore-mach\n"); exit (0);
-#else
-  printf ("ns32k-encore-bsd\n"); exit (0);
-#endif
-#endif
-#endif
-
-#if defined (__386BSD__)
-  printf ("i386-pc-bsd\n"); exit (0);
-#endif
-
-#if defined (sequent)
-#if defined (i386)
-  printf ("i386-sequent-dynix\n"); exit (0);
-#endif
-#if defined (ns32000)
-  printf ("ns32k-sequent-dynix\n"); exit (0);
-#endif
-#endif
-
-#if defined (_SEQUENT_)
-    struct utsname un;
-
-    uname(&un);
-
-    if (strncmp(un.version, "V2", 2) == 0) {
-	printf ("i386-sequent-ptx2\n"); exit (0);
-    }
-    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
-	printf ("i386-sequent-ptx1\n"); exit (0);
-    }
-    printf ("i386-sequent-ptx\n"); exit (0);
-
-#endif
-
-#if defined (vax)
-# if !defined (ultrix)
-#  include <sys/param.h>
-#  if defined (BSD)
-#   if BSD == 43
-      printf ("vax-dec-bsd4.3\n"); exit (0);
-#   else
-#    if BSD == 199006
-      printf ("vax-dec-bsd4.3reno\n"); exit (0);
-#    else
-      printf ("vax-dec-bsd\n"); exit (0);
-#    endif
-#   endif
-#  else
-    printf ("vax-dec-bsd\n"); exit (0);
-#  endif
-# else
-    printf ("vax-dec-ultrix\n"); exit (0);
-# endif
-#endif
-
-#if defined (alliant) && defined (i860)
-  printf ("i860-alliant-bsd\n"); exit (0);
-#endif
-
-  exit (1);
-}
-EOF
-
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
-	{ echo "$SYSTEM_NAME"; exit; }
-
-# Apollos put the system type in the environment.
-
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
-
-# Convex versions that predate uname can use getsysinfo(1)
-
-if [ -x /usr/convex/getsysinfo ]
-then
-    case `getsysinfo -f cpu_type` in
-    c1*)
-	echo c1-convex-bsd
-	exit ;;
-    c2*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-	exit ;;
-    c34*)
-	echo c34-convex-bsd
-	exit ;;
-    c38*)
-	echo c38-convex-bsd
-	exit ;;
-    c4*)
-	echo c4-convex-bsd
-	exit ;;
-    esac
-fi
-
-cat >&2 <<EOF
-$0: unable to guess system type
-
-This script, last modified $timestamp, has failed to recognize
-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
-and
-  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
-
-If the version you run ($0) is already up to date, please
-send the following data and any information you think might be
-pertinent to <config-patches@gnu.org> in order to provide the needed
-information to handle your system.
-
-config.guess timestamp = $timestamp
-
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
-
-hostinfo               = `(hostinfo) 2>/dev/null`
-/bin/universe          = `(/bin/universe) 2>/dev/null`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
-/bin/arch              = `(/bin/arch) 2>/dev/null`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
-
-UNAME_MACHINE = ${UNAME_MACHINE}
-UNAME_RELEASE = ${UNAME_RELEASE}
-UNAME_SYSTEM  = ${UNAME_SYSTEM}
-UNAME_VERSION = ${UNAME_VERSION}
-EOF
-
-exit 1
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:
diff --git a/config.sub b/config.sub
deleted file mode 100644
index 1761d8b..0000000
--- a/config.sub
+++ /dev/null
@@ -1,1626 +0,0 @@
-#! /bin/sh
-# Configuration validation subroutine script.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
-#   Inc.
-
-timestamp='2007-06-28'
-
-# This file is (in principle) common to ALL GNU software.
-# The presence of a machine in this file suggests that SOME GNU software
-# can handle that machine.  It does not imply ALL GNU software can.
-#
-# 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
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-
-# Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
-#
-# Configuration subroutine to validate and canonicalize a configuration type.
-# Supply the specified configuration type as an argument.
-# If it is invalid, we print an error message on stderr and exit with code 1.
-# Otherwise, we print the canonical config type on stdout and succeed.
-
-# This file is supposed to be the same for all GNU packages
-# and recognize all the CPU types, system types and aliases
-# that are meaningful with *any* GNU software.
-# Each package is responsible for reporting which valid configurations
-# it does not support.  The user should be able to distinguish
-# a failure to support a valid configuration from a meaningless
-# configuration.
-
-# The goal of this file is to map all the various variations of a given
-# machine specification into a single specification in the form:
-#	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
-# or in some cases, the newer four-part form:
-#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
-# It is wrong to echo any other type of specification.
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION] CPU-MFR-OPSYS
-       $0 [OPTION] ALIAS
-
-Canonicalize a configuration name.
-
-Operation modes:
-  -h, --help         print this help, then exit
-  -t, --time-stamp   print date of last modification, then exit
-  -v, --version      print version number, then exit
-
-Report bugs and patches to <config-patches@gnu.org>."
-
-version="\
-GNU config.sub ($timestamp)
-
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit ;;
-    --version | -v )
-       echo "$version" ; exit ;;
-    --help | --h* | -h )
-       echo "$usage"; exit ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )	# Use stdin as input.
-       break ;;
-    -* )
-       echo "$me: invalid option $1$help"
-       exit 1 ;;
-
-    *local*)
-       # First pass through any local machine types.
-       echo $1
-       exit ;;
-
-    * )
-       break ;;
-  esac
-done
-
-case $# in
- 0) echo "$me: missing argument$help" >&2
-    exit 1;;
- 1) ;;
- *) echo "$me: too many arguments$help" >&2
-    exit 1;;
-esac
-
-# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
-# 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-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/'`
-    ;;
-  *)
-    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
-    if [ $basic_machine != $1 ]
-    then os=`echo $1 | sed 's/.*-/-/'`
-    else os=; fi
-    ;;
-esac
-
-### Let's recognize common machines as not being operating systems so
-### that things like config.sub decstation-3100 work.  We also
-### recognize some manufacturers as not being operating systems, so we
-### can provide default operating systems below.
-case $os in
-	-sun*os*)
-		# Prevent following clause from handling this invalid input.
-		;;
-	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
-	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
-	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
-	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis | -knuth | -cray)
-		os=
-		basic_machine=$1
-		;;
-	-sim | -cisco | -oki | -wec | -winbond)
-		os=
-		basic_machine=$1
-		;;
-	-scout)
-		;;
-	-wrs)
-		os=-vxworks
-		basic_machine=$1
-		;;
-	-chorusos*)
-		os=-chorusos
-		basic_machine=$1
-		;;
- 	-chorusrdb)
- 		os=-chorusrdb
-		basic_machine=$1
- 		;;
-	-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/'`
-		;;
-	-sco4)
-		os=-sco3.2v4
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2.[4-9]*)
-		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2v[4-9]*)
-		# 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/'`
-		;;
-	-udk*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-isc)
-		os=-isc2.2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-clix*)
-		basic_machine=clipper-intergraph
-		;;
-	-isc*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-lynx*)
-		os=-lynxos
-		;;
-	-ptx*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
-		;;
-	-windowsnt*)
-		os=`echo $os | sed -e 's/windowsnt/winnt/'`
-		;;
-	-psos*)
-		os=-psos
-		;;
-	-mint | -mint[0-9]*)
-		basic_machine=m68k-atari
-		os=-mint
-		;;
-esac
-
-# Decode aliases for certain CPU-COMPANY combinations.
-case $basic_machine in
-	# Recognize the basic CPU types without company name.
-	# Some are omitted here because they have special meanings below.
-	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 | avr32 \
-	| bfin \
-	| c4x | clipper \
-	| d10v | d30v | dlx | dsp16xx \
-	| fido | fr30 | frv \
-	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
-	| i370 | i860 | i960 | ia64 \
-	| ip2k | iq2000 \
-	| m32c | m32r | m32rle | m68000 | m68k | m88k \
-	| maxq | mb | microblaze | mcore | mep \
-	| 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 \
-	| mt \
-	| msp430 \
-	| nios | nios2 \
-	| ns16k | ns32k \
-	| or32 \
-	| pdp10 | pdp11 | pj | pjl \
-	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
-	| pyramid \
-	| score \
-	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
-	| sh64 | sh64le \
-	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
-	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
-	| spu | strongarm \
-	| tahoe | thumb | tic4x | tic80 | tron \
-	| v850 | v850e \
-	| we32k \
-	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
-	| z8k)
-		basic_machine=$basic_machine-unknown
-		;;
-	m6811 | m68hc11 | m6812 | m68hc12)
-		# Motorola 68HC11/12.
-		basic_machine=$basic_machine-unknown
-		os=-none
-		;;
-	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
-	# (2) the word "unknown" tends to confuse beginning users.
-	i*86 | x86_64)
-	  basic_machine=$basic_machine-pc
-	  ;;
-	# Object if more than one company name word.
-	*-*-*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
-		;;
-	# Recognize the basic CPU types with company name.
-	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-* | avr32-* \
-	| bfin-* | bs2000-* \
-	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
-	| clipper-* | craynv-* | cydra-* \
-	| d10v-* | d30v-* | dlx-* \
-	| elxsi-* \
-	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
-	| h8300-* | h8500-* \
-	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
-	| i*86-* | i860-* | i960-* | ia64-* \
-	| ip2k-* | iq2000-* \
-	| m32c-* | 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-* \
-	| 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-* | sheb-* | shbe-* \
-	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
-	| sparclite-* \
-	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
-	| tahoe-* | thumb-* \
-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-	| tron-* \
-	| v850-* | v850e-* | vax-* \
-	| we32k-* \
-	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
-	| xstormy16-* | xtensa-* \
-	| ymp-* \
-	| z8k-*)
-		;;
-	# Recognize the various machine names and aliases which stand
-	# for a CPU type and a company and sometimes even an OS.
-	386bsd)
-		basic_machine=i386-unknown
-		os=-bsd
-		;;
-	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
-		basic_machine=m68000-att
-		;;
-	3b*)
-		basic_machine=we32k-att
-		;;
-	a29khif)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-    	abacus)
-		basic_machine=abacus-unknown
-		;;
-	adobe68k)
-		basic_machine=m68010-adobe
-		os=-scout
-		;;
-	alliant | fx80)
-		basic_machine=fx80-alliant
-		;;
-	altos | altos3068)
-		basic_machine=m68k-altos
-		;;
-	am29k)
-		basic_machine=a29k-none
-		os=-bsd
-		;;
-	amd64)
-		basic_machine=x86_64-pc
-		;;
-	amd64-*)
-		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	amdahl)
-		basic_machine=580-amdahl
-		os=-sysv
-		;;
-	amiga | amiga-*)
-		basic_machine=m68k-unknown
-		;;
-	amigaos | amigados)
-		basic_machine=m68k-unknown
-		os=-amigaos
-		;;
-	amigaunix | amix)
-		basic_machine=m68k-unknown
-		os=-sysv4
-		;;
-	apollo68)
-		basic_machine=m68k-apollo
-		os=-sysv
-		;;
-	apollo68bsd)
-		basic_machine=m68k-apollo
-		os=-bsd
-		;;
-	aux)
-		basic_machine=m68k-apple
-		os=-aux
-		;;
-	balance)
-		basic_machine=ns32k-sequent
-		os=-dynix
-		;;
-	c90)
-		basic_machine=c90-cray
-		os=-unicos
-		;;
-	convex-c1)
-		basic_machine=c1-convex
-		os=-bsd
-		;;
-	convex-c2)
-		basic_machine=c2-convex
-		os=-bsd
-		;;
-	convex-c32)
-		basic_machine=c32-convex
-		os=-bsd
-		;;
-	convex-c34)
-		basic_machine=c34-convex
-		os=-bsd
-		;;
-	convex-c38)
-		basic_machine=c38-convex
-		os=-bsd
-		;;
-	cray | j90)
-		basic_machine=j90-cray
-		os=-unicos
-		;;
-	craynv)
-		basic_machine=craynv-cray
-		os=-unicosmp
-		;;
-	cr16)
-		basic_machine=cr16-unknown
-		os=-elf
-		;;
-	crds | unos)
-		basic_machine=m68k-crds
-		;;
-	crisv32 | crisv32-* | etraxfs*)
-		basic_machine=crisv32-axis
-		;;
-	cris | cris-* | etrax*)
-		basic_machine=cris-axis
-		;;
-	crx)
-		basic_machine=crx-unknown
-		os=-elf
-		;;
-	da30 | da30-*)
-		basic_machine=m68k-da30
-		;;
-	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
-		basic_machine=mips-dec
-		;;
-	decsystem10* | dec10*)
-		basic_machine=pdp10-dec
-		os=-tops10
-		;;
-	decsystem20* | dec20*)
-		basic_machine=pdp10-dec
-		os=-tops20
-		;;
-	delta | 3300 | motorola-3300 | motorola-delta \
-	      | 3300-motorola | delta-motorola)
-		basic_machine=m68k-motorola
-		;;
-	delta88)
-		basic_machine=m88k-motorola
-		os=-sysv3
-		;;
-	djgpp)
-		basic_machine=i586-pc
-		os=-msdosdjgpp
-		;;
-	dpx20 | dpx20-*)
-		basic_machine=rs6000-bull
-		os=-bosx
-		;;
-	dpx2* | dpx2*-bull)
-		basic_machine=m68k-bull
-		os=-sysv3
-		;;
-	ebmon29k)
-		basic_machine=a29k-amd
-		os=-ebmon
-		;;
-	elxsi)
-		basic_machine=elxsi-elxsi
-		os=-bsd
-		;;
-	encore | umax | mmax)
-		basic_machine=ns32k-encore
-		;;
-	es1800 | OSE68k | ose68k | ose | OSE)
-		basic_machine=m68k-ericsson
-		os=-ose
-		;;
-	fx2800)
-		basic_machine=i860-alliant
-		;;
-	genix)
-		basic_machine=ns32k-ns
-		;;
-	gmicro)
-		basic_machine=tron-gmicro
-		os=-sysv
-		;;
-	go32)
-		basic_machine=i386-pc
-		os=-go32
-		;;
-	h3050r* | hiux*)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	h8300hms)
-		basic_machine=h8300-hitachi
-		os=-hms
-		;;
-	h8300xray)
-		basic_machine=h8300-hitachi
-		os=-xray
-		;;
-	h8500hms)
-		basic_machine=h8500-hitachi
-		os=-hms
-		;;
-	harris)
-		basic_machine=m88k-harris
-		os=-sysv3
-		;;
-	hp300-*)
-		basic_machine=m68k-hp
-		;;
-	hp300bsd)
-		basic_machine=m68k-hp
-		os=-bsd
-		;;
-	hp300hpux)
-		basic_machine=m68k-hp
-		os=-hpux
-		;;
-	hp3k9[0-9][0-9] | hp9[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hp9k2[0-9][0-9] | hp9k31[0-9])
-		basic_machine=m68000-hp
-		;;
-	hp9k3[2-9][0-9])
-		basic_machine=m68k-hp
-		;;
-	hp9k6[0-9][0-9] | hp6[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hp9k7[0-79][0-9] | hp7[0-79][0-9])
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k78[0-9] | hp78[0-9])
-		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
-		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[0-9][13679] | hp8[0-9][13679])
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[0-9][0-9] | hp8[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hppa-next)
-		os=-nextstep3
-		;;
-	hppaosf)
-		basic_machine=hppa1.1-hp
-		os=-osf
-		;;
-	hppro)
-		basic_machine=hppa1.1-hp
-		os=-proelf
-		;;
-	i370-ibm* | ibm*)
-		basic_machine=i370-ibm
-		;;
-# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
-	i*86v32)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv32
-		;;
-	i*86v4*)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv4
-		;;
-	i*86v)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv
-		;;
-	i*86sol2)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-solaris2
-		;;
-	i386mach)
-		basic_machine=i386-mach
-		os=-mach
-		;;
-	i386-vsta | vsta)
-		basic_machine=i386-unknown
-		os=-vsta
-		;;
-	iris | iris4d)
-		basic_machine=mips-sgi
-		case $os in
-		    -irix*)
-			;;
-		    *)
-			os=-irix4
-			;;
-		esac
-		;;
-	isi68 | isi)
-		basic_machine=m68k-isi
-		os=-sysv
-		;;
-	m88k-omron*)
-		basic_machine=m88k-omron
-		;;
-	magnum | m3230)
-		basic_machine=mips-mips
-		os=-sysv
-		;;
-	merlin)
-		basic_machine=ns32k-utek
-		os=-sysv
-		;;
-	mingw32)
-		basic_machine=i386-pc
-		os=-mingw32
-		;;
-	mingw32ce)
-		basic_machine=arm-unknown
-		os=-mingw32ce
-		;;
-	miniframe)
-		basic_machine=m68000-convergent
-		;;
-	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
-		basic_machine=m68k-atari
-		os=-mint
-		;;
-	mips3*-*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
-		;;
-	mips3*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
-		;;
-	monitor)
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
-	morphos)
-		basic_machine=powerpc-unknown
-		os=-morphos
-		;;
-	msdos)
-		basic_machine=i386-pc
-		os=-msdos
-		;;
-	ms1-*)
-		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
-		;;
-	mvs)
-		basic_machine=i370-ibm
-		os=-mvs
-		;;
-	ncr3000)
-		basic_machine=i486-ncr
-		os=-sysv4
-		;;
-	netbsd386)
-		basic_machine=i386-unknown
-		os=-netbsd
-		;;
-	netwinder)
-		basic_machine=armv4l-rebel
-		os=-linux
-		;;
-	news | news700 | news800 | news900)
-		basic_machine=m68k-sony
-		os=-newsos
-		;;
-	news1000)
-		basic_machine=m68030-sony
-		os=-newsos
-		;;
-	news-3600 | risc-news)
-		basic_machine=mips-sony
-		os=-newsos
-		;;
-	necv70)
-		basic_machine=v70-nec
-		os=-sysv
-		;;
-	next | m*-next )
-		basic_machine=m68k-next
-		case $os in
-		    -nextstep* )
-			;;
-		    -ns2*)
-		      os=-nextstep2
-			;;
-		    *)
-		      os=-nextstep3
-			;;
-		esac
-		;;
-	nh3000)
-		basic_machine=m68k-harris
-		os=-cxux
-		;;
-	nh[45]000)
-		basic_machine=m88k-harris
-		os=-cxux
-		;;
-	nindy960)
-		basic_machine=i960-intel
-		os=-nindy
-		;;
-	mon960)
-		basic_machine=i960-intel
-		os=-mon960
-		;;
-	nonstopux)
-		basic_machine=mips-compaq
-		os=-nonstopux
-		;;
-	np1)
-		basic_machine=np1-gould
-		;;
-	nsr-tandem)
-		basic_machine=nsr-tandem
-		;;
-	op50n-* | op60c-*)
-		basic_machine=hppa1.1-oki
-		os=-proelf
-		;;
-	openrisc | openrisc-*)
-		basic_machine=or32-unknown
-		;;
-	os400)
-		basic_machine=powerpc-ibm
-		os=-os400
-		;;
-	OSE68000 | ose68000)
-		basic_machine=m68000-ericsson
-		os=-ose
-		;;
-	os68k)
-		basic_machine=m68k-none
-		os=-os68k
-		;;
-	pa-hitachi)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	paragon)
-		basic_machine=i860-intel
-		os=-osf
-		;;
-	pbd)
-		basic_machine=sparc-tti
-		;;
-	pbb)
-		basic_machine=m68k-tti
-		;;
-	pc532 | pc532-*)
-		basic_machine=ns32k-pc532
-		;;
-	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 | athlon_*)
-		basic_machine=i686-pc
-		;;
-	pentiumii | pentium2 | pentiumiii | pentium3)
-		basic_machine=i686-pc
-		;;
-	pentium4)
-		basic_machine=i786-pc
-		;;
-	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
-		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentiumpro-* | p6-* | 6x86-* | athlon-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentium4-*)
-		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pn)
-		basic_machine=pn-gould
-		;;
-	power)	basic_machine=power-ibm
-		;;
-	ppc)	basic_machine=powerpc-unknown
-		;;
-	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppcle | powerpclittle | ppc-le | powerpc-little)
-		basic_machine=powerpcle-unknown
-		;;
-	ppcle-* | powerpclittle-*)
-		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppc64)	basic_machine=powerpc64-unknown
-		;;
-	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
-		basic_machine=powerpc64le-unknown
-		;;
-	ppc64le-* | powerpc64little-*)
-		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ps2)
-		basic_machine=i386-ibm
-		;;
-	pw32)
-		basic_machine=i586-unknown
-		os=-pw32
-		;;
-	rdos)
-		basic_machine=i386-pc
-		os=-rdos
-		;;
-	rom68k)
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
-	rm[46]00)
-		basic_machine=mips-siemens
-		;;
-	rtpc | rtpc-*)
-		basic_machine=romp-ibm
-		;;
-	s390 | s390-*)
-		basic_machine=s390-ibm
-		;;
-	s390x | s390x-*)
-		basic_machine=s390x-ibm
-		;;
-	sa29200)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	sb1)
-		basic_machine=mipsisa64sb1-unknown
-		;;
-	sb1el)
-		basic_machine=mipsisa64sb1el-unknown
-		;;
-	sde)
-		basic_machine=mipsisa32-sde
-		os=-elf
-		;;
-	sei)
-		basic_machine=mips-sei
-		os=-seiux
-		;;
-	sequent)
-		basic_machine=i386-sequent
-		;;
-	sh)
-		basic_machine=sh-hitachi
-		os=-hms
-		;;
-	sh5el)
-		basic_machine=sh5le-unknown
-		;;
-	sh64)
-		basic_machine=sh64-unknown
-		;;
-	sparclite-wrs | simso-wrs)
-		basic_machine=sparclite-wrs
-		os=-vxworks
-		;;
-	sps7)
-		basic_machine=m68k-bull
-		os=-sysv2
-		;;
-	spur)
-		basic_machine=spur-unknown
-		;;
-	st2000)
-		basic_machine=m68k-tandem
-		;;
-	stratus)
-		basic_machine=i860-stratus
-		os=-sysv4
-		;;
-	sun2)
-		basic_machine=m68000-sun
-		;;
-	sun2os3)
-		basic_machine=m68000-sun
-		os=-sunos3
-		;;
-	sun2os4)
-		basic_machine=m68000-sun
-		os=-sunos4
-		;;
-	sun3os3)
-		basic_machine=m68k-sun
-		os=-sunos3
-		;;
-	sun3os4)
-		basic_machine=m68k-sun
-		os=-sunos4
-		;;
-	sun4os3)
-		basic_machine=sparc-sun
-		os=-sunos3
-		;;
-	sun4os4)
-		basic_machine=sparc-sun
-		os=-sunos4
-		;;
-	sun4sol2)
-		basic_machine=sparc-sun
-		os=-solaris2
-		;;
-	sun3 | sun3-*)
-		basic_machine=m68k-sun
-		;;
-	sun4)
-		basic_machine=sparc-sun
-		;;
-	sun386 | sun386i | roadrunner)
-		basic_machine=i386-sun
-		;;
-	sv1)
-		basic_machine=sv1-cray
-		os=-unicos
-		;;
-	symmetry)
-		basic_machine=i386-sequent
-		os=-dynix
-		;;
-	t3e)
-		basic_machine=alphaev5-cray
-		os=-unicos
-		;;
-	t90)
-		basic_machine=t90-cray
-		os=-unicos
-		;;
-	tic54x | c54x*)
-		basic_machine=tic54x-unknown
-		os=-coff
-		;;
-	tic55x | c55x*)
-		basic_machine=tic55x-unknown
-		os=-coff
-		;;
-	tic6x | c6x*)
-		basic_machine=tic6x-unknown
-		os=-coff
-		;;
-	tx39)
-		basic_machine=mipstx39-unknown
-		;;
-	tx39el)
-		basic_machine=mipstx39el-unknown
-		;;
-	toad1)
-		basic_machine=pdp10-xkl
-		os=-tops20
-		;;
-	tower | tower-32)
-		basic_machine=m68k-ncr
-		;;
-	tpf)
-		basic_machine=s390x-ibm
-		os=-tpf
-		;;
-	udi29k)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	ultra3)
-		basic_machine=a29k-nyu
-		os=-sym1
-		;;
-	v810 | necv810)
-		basic_machine=v810-nec
-		os=-none
-		;;
-	vaxv)
-		basic_machine=vax-dec
-		os=-sysv
-		;;
-	vms)
-		basic_machine=vax-dec
-		os=-vms
-		;;
-	vpp*|vx|vx-*)
-		basic_machine=f301-fujitsu
-		;;
-	vxworks960)
-		basic_machine=i960-wrs
-		os=-vxworks
-		;;
-	vxworks68)
-		basic_machine=m68k-wrs
-		os=-vxworks
-		;;
-	vxworks29k)
-		basic_machine=a29k-wrs
-		os=-vxworks
-		;;
-	w65*)
-		basic_machine=w65-wdc
-		os=-none
-		;;
-	w89k-*)
-		basic_machine=hppa1.1-winbond
-		os=-proelf
-		;;
-	xbox)
-		basic_machine=i686-pc
-		os=-mingw32
-		;;
-	xps | xps100)
-		basic_machine=xps100-honeywell
-		;;
-	ymp)
-		basic_machine=ymp-cray
-		os=-unicos
-		;;
-	z8k-*-coff)
-		basic_machine=z8k-unknown
-		os=-sim
-		;;
-	none)
-		basic_machine=none-none
-		os=-none
-		;;
-
-# Here we handle the default manufacturer of certain CPU types.  It is in
-# some cases the only manufacturer, in others, it is the most popular.
-	w89k)
-		basic_machine=hppa1.1-winbond
-		;;
-	op50n)
-		basic_machine=hppa1.1-oki
-		;;
-	op60c)
-		basic_machine=hppa1.1-oki
-		;;
-	romp)
-		basic_machine=romp-ibm
-		;;
-	mmix)
-		basic_machine=mmix-knuth
-		;;
-	rs6000)
-		basic_machine=rs6000-ibm
-		;;
-	vax)
-		basic_machine=vax-dec
-		;;
-	pdp10)
-		# there are many clones, so DEC is not a safe bet
-		basic_machine=pdp10-unknown
-		;;
-	pdp11)
-		basic_machine=pdp11-dec
-		;;
-	we32k)
-		basic_machine=we32k-att
-		;;
-	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
-		basic_machine=sh-unknown
-		;;
-	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
-		basic_machine=sparc-sun
-		;;
-	cydra)
-		basic_machine=cydra-cydrome
-		;;
-	orion)
-		basic_machine=orion-highlevel
-		;;
-	orion105)
-		basic_machine=clipper-highlevel
-		;;
-	mac | mpw | mac-mpw)
-		basic_machine=m68k-apple
-		;;
-	pmac | pmac-mpw)
-		basic_machine=powerpc-apple
-		;;
-	*-unknown)
-		# Make sure to match an already-canonicalized machine name.
-		;;
-	*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
-		;;
-esac
-
-# Here we canonicalize certain aliases for manufacturers.
-case $basic_machine in
-	*-digital*)
-		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
-		;;
-	*-commodore*)
-		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
-		;;
-	*)
-		;;
-esac
-
-# Decode manufacturer-specific aliases for certain operating systems.
-
-if [ x"$os" != x"" ]
-then
-case $os in
-        # First match some system type aliases
-        # that might get confused with valid system types.
-	# -solaris* is a basic system type, with this one exception.
-	-solaris1 | -solaris1.*)
-		os=`echo $os | sed -e 's|solaris1|sunos4|'`
-		;;
-	-solaris)
-		os=-solaris2
-		;;
-	-svr4*)
-		os=-sysv4
-		;;
-	-unixware*)
-		os=-sysv4.2uw
-		;;
-	-gnu/linux*)
-		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
-		;;
-	# First accept the basic system types.
-	# The portable systems comes first.
-	# Each alternative MUST END IN A *, to match a version number.
-	# -sysv* is not here because it comes later, after sysvr4.
-	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
-	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-	      | -aos* \
-	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
-	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -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-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* | -vos* | -palmos* | -uclinux* | -nucleus* \
-	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
-	# Remember, each alternative MUST END IN *, to match a version number.
-		;;
-	-qnx*)
-		case $basic_machine in
-		    x86-* | i*86-*)
-			;;
-		    *)
-			os=-nto$os
-			;;
-		esac
-		;;
-	-nto-qnx*)
-		;;
-	-nto*)
-		os=`echo $os | sed -e 's|nto|nto-qnx|'`
-		;;
-	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
-	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
-		;;
-	-mac*)
-		os=`echo $os | sed -e 's|mac|macos|'`
-		;;
-	-linux-dietlibc)
-		os=-linux-dietlibc
-		;;
-	-linux*)
-		os=`echo $os | sed -e 's|linux|linux-gnu|'`
-		;;
-	-sunos5*)
-		os=`echo $os | sed -e 's|sunos5|solaris2|'`
-		;;
-	-sunos6*)
-		os=`echo $os | sed -e 's|sunos6|solaris3|'`
-		;;
-	-opened*)
-		os=-openedition
-		;;
-        -os400*)
-		os=-os400
-		;;
-	-wince*)
-		os=-wince
-		;;
-	-osfrose*)
-		os=-osfrose
-		;;
-	-osf*)
-		os=-osf
-		;;
-	-utek*)
-		os=-bsd
-		;;
-	-dynix*)
-		os=-bsd
-		;;
-	-acis*)
-		os=-aos
-		;;
-	-atheos*)
-		os=-atheos
-		;;
-	-syllable*)
-		os=-syllable
-		;;
-	-386bsd)
-		os=-bsd
-		;;
-	-ctix* | -uts*)
-		os=-sysv
-		;;
-	-nova*)
-		os=-rtmk-nova
-		;;
-	-ns2 )
-		os=-nextstep2
-		;;
-	-nsk*)
-		os=-nsk
-		;;
-	# Preserve the version number of sinix5.
-	-sinix5.*)
-		os=`echo $os | sed -e 's|sinix|sysv|'`
-		;;
-	-sinix*)
-		os=-sysv4
-		;;
-        -tpf*)
-		os=-tpf
-		;;
-	-triton*)
-		os=-sysv3
-		;;
-	-oss*)
-		os=-sysv3
-		;;
-	-svr4)
-		os=-sysv4
-		;;
-	-svr3)
-		os=-sysv3
-		;;
-	-sysvr4)
-		os=-sysv4
-		;;
-	# This must come after -sysvr4.
-	-sysv*)
-		;;
-	-ose*)
-		os=-ose
-		;;
-	-es1800*)
-		os=-ose
-		;;
-	-xenix)
-		os=-xenix
-		;;
-	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-		os=-mint
-		;;
-	-aros*)
-		os=-aros
-		;;
-	-kaos*)
-		os=-kaos
-		;;
-	-zvmoe)
-		os=-zvmoe
-		;;
-	-none)
-		;;
-	*)
-		# Get rid of the `-' at the beginning of $os.
-		os=`echo $os | sed 's/[^-]*-//'`
-		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
-		exit 1
-		;;
-esac
-else
-
-# Here we handle the default operating systems that come with various machines.
-# The value should be what the vendor currently ships out the door with their
-# machine or put another way, the most popular os provided with the machine.
-
-# Note that if you're going to try to match "-MANUFACTURER" here (say,
-# "-sun"), then you have to tell the case statement up towards the top
-# that MANUFACTURER isn't an operating system.  Otherwise, code above
-# will signal an error saying that MANUFACTURER isn't an operating
-# system, and we'll never get to this point.
-
-case $basic_machine in
-        score-*)
-		os=-elf
-		;;
-        spu-*)
-		os=-elf
-		;;
-	*-acorn)
-		os=-riscix1.2
-		;;
-	arm*-rebel)
-		os=-linux
-		;;
-	arm*-semi)
-		os=-aout
-		;;
-        c4x-* | tic4x-*)
-        	os=-coff
-		;;
-	# This must come before the *-dec entry.
-	pdp10-*)
-		os=-tops20
-		;;
-	pdp11-*)
-		os=-none
-		;;
-	*-dec | vax-*)
-		os=-ultrix4.2
-		;;
-	m68*-apollo)
-		os=-domain
-		;;
-	i386-sun)
-		os=-sunos4.0.2
-		;;
-	m68000-sun)
-		os=-sunos3
-		# This also exists in the configure program, but was not the
-		# default.
-		# os=-sunos4
-		;;
-	m68*-cisco)
-		os=-aout
-		;;
-        mep-*)
-		os=-elf
-		;;
-	mips*-cisco)
-		os=-elf
-		;;
-	mips*-*)
-		os=-elf
-		;;
-	or32-*)
-		os=-coff
-		;;
-	*-tti)	# must be before sparc entry or we get the wrong os.
-		os=-sysv3
-		;;
-	sparc-* | *-sun)
-		os=-sunos4.1.1
-		;;
-	*-be)
-		os=-beos
-		;;
-	*-haiku)
-		os=-haiku
-		;;
-	*-ibm)
-		os=-aix
-		;;
-    	*-knuth)
-		os=-mmixware
-		;;
-	*-wec)
-		os=-proelf
-		;;
-	*-winbond)
-		os=-proelf
-		;;
-	*-oki)
-		os=-proelf
-		;;
-	*-hp)
-		os=-hpux
-		;;
-	*-hitachi)
-		os=-hiux
-		;;
-	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
-		os=-sysv
-		;;
-	*-cbm)
-		os=-amigaos
-		;;
-	*-dg)
-		os=-dgux
-		;;
-	*-dolphin)
-		os=-sysv3
-		;;
-	m68k-ccur)
-		os=-rtu
-		;;
-	m88k-omron*)
-		os=-luna
-		;;
-	*-next )
-		os=-nextstep
-		;;
-	*-sequent)
-		os=-ptx
-		;;
-	*-crds)
-		os=-unos
-		;;
-	*-ns)
-		os=-genix
-		;;
-	i370-*)
-		os=-mvs
-		;;
-	*-next)
-		os=-nextstep3
-		;;
-	*-gould)
-		os=-sysv
-		;;
-	*-highlevel)
-		os=-bsd
-		;;
-	*-encore)
-		os=-bsd
-		;;
-	*-sgi)
-		os=-irix
-		;;
-	*-siemens)
-		os=-sysv4
-		;;
-	*-masscomp)
-		os=-rtu
-		;;
-	f30[01]-fujitsu | f700-fujitsu)
-		os=-uxpv
-		;;
-	*-rom68k)
-		os=-coff
-		;;
-	*-*bug)
-		os=-coff
-		;;
-	*-apple)
-		os=-macos
-		;;
-	*-atari*)
-		os=-mint
-		;;
-	*)
-		os=-none
-		;;
-esac
-fi
-
-# Here we handle the case where we know the os, and the CPU type, but not the
-# manufacturer.  We pick the logical manufacturer.
-vendor=unknown
-case $basic_machine in
-	*-unknown)
-		case $os in
-			-riscix*)
-				vendor=acorn
-				;;
-			-sunos*)
-				vendor=sun
-				;;
-			-aix*)
-				vendor=ibm
-				;;
-			-beos*)
-				vendor=be
-				;;
-			-hpux*)
-				vendor=hp
-				;;
-			-mpeix*)
-				vendor=hp
-				;;
-			-hiux*)
-				vendor=hitachi
-				;;
-			-unos*)
-				vendor=crds
-				;;
-			-dgux*)
-				vendor=dg
-				;;
-			-luna*)
-				vendor=omron
-				;;
-			-genix*)
-				vendor=ns
-				;;
-			-mvs* | -opened*)
-				vendor=ibm
-				;;
-			-os400*)
-				vendor=ibm
-				;;
-			-ptx*)
-				vendor=sequent
-				;;
-			-tpf*)
-				vendor=ibm
-				;;
-			-vxsim* | -vxworks* | -windiss*)
-				vendor=wrs
-				;;
-			-aux*)
-				vendor=apple
-				;;
-			-hms*)
-				vendor=hitachi
-				;;
-			-mpw* | -macos*)
-				vendor=apple
-				;;
-			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-				vendor=atari
-				;;
-			-vos*)
-				vendor=stratus
-				;;
-		esac
-		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
-		;;
-esac
-
-echo $basic_machine$os
-exit
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:
diff --git a/debian/changelog b/debian/changelog
index dc67ef3..cfdd621 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,43 @@
+ifplugd (0.28-5) unstable; urgency=low
+
+  * Adopted by Y Giridhar Appaji Nag <giridhar@appaji.net> (Closes: #452184)
+  * Add Homepage: and Vcs-*: to debian/control
+  * Thanks for updated/new debconf translations:
+    + Dutch: "cobaco (aka Bart Cornelis)" <cobaco@skolelinux.no>
+      (Closes: #414760)
+    + Japanese: TANAKA Atushi <atanaka@hotcake.halfmoon.jp> (Closes: #414888)
+    + Basque: Piarres Beobide <pi@beobide.net> (Closes: #457827)
+    + Italian: Luca Monducci <luca.mo@tiscali.it> (Closes: #458193)
+    + Finnish: "Esko Arajärvi" <edu@iki.fi> (Closes: #460304)
+  * Remove lynx-ssl from Build-Depends, it is provided by lynx now.
+  * In config.status target, save files modified during build and restore them
+    in the clean target.
+  * Add autotools-dev to Build-Depends:
+  * Fix lintian W: debian-rules-ignores-make-clean-error
+  * Correct path to the config file (Closes: #393185)
+  * On upgrade, remove exec bit from /etc/udev/ifplugd.rules (Closes: #418918)
+  * Bump up Standards-Version to 3.7.3, update debian/copyright for 3.7.3
+  * Update debian/compat to 5, change Build-Depends debhelper version to >= 5
+  * Add help text to the ifplugd/args debconf template (Closes: #213910)
+  * debian/patches
+    + Patch 01_loff_t_dev_t_conflict - Fix for #451432
+    + Patch 02_manpage_paths_and_typos to fix paths, typos and lintian W:
+      hyphen-used-as-minus-sign in manpages and doc
+  * pass --disable-subversion to configure script to prevent re-generating
+    svn-revision.h and sneak in --disable-xmltoman also :)
+  * debian/ifplugd.init has no bashisms, change /bin/bash to /bin/sh.  Thanks
+    Mark Hindley <mark@hindley.org.uk> (Closes: #368797)
+  * Don't start daemon for for non-existing static interfaces.  Thanks Teemu
+    Likonen <tlikonen@iki.fi> (Closes: #404955)
+  * Remove /etc/hotplug.d/net/ifplugd.hotplug on upgrade (Closes: #360464)
+  * Since we build only one binary package, remove ifplugd prefix from files
+    used by debhelper.
+  * Added manpages file with ifplugd.conf.5, ifplugd.8 and ifplugstatus.8.
+    Use this instead of passing an argument to dh_installman.
+  * Add a version 3 debian/watch file.
+
+ -- Y Giridhar Appaji Nag <giridhar@appaji.net>  Thu, 06 Mar 2008 08:46:28 +0530
+
 ifplugd (0.28-4) unstable; urgency=low
 
   * QA upload.
diff --git a/debian/compat b/debian/compat
index b8626c4..7ed6ff8 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-4
+5
diff --git a/debian/control b/debian/control
index a64dfc2..89a7451 100644
--- a/debian/control
+++ b/debian/control
@@ -1,9 +1,12 @@
 Source: ifplugd
 Section: net
 Priority: optional
-Maintainer: Debian QA Group <packages@qa.debian.org>
-Build-Depends: debhelper (>> 4.1.16), dpatch, libdaemon-dev (>= 0.7), lynx | lynx-ssl, pkg-config, po-debconf
-Standards-Version: 3.6.1
+Maintainer: Y Giridhar Appaji Nag <giridhar@appaji.net>
+Build-Depends: debhelper (>= 5), dpatch, autotools-dev, libdaemon-dev (>= 0.7), lynx, pkg-config, po-debconf
+Standards-Version: 3.7.3
+Homepage: http://0pointer.de/lennart/projects/ifplugd/
+Vcs-Svn: svn://svn.debian.org/svn/collab-maint/ext-maint/ifplugd/unstable
+Vcs-Browser: http://svn.debian.org/wsvn/collab-maint/ext-maint/ifplugd/unstable/?op=log
 
 Package: ifplugd
 Architecture: any
diff --git a/debian/copyright b/debian/copyright
index 34adb3f..7459c21 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,9 +3,15 @@ Mon, 30 Sep 2002 23:59:28 +0200.
 
 It was downloaded from http://0pointer.de/lennart/projects/ifplugd/
 
-Upstream Author: Lennart Poettering <mzvscyhtq (at) 0pointer (dot) de>
+Upstream Author:
+
+    Lennart Poettering <mzvscyhtq (at) 0pointer (dot) de>
+
 Copyright:
 
+    Copyright (C) 2002-2007 Lennart Poettering <mzvscyhtq (at) 0pointer (dot) de>
+
+License:
 
     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
@@ -18,9 +24,12 @@ Copyright:
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
+    with the Debian GNU/Linux distribution in the file
+    /usr/share/common-licenses/GPL-2; if not, write to the Free Software
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 
-
-Please see /usr/share/common-licenses/GPL for the complete license.
-
+The Debian packaging is
+Copyright (C) 2002-2007, Oliver Kurth <oku@masqmail.cx>
+Copyright (C) 2008, Y Giridhar Appaji Nag <giridhar@appaji.net> and
+is licensed under the GNU GPL, either version 2 of the License, or (at
+your option) any later version; see `/usr/share/common-licenses/GPL-2'.
diff --git a/debian/docs b/debian/docs
index e845566..a7fe20e 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1 +1,6 @@
-README
+doc/NEWS
+doc/README
+doc/README.html
+doc/style.css
+doc/SUPPORTED_DRIVERS
+patches
diff --git a/debian/ifplugd.docs b/debian/ifplugd.docs
deleted file mode 100644
index a7fe20e..0000000
--- a/debian/ifplugd.docs
+++ /dev/null
@@ -1,6 +0,0 @@
-doc/NEWS
-doc/README
-doc/README.html
-doc/style.css
-doc/SUPPORTED_DRIVERS
-patches
diff --git a/debian/ifplugd.init b/debian/ifplugd.init
index 606d283..13a14d8 100644
--- a/debian/ifplugd.init
+++ b/debian/ifplugd.init
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 # $Id: ifplugd.init.in 43 2003-09-13 11:25:11Z lennart $
 
 # This file is part of ifplugd.
@@ -24,7 +24,7 @@
 #              the cable is removed / inserted
 #
 # processname: /usr/sbin/ifplugd
-# config: /etc/ifplugd/ifplugd.conf
+# config: /etc/default/ifplugd
 
 ### BEGIN INIT INFO
 # Provides:          ifplugd
@@ -34,13 +34,8 @@
 # X-UnitedLinux-Should-Stop: $
 # Default-Start:     3 5
 # Default-Stop:      0 1 2 6
-# Short-Description: ifplugd daemon providing
-# Description:       Start ifplugd to allow XY and provide YZ
-#  continued on second line by '#<TAB>'
-#  should contain enough info for the runlevel editor
-#  to give admin some idea what this service does and
-#  what it's needed for ...
-#  (The Short-Description should already be a good hint.)
+# Short-Description: ifplugd daemon
+# Description:       Start ifplugd
 ### END INIT INFO
 
 CFG=/etc/default/ifplugd
@@ -66,6 +61,7 @@ case "$VERB" in
     start)
         echo -n "Starting Network Interface Plugging Daemon:"
         for IF in $INTERFACES ; do
+            grep --quiet $IF /proc/net/dev || continue
             IF1=$(echo $IF | sed "s/-/_/")
             A=$(eval echo \$\{ARGS_${IF1}\})
             [ -z "$A" ] && A="$ARGS"
diff --git a/debian/ifplugd.preinst b/debian/ifplugd.preinst
deleted file mode 100644
index fe0d24a..0000000
--- a/debian/ifplugd.preinst
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-set -e
-
-case "$1" in
-    upgrade)
-	    ### Move old apm hook script if appropriate ###
-	    if [ -f /etc/apm/event.d/20ifplugd ] ; then
-		[ -d /etc/apm/scripts.d/ ] || mkdir /etc/apm/scripts.d/
-		if [ -f /etc/apm/scripts.d/ifplugd ] ; then
-			mv -f /etc/apm/event.d/20ifplugd /etc/apm/event.d/20ifplugd.dpkg-old
-			chmod ugo-x /etc/apm/event.d/20ifplugd.dpkg-old
-		else
-			mv -f /etc/apm/event.d/20ifplugd /etc/apm/scripts.d/ifplugd
-		fi
-		for F in /etc/apm/suspend.d/20ifplugd /etc/apm/resume.d/80ifplugd /etc/apm/other.d/50ifplugd ; do
-			[ -e $F ] && { mv -f $F ${F}.dpkg-old ; chmod ugo-x ${F}.dpkg-old ; }
-			ln -nsf ../scripts.d/ifplugd $F
-		done
-	    fi
-
-	    # rename old script (old typo bug), maybe user changed it:
-	    if [ -f /etc/apm/script.d/ifplugd ] ; then
-		mv /etc/apm/script.d/ifplugd /etc/apm/script.d/ifplugd.dpkg-old
-	    fi
-
-	;;
-# install|abort-upgrade)
-	# Nothing to do
-esac
-
-#DEBHELPER#
diff --git a/debian/ifplugd.templates b/debian/ifplugd.templates
index 0cf766a..d550944 100644
--- a/debian/ifplugd.templates
+++ b/debian/ifplugd.templates
@@ -28,8 +28,23 @@ Template: ifplugd/args
 Type: string
 Default: -q -f -u0 -d10 -w -I
 _Description: arguments to ifplugd:
- You can give arguments to the ifplug daemon here. See the man page for a
- description or call ifplugd -h.
+ You can give arguments to the ifplug daemon here.  Relevant options are:
+ .
+ -q Don't run script on daemon quit,
+ -f Ignore detection failure and retry,
+ -u Specify delay for configuring interface,
+ -d Specify delay for deconfiguring interface,
+ -w Wait until daemon fork finished,
+ -I Don't exit on nonzero return value of program executed,
+ .
+ -a Do not enable interface automatically, 
+ -s Use stderr instead of syslog for debugging,
+ -b Do not beep,
+ -t Specify poll time in seconds,
+ -p Don't run script on daemon startup,
+ -l Run "down" script on startup if no cable is detected,
+ -W Wait until the daemon died when running daemon is killed,
+ -M Use interface monitoring,
 
 Template: ifplugd/suspend_action
 Type: select
diff --git a/debian/ifplugd.templates.old b/debian/ifplugd.templates.old
deleted file mode 100644
index 65fcb57..0000000
--- a/debian/ifplugd.templates.old
+++ /dev/null
@@ -1,54 +0,0 @@
-Template: ifplugd/interfaces
-Type: string
-Default:
-Description: static interfaces to be watched by ifplugd
- Specify the interfaces to control here, separated by spaces.
- Ifplugd processes will be started for each of these interfaces
- when the ifplugd initscript is called with the "start" argument.
- You may use the magic string "auto" to make the initscript 
- start or stop ifplugd processes for ALL eth and wlan interfaces
- that are available according to /proc/net/dev.  Note that the
- list of interfaces appearing in /proc/net/dev may depend on
- which kernel modules you have loaded.
- .
- You should not add interfaces that are hotplugged (USB or
- PCMCIA) here, you will be asked for those in the next question.
-
-Template: ifplugd/hotplug_interfaces
-Type: string
-Default:
-Description: hotplugged interfaces to be watched by ifplugd
- Specify the hotplugged interfaces to control here, separated by spaces.
- .
- You may use the magic string "all" to make the hotplug script
- start an ifplugd process for any hotplugged interface.
- .
- Hotplugged interfaces are usually interfaces on PCMCIA or WLAN
- adapters.
-
-Template: ifplugd/args
-Type: string
-Default: -q -f -u0 -d10 -w -I
-Description: arguments to ifplugd
- You can give arguments to the ifplug daemon here. See the
- man page for a description or call ifplugd -h.
-
-Template: ifplugd/suspend_action
-Type: select
-Choices: none, suspend, stop
-Default: stop
-Description: suspend behaviour
- When you put your notebook into suspend mode, you can
- choose between three actions:
- .
- none: no action
- .
- suspend: this puts ifplugd into suspend mode. In this mode,
- ifplugd does not check the link status. This is necessary for
- some broken network drivers.
- .
- stop: this stops ifplugd. If the -q option is not given, ifplugd
- will stop the interface. After resume, it will be restarted. This
- makes sense if you use some mechanism (eg. gueesnet or whereami)
- to detect your network environment, which may have changed while
- suspending.
diff --git a/debian/ifplugd.links b/debian/links
index 81d0877..81d0877 100644
--- a/debian/ifplugd.links
+++ b/debian/links
diff --git a/debian/manpages b/debian/manpages
new file mode 100644
index 0000000..513001b
--- /dev/null
+++ b/debian/manpages
@@ -0,0 +1,3 @@
+man/ifplugd.conf.5
+man/ifplugd.8
+man/ifplugstatus.8
diff --git a/debian/patches/00list b/debian/patches/00list
index 3a0ebac..0c9d72f 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1 +1,2 @@
 01_loff_t_dev_t_conflict
+02_manpage_paths_and_typos
diff --git a/debian/patches/01_loff_t_dev_t_conflict.dpatch b/debian/patches/01_loff_t_dev_t_conflict.dpatch
index cbae5be..f28b9f3 100644
--- a/debian/patches/01_loff_t_dev_t_conflict.dpatch
+++ b/debian/patches/01_loff_t_dev_t_conflict.dpatch
@@ -1,5 +1,5 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_loff_t_dev_t_conflict.dpatch from Jeremie Corbier <jcorbier@ubuntu.com>
+## 01_loff_t_dev_t_conflict.dpatch by Jeremie Corbier <jcorbier@ubuntu.com>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
 ## DP: Fixes FTBFS: Conflict between sys/types.h linux/types.h loff_t/dev_t
diff --git a/debian/patches/02_manpage_paths_and_typos.dpatch b/debian/patches/02_manpage_paths_and_typos.dpatch
new file mode 100644
index 0000000..f7e9aac
--- /dev/null
+++ b/debian/patches/02_manpage_paths_and_typos.dpatch
@@ -0,0 +1,287 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_manpage_paths_and_typos.dpatch by Y Giridhar Appaji Nag <giridhar@appaji.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Path and typo fixes made a dpatch, fix lintian W: hyphen-used-as-minus-sign
+
+@DPATCH@
+diff -urNad ifplugd-0.28~/doc/README ifplugd-0.28/doc/README
+--- ifplugd-0.28~/doc/README	2008-03-02 21:04:33.000000000 +0530
++++ ifplugd-0.28/doc/README	2008-03-02 21:04:39.000000000 +0530
+@@ -186,7 +186,7 @@
+ 
+    When you are using the hotplug subsystem (Debian package hotplug) you
+    may notice that the network device is configured even when it is not
+-   listed on an auto line in /etc/network/interface. This may be due to
++   listed on an auto line in /etc/network/interfaces. This may be due to
+    hotplug being configured to ifup the network interface when it becomes
+    available. This was the default behavior in the Debian hotplug package
+    prior to release 0.0.20030117-1, for example. To prevent this you
+diff -urNad ifplugd-0.28~/doc/README.html ifplugd-0.28/doc/README.html
+--- ifplugd-0.28~/doc/README.html	2008-03-02 21:04:33.000000000 +0530
++++ ifplugd-0.28/doc/README.html	2008-03-02 21:04:39.000000000 +0530
+@@ -188,7 +188,7 @@
+ <p>When you are using the hotplug subsystem (Debian package
+ <tt>hotplug</tt>) you may notice that the network device is configured
+ even when it is not listed on an <tt>auto</tt> line in
+-<tt>/etc/network/interface</tt>. This may be due to <tt>hotplug</tt>
++<tt>/etc/network/interfaces</tt>. This may be due to <tt>hotplug</tt>
+ being configured to <tt>ifup</tt> the network interface when it
+ becomes available.  This was the default behavior in the Debian
+ <tt>hotplug</tt> package prior to release <tt>0.0.20030117-1</tt>, for
+diff -urNad ifplugd-0.28~/doc/README.html.in ifplugd-0.28/doc/README.html.in
+--- ifplugd-0.28~/doc/README.html.in	2008-03-02 21:04:33.000000000 +0530
++++ ifplugd-0.28/doc/README.html.in	2008-03-02 21:04:39.000000000 +0530
+@@ -188,7 +188,7 @@
+ <p>When you are using the hotplug subsystem (Debian package
+ <tt>hotplug</tt>) you may notice that the network device is configured
+ even when it is not listed on an <tt>auto</tt> line in
+-<tt>/etc/network/interface</tt>. This may be due to <tt>hotplug</tt>
++<tt>/etc/network/interfaces</tt>. This may be due to <tt>hotplug</tt>
+ being configured to <tt>ifup</tt> the network interface when it
+ becomes available.  This was the default behavior in the Debian
+ <tt>hotplug</tt> package prior to release <tt>0.0.20030117-1</tt>, for
+diff -urNad ifplugd-0.28~/man/ifplugd.8 ifplugd-0.28/man/ifplugd.8
+--- ifplugd-0.28~/man/ifplugd.8	2008-03-02 21:04:33.000000000 +0530
++++ ifplugd-0.28/man/ifplugd.8	2008-03-02 21:04:55.000000000 +0530
+@@ -9,88 +9,88 @@
+ 
+ It uses your distribution's native ifup/ifdown programs, but can be configured to do anything you wish when the state of the interface changes. It may ignore short unplugged whiles (\fB-d\f1 option) or plugged whiles (\fB-u\f1 option).
+ 
+-ifplugd may be used in "compatibility mode" by specifying -F on the command line. Than ifplugd will treat network drivers which do not support link beat querying as always online.
++ifplugd may be used in "compatibility mode" by specifying \-F on the command line. Than ifplugd will treat network drivers which do not support link beat querying as always online.
+ .SH OPTIONS
+ .TP
+-\fB-a | --no-auto\f1
++\fB\-a | \-\-no-auto\f1
+ Do not enable interface automatically (default: off) 
+ .TP
+-\fB-n | --no-daemon\f1
++\fB\-n | \-\-no-daemon\f1
+ Do not daemonize (for debugging) (default: off) 
+ .TP
+-\fB-s | --no-syslog\f1
++\fB\-s | \-\-no-syslog\f1
+ Do not use syslog, use stdout instead (for debugging) (default: off). 
+ .TP
+-\fB-b | --no-beep\f1
++\fB\-b | \-\-no-beep\f1
+ Do not beep (off) 
+ .TP
+-\fB-f | --ignore-fail\f1
++\fB\-f | \-\-ignore-fail\f1
+ Ignore detection failure, retry instead. Failure is treated as "no link". (default: off) 
+ .TP
+-\fB-F | --ignore-fail-positive\f1
++\fB\-F | \-\-ignore-fail-positive\f1
+ Ignore detection failure, retry instead. Failure is treated as "link detected". (default: off) 
+ .TP
+-\fB-i | --iface=\f1 \fIIFACE\f1
++\fB\-i | \-\-iface=\f1 \fIIFACE\f1
+ Specify ethernet interface (default: eth0) 
+ .TP
+-\fB-r | --run=\f1 \fIEXEC\f1
++\fB\-r | \-\-run=\f1 \fIEXEC\f1
+ Specify program to execute when link status changes (default: \fI/etc/ifplugd/ifplugd.action\f1) 
+ .TP
+-\fB-I | --ignore-retval\f1
++\fB\-I | \-\-ignore-retval\f1
+ Don't exit on nonzero return value of program executed on link change. (default: off) 
+ .TP
+-\fB-t | --poll-time=\f1 \fISECS\f1
++\fB\-t | \-\-poll-time=\f1 \fISECS\f1
+ Specify poll time in seconds (default: 1) 
+ .TP
+-\fB-u | --delay-up=\f1 \fISECS\f1
++\fB\-u | \-\-delay-up=\f1 \fISECS\f1
+ Specify delay for configuring interface (default: 0) 
+ .TP
+-\fB-d | --delay-down=\f1 \fISECS\f1
++\fB\-d | \-\-delay-down=\f1 \fISECS\f1
+ Specify delay for deconfiguring interface (default: 5) 
+ .TP
+-\fB-m | --api-mode=\f1 \fIMODE\f1
++\fB\-m | \-\-api-mode=\f1 \fIMODE\f1
+ Force a specific link beat detection ioctl() API. Possible values are auto, iff, wlan, ethtool, mii, and priv for automatic detection, interface flag (IFF_RUNNING), wireless extension, SIOCETHTOOL, SIOCGMIIREG resp. SIOCPRIV. Only the first character of the argument is relevant, case insensitive. (default: auto) 
+ .TP
+-\fB-p | --no-startup\f1
++\fB\-p | \-\-no-startup\f1
+ Don't call the script to bring up network on deamon start (default: off) 
+ .TP
+-\fB-q | --no-shutdown\f1
++\fB\-q | \-\-no-shutdown\f1
+ Don't call the script for network shutdown on deamon quit (default: off) 
+ .TP
+-\fB-w | --wait-on-fork\f1
++\fB\-w | \-\-wait-on-fork\f1
+ When daemonizing, wait until the background process finished with the initial link beat detection. When this is enabled, the parent process will return the link status on exit. 1 means link beat detected, 2 stands for link beat not detected, everything else is an error. 
+ .TP
+-\fB-W | --wait-on-kill\f1
+-When killing a running daemon (with -k) wait until the daemon died. 
++\fB\-W | \-\-wait-on-kill\f1
++When killing a running daemon (with \-k) wait until the daemon died. 
+ .TP
+-\fB-x | --extra-arg=\f1 \fIARG\f1
++\fB\-x | \-\-extra-arg=\f1 \fIARG\f1
+ Specify an extra argument to be passed to the action script. 
+ .TP
+-\fB-M | --monitor\f1
++\fB\-M | \-\-monitor\f1
+ Don't fail when the network interface is not available, instead use NETLINK to monitor device avaibility. The is useful for PCMCIA devices and similar. 
+ .TP
+-\fB-h | --help\f1
++\fB\-h | \-\-help\f1
+ Show help 
+ .TP
+-\fB-k | --kill\f1
+-Kill a running daemon (Specify -i to select the daemon instance to kill) 
++\fB\-k | \-\-kill\f1
++Kill a running daemon (Specify \-i to select the daemon instance to kill) 
+ .TP
+-\fB-c | --check-running\f1
++\fB\-c | \-\-check-running\f1
+ Check if a daemon is running for a given network interface. Sets the return value to 0 if a daemon is already running or to 255 if not. 
+ .TP
+-\fB-v | --version\f1
++\fB\-v | \-\-version\f1
+ Show version 
+ .TP
+-\fB-S | --supend\f1
+-Suspend a running daemon. The daemon will no longer check the link status until it is resumed (-R) again. (Specify -i to select the daemon instance to suspend.) 
++\fB\-S | \-\-supend\f1
++Suspend a running daemon. The daemon will no longer check the link status until it is resumed (\-R) again. (Specify \-i to select the daemon instance to suspend.) 
+ .TP
+-\fB-R | --resume\f1
+-Resume a suspended daemon. (Specify -i to select the daemon instance to resume.) 
++\fB\-R | \-\-resume\f1
++Resume a suspended daemon. (Specify \-i to select the daemon instance to resume.) 
+ .TP
+-\fB-z | --info\f1
+-Request that a running daemon shall write its status information to syslog. (Specify -i to select the daemon instance to send the request to.) 
++\fB\-z | \-\-info\f1
++Request that a running daemon shall write its status information to syslog. (Specify \-i to select the daemon instance to send the request to.) 
+ .SH FILES
+-\fI/etc/ifplugd/ifplugd.conf\f1: this file is sourced by the init script \fI/etc/init.d/ifplugd\f1 and contains the interface to be monitored and the options to be used.
++\fI/etc/default/ifplugd\f1: this file is sourced by the init script \fI/etc/init.d/ifplugd\f1 and contains the interface to be monitored and the options to be used.
+ 
+ \fI/etc/ifplugd/ifplugd.action\f1: this is the script which will be called by the daemon whenever the state of the interface changes. It takes two areguments: the first is the interface name (eg. eth0), the second either "up" or "down". 
+ 
+@@ -102,15 +102,15 @@
+ 
+ \fIIFPLUGD_CURRENT\f1 The current link status. See above for possible values.
+ .SH SIGNALS
+-\fISIGINT, SIGTERM\f1 ifplugd will quit, possibly running the shutdown script. This is issued by passing -k to ifplugd.
++\fISIGINT, SIGTERM\f1 ifplugd will quit, possibly running the shutdown script. This is issued by passing \-k to ifplugd.
+ 
+ \fISIGQUIT\f1 ifplugd will quit, the shutdown script is never run.
+ 
+-\fISIGHUP\f1 ifplugd will write its status information to syslog. This is issued by -z.
++\fISIGHUP\f1 ifplugd will write its status information to syslog. This is issued by \-z.
+ 
+-\fISIGUSR1\f1 ifplugd will go to suspend mode. (-S)
++\fISIGUSR1\f1 ifplugd will go to suspend mode. (\-S)
+ 
+-\fISIGUSR2\f1 ifplugd will resume from suspend mode. (-R)
++\fISIGUSR2\f1 ifplugd will resume from suspend mode. (\-R)
+ .SH AUTHOR
+ ifplugd was written by Lennart Poettering <mzvscyhtq (at) 0pointer (dot) de>. ifplugd is available at \fBhttp://0pointer.de/lennart/projects/ifplugd/\f1
+ .SH SEE ALSO
+diff -urNad ifplugd-0.28~/man/ifplugd.8.xml.in ifplugd-0.28/man/ifplugd.8.xml.in
+--- ifplugd-0.28~/man/ifplugd.8.xml.in	2008-03-02 21:04:33.000000000 +0530
++++ ifplugd-0.28/man/ifplugd.8.xml.in	2008-03-02 21:04:39.000000000 +0530
+@@ -185,7 +185,7 @@
+ 	  <option>
+ 	  	<p><opt>-M | --monitor</opt></p>
+ 		<optdesc><p>
+-			Don't fail when the network interface is not available, instead use NETLINK to monitor device avaibility. The is useful for PCMCIA devices and similar. 
++			Don't fail when the network interface is not available, instead use NETLINK to monitor device availability. The is useful for PCMCIA devices and similar. 
+ 		</p></optdesc>
+ 	  </option>
+ 	  
+@@ -218,7 +218,7 @@
+ 	  </option>
+ 	  
+ 	  <option>
+-		<p><opt>-S | --supend</opt></p> <optdesc><p> Suspend a running
++		<p><opt>-S | --suspend</opt></p> <optdesc><p> Suspend a running
+ 		daemon. The daemon will no longer check the link status until
+ 		it is resumed (-R) again. (Specify -i to select the daemon instance
+ 		to suspend.)  </p></optdesc>
+@@ -241,14 +241,14 @@
+ 	
+ 	<section name="Files">
+ 	  
+-	  <p><file>@sysconfdir@/ifplugd/ifplugd.conf</file>: this file is sourced
++	  <p><file>@sysconfdir@/default/ifplugd</file>: this file is sourced
+ 		by the init script <file>@sysconfdir@/init.d/ifplugd</file> and
+ 		contains the interface to be monitored and the options to be
+ 		used.</p>
+ 	  
+ 	  <p><file>@sysconfdir@/ifplugd/ifplugd.action</file>: this is the script
+ 		which will be called by the daemon whenever the state of the
+-	 	interface changes. It takes two areguments: the first is the interface
++	 	interface changes. It takes two arguments: the first is the interface
+ 		name (eg. eth0), the second either "up" or "down". </p>
+ 		
+ 	  <p><file>/var/run/ifplugd.&lt;iface&gt;.pid</file>: the pid file
+diff -urNad ifplugd-0.28~/man/ifplugd.conf.5 ifplugd-0.28/man/ifplugd.conf.5
+--- ifplugd-0.28~/man/ifplugd.conf.5	2008-03-02 21:04:33.000000000 +0530
++++ ifplugd-0.28/man/ifplugd.conf.5	2008-03-02 21:04:39.000000000 +0530
+@@ -2,7 +2,7 @@
+ .SH NAME
+ ifplugd.conf \- ifplugd configuration file
+ .SH SYNOPSIS
+-\fB/etc/ifplugd/ifplugd.conf
++\fB/etc/default/ifplugd
+ \f1
+ .SH DESCRIPTION
+ ifplugd.conf is the configuration file for ifplugd. It is a shell script that is sourced by the init script starting the daemon. It shall be used to set environment variables which are interpreted by the init script:
+diff -urNad ifplugd-0.28~/man/ifplugd.conf.5.xml.in ifplugd-0.28/man/ifplugd.conf.5.xml.in
+--- ifplugd-0.28~/man/ifplugd.conf.5.xml.in	2008-03-02 21:04:33.000000000 +0530
++++ ifplugd-0.28/man/ifplugd.conf.5.xml.in	2008-03-02 21:04:39.000000000 +0530
+@@ -25,7 +25,7 @@
+   <manpage name="ifplugd.conf" section="5" desc="ifplugd configuration file">
+ 
+ 	<synopsis>
+-	  <cmd>@sysconfdir@/ifplugd/ifplugd.conf</cmd>
++	  <cmd>@sysconfdir@/default/ifplugd</cmd>
+ 	</synopsis>
+ 	
+ 	<description>
+@@ -40,7 +40,7 @@
+ 	  <option>
+ 		<p><opt>INTERFACES</opt></p> <optdesc><p>Specifies the
+ 		ethernet interfaces to monitor. It has to contain a space
+-		seperated list of network interfaces names. Most users will
++		separated list of network interfaces names. Most users will
+ 		probably use "eth0" here, however you may add additional
+ 		interfaces for monitoring more than one device. A special
+ 		value is supported as well: "auto" will enable a more or less
+diff -urNad ifplugd-0.28~/man/ifplugstatus.8 ifplugd-0.28/man/ifplugstatus.8
+--- ifplugd-0.28~/man/ifplugstatus.8	2008-03-02 21:04:33.000000000 +0530
++++ ifplugd-0.28/man/ifplugstatus.8	2008-03-02 21:04:39.000000000 +0530
+@@ -23,19 +23,19 @@
+ .SH OPTIONS
+ You may specify an ethernet device on the command line. Otherwise ifplugstatus will check all available network interfaces.
+ .TP
+-\fB-a | --auto\f1
++\fB\-a | \-\-auto\f1
+ Enable interface automatically before querying (default: off) 
+ .TP
+-\fB-h | --help\f1
++\fB\-h | \-\-help\f1
+ Show help 
+ .TP
+-\fB-q | --quiet\f1
++\fB\-q | \-\-quiet\f1
+ Decrease verbosity by one. If the verbosity is < 0, no text will be shown, only the return value is relevant; if the verbosity is = 0, a terse status will be shown; If the verbosity is > 0, detailed information about the used API is returned. (By default the verbosity is 0)
+ .TP
+-\fB-v | --verbose\f1
++\fB\-v | \-\-verbose\f1
+ Increase verbosity by one. See option \fB-q\f1. 
+ .TP
+-\fB-V | --version\f1
++\fB\-V | \-\-version\f1
+ Show version 
+ .SH RETURN VALUES
+ \fI0\f1 Success
diff --git a/debian/po/cs.po b/debian/po/cs.po
index 14c76c0..02d34fa 100644
--- a/debian/po/cs.po
+++ b/debian/po/cs.po
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ifplugd\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-11-24 07:23+0100\n"
+"Report-Msgid-Bugs-To: ifplugd@packages.debian.org\n"
+"POT-Creation-Date: 2008-03-04 20:07+0530\n"
 "PO-Revision-Date: 2006-06-04 17:41+0200\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
@@ -101,13 +101,37 @@ msgstr "Parametry pro daemon ifplugd"
 #. Type: string
 #. Description
 #: ../ifplugd.templates:3001
+#, fuzzy
+#| msgid ""
+#| "You can give arguments to the ifplug daemon here. See the man page for a "
+#| "description or call ifplugd -h."
 msgid ""
-"You can give arguments to the ifplug daemon here. See the man page for a "
-"description or call ifplugd -h."
+"You can give arguments to the ifplug daemon here.  Relevant options are:"
 msgstr ""
 "Nyní můžete zadat parametry pro daemona ifplugd. Jejich popis naleznete v "
 "manuálové stránce, nebo ve zkrácené podobě příkazem ifplugd -h."
 
+#. Type: string
+#. Description
+#: ../ifplugd.templates:3001
+msgid ""
+"-q Don't run script on daemon quit, -f Ignore detection failure and retry, -"
+"u Specify delay for configuring interface, -d Specify delay for "
+"deconfiguring interface, -w Wait until daemon fork finished, -I Don't exit "
+"on nonzero return value of program executed,"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../ifplugd.templates:3001
+msgid ""
+"-a Do not enable interface automatically,  -s Use stderr instead of syslog "
+"for debugging, -b Do not beep, -t Specify poll time in seconds, -p Don't run "
+"script on daemon startup, -l Run \"down\" script on startup if no cable is "
+"detected, -W Wait until the daemon died when running daemon is killed, -M "
+"Use interface monitoring,"
+msgstr ""
+
 #. Type: select
 #. Choices
 #: ../ifplugd.templates:4001
diff --git a/debian/po/da.po b/debian/po/da.po
index dc8ecc1..72e9fb7 100644
--- a/debian/po/da.po
+++ b/debian/po/da.po
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ifplugd debconf\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-11-24 07:23+0100\n"
+"Report-Msgid-Bugs-To: ifplugd@packages.debian.org\n"
+"POT-Creation-Date: 2008-03-04 20:07+0530\n"
 "PO-Revision-Date: 2007-02-03 15:46+0100\n"
 "Last-Translator: Claus Hindsgaul <claus.hindsgaul@gmail.com>\n"
 "Language-Team: Danish\n"
@@ -100,13 +100,37 @@ msgstr "parametre til ifplugd:"
 #. Type: string
 #. Description
 #: ../ifplugd.templates:3001
+#, fuzzy
+#| msgid ""
+#| "You can give arguments to the ifplug daemon here. See the man page for a "
+#| "description or call ifplugd -h."
 msgid ""
-"You can give arguments to the ifplug daemon here. See the man page for a "
-"description or call ifplugd -h."
+"You can give arguments to the ifplug daemon here.  Relevant options are:"
 msgstr ""
 "Du kan give parametre til ifplug-dæmonen her. Se manualsiden for en "
 "beskrivelse eller kald 'ifplugd -h'."
 
+#. Type: string
+#. Description
+#: ../ifplugd.templates:3001
+msgid ""
+"-q Don't run script on daemon quit, -f Ignore detection failure and retry, -"
+"u Specify delay for configuring interface, -d Specify delay for "
+"deconfiguring interface, -w Wait until daemon fork finished, -I Don't exit "
+"on nonzero return value of program executed,"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../ifplugd.templates:3001
+msgid ""
+"-a Do not enable interface automatically,  -s Use stderr instead of syslog "
+"for debugging, -b Do not beep, -t Specify poll time in seconds, -p Don't run "
+"script on daemon startup, -l Run \"down\" script on startup if no cable is "
+"detected, -W Wait until the daemon died when running daemon is killed, -M "
+"Use interface monitoring,"
+msgstr ""
+
 #. Type: select
 #. Choices
 #: ../ifplugd.templates:4001
diff --git a/debian/po/de.po b/debian/po/de.po
index 4f1fb2b..d7607d6 100644
--- a/debian/po/de.po
+++ b/debian/po/de.po
@@ -15,8 +15,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ifplugd 0.28-2\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-11-24 07:23+0100\n"
+"Report-Msgid-Bugs-To: ifplugd@packages.debian.org\n"
+"POT-Creation-Date: 2008-03-04 20:07+0530\n"
 "PO-Revision-Date: 2006-12-02 13:05+0100\n"
 "Last-Translator: Holger Wansing <linux@wansing-online.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -106,14 +106,38 @@ msgstr "Argumente für ifplugd:"
 #. Type: string
 #. Description
 #: ../ifplugd.templates:3001
+#, fuzzy
+#| msgid ""
+#| "You can give arguments to the ifplug daemon here. See the man page for a "
+#| "description or call ifplugd -h."
 msgid ""
-"You can give arguments to the ifplug daemon here. See the man page for a "
-"description or call ifplugd -h."
+"You can give arguments to the ifplug daemon here.  Relevant options are:"
 msgstr ""
 "Sie können hier Argumente für den ifplugd-Daemon angeben. Eine Beschreibung "
 "dieser Argumente finden Sie auf der Handbuchseite von ifplugd oder rufen Sie "
 "»ifplugd -h« auf."
 
+#. Type: string
+#. Description
+#: ../ifplugd.templates:3001
+msgid ""
+"-q Don't run script on daemon quit, -f Ignore detection failure and retry, -"
+"u Specify delay for configuring interface, -d Specify delay for "
+"deconfiguring interface, -w Wait until daemon fork finished, -I Don't exit "
+"on nonzero return value of program executed,"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../ifplugd.templates:3001
+msgid ""
+"-a Do not enable interface automatically,  -s Use stderr instead of syslog "
+"for debugging, -b Do not beep, -t Specify poll time in seconds, -p Don't run "
+"script on daemon startup, -l Run \"down\" script on startup if no cable is "
+"detected, -W Wait until the daemon died when running daemon is killed, -M "
+"Use interface monitoring,"
+msgstr ""
+
 #. Type: select
 #. Choices
 #: ../ifplugd.templates:4001
diff --git a/debian/po/es.po b/debian/po/es.po
index 620a9d3..433ba7a 100644
--- a/debian/po/es.po
+++ b/debian/po/es.po
@@ -31,8 +31,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ifplugd\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-11-24 07:23+0100\n"
+"Report-Msgid-Bugs-To: ifplugd@packages.debian.org\n"
+"POT-Creation-Date: 2008-03-04 20:07+0530\n"
 "PO-Revision-Date: 2006-12-21 19:44+0100\n"
 "Last-Translator: Javier Fernandez-Sanguino <jfs@debian.org>\n"
 "Language-Team: Debian Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -62,8 +62,8 @@ msgstr ""
 "espacios. Cuando se llame al programa de arranque de «ifplugd» con el "
 "parámetro «start» se creará un proceso de «ifplugd» por cada interfaz aquí "
 "indicada. Puede utilizar la palabra «auto» para que el programa de arranque "
-"tome en cuenta TODAS las interfaces «eth» y «wlan» disponibles según indique "
-"«/proc/net/dev». Tenga en cuenta que la lista de interfaces disponible en «/"
+"tome en cuenta TODAS las interfaces «eth» y «wlan» disponibles según indique «/"
+"proc/net/dev». Tenga en cuenta que la lista de interfaces disponible en «/"
 "proc/net/dev» dependerá de los módulos del núcleo que haya cargado."
 
 #. Type: string
@@ -118,14 +118,38 @@ msgstr "parámetros para ifplugd:"
 #. Type: string
 #. Description
 #: ../ifplugd.templates:3001
+#, fuzzy
+#| msgid ""
+#| "You can give arguments to the ifplug daemon here. See the man page for a "
+#| "description or call ifplugd -h."
 msgid ""
-"You can give arguments to the ifplug daemon here. See the man page for a "
-"description or call ifplugd -h."
+"You can give arguments to the ifplug daemon here.  Relevant options are:"
 msgstr ""
-"Aquí puede introducir parámetros para «ifplugd». Puede ver una descripción "
-"de los posibles parámetros en la página de manual de «ifplugd» o ejecutando "
+"Aquí puede introducir parámetros para «ifplugd». Puede ver una descripción de "
+"los posibles parámetros en la página de manual de «ifplugd» o ejecutando "
 "«ifplugd -h»."
 
+#. Type: string
+#. Description
+#: ../ifplugd.templates:3001
+msgid ""
+"-q Don't run script on daemon quit, -f Ignore detection failure and retry, -"
+"u Specify delay for configuring interface, -d Specify delay for "
+"deconfiguring interface, -w Wait until daemon fork finished, -I Don't exit "
+"on nonzero return value of program executed,"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../ifplugd.templates:3001
+msgid ""
+"-a Do not enable interface automatically,  -s Use stderr instead of syslog "
+"for debugging, -b Do not beep, -t Specify poll time in seconds, -p Don't run "
+"script on daemon startup, -l Run \"down\" script on startup if no cable is "
+"detected, -W Wait until the daemon died when running daemon is killed, -M "
+"Use interface monitoring,"
+msgstr ""
+
 #. Type: select
 #. Choices
 #: ../ifplugd.templates:4001
diff --git a/debian/po/eu.po b/debian/po/eu.po
new file mode 100644
index 0000000..3ec8f44
--- /dev/null
+++ b/debian/po/eu.po
@@ -0,0 +1,201 @@
+# translation of ifplugd-eu.po to Euskara
+#
+#    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.
+#
+# Piarres Beobide <pi@beobide.net>, 2007.
+msgid ""
+msgstr ""
+"Project-Id-Version: ifplugd-eu\n"
+"Report-Msgid-Bugs-To: ifplugd@packages.debian.org\n"
+"POT-Creation-Date: 2008-03-04 20:07+0530\n"
+"PO-Revision-Date: 2007-12-26 12:09+0100\n"
+"Last-Translator: Piarres Beobide <pi@beobide.net>\n"
+"Language-Team: Euskara <Librezale@librezale.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.4\n"
+
+#. Type: string
+#. Description
+#: ../ifplugd.templates:1001
+msgid "static interfaces to be watched by ifplugd:"
+msgstr "ifplugd -ek begiratu behar dituen interfaze estatikoak:"
+
+#. Type: string
+#. Description
+#: ../ifplugd.templates:1001
+msgid ""
+"Specify the interfaces to control here, separated by spaces. Ifplugd "
+"processes will be started for each of these interfaces when the ifplugd "
+"initscript is called with the \"start\" argument. You may use the magic "
+"string \"auto\" to make the initscript start or stop ifplugd processes for "
+"ALL eth and wlan interfaces that are available according to /proc/net/dev.  "
+"Note that the list of interfaces appearing in /proc/net/dev may depend on "
+"which kernel modules you have loaded."
+msgstr ""
+"Ezarri kontrolatu behar diren interfazeak hemen zuriunez berezirik. Ifplugd "
+"prozesua interfaze hauetako bakoitzarentzat abiaraziko da ifplugd abiarazte "
+"script-a \"start\" argumentuaz exekutatzean. \"auto\" kate magikoa erabili "
+"dezakezu abiarazte programak /proc/net/dev-en agertzen diren eth eta wlan "
+"interfaze guztiak kontutan har ditzan. Kontutan izan /proc/net/dev-en "
+"agertzen diren interfaze zerrenda kargaturik dituzun kernel moduluen arabera "
+"aldatu daitekeela."
+
+#. Type: string
+#. Description
+#: ../ifplugd.templates:1001
+msgid ""
+"You should not add interfaces that are hotplugged (USB or PCMCIA) here, you "
+"will be asked for those in the next question."
+msgstr ""
+"Ez dituzu martxan konektatzen diren interfazeak /USB edo PCMCIA) hemen jarri "
+"behar, horietaz aurrerago galdetuko zaizu."
+
+#. Type: string
+#. Description
+#: ../ifplugd.templates:2001
+msgid "hotplugged interfaces to be watched by ifplugd:"
+msgstr ""
+"Ifplugd-ek begiratu behar dituen martxan konektatzen diren interfazeak:"
+
+#. Type: string
+#. Description
+#: ../ifplugd.templates:2001
+msgid "Specify the hotplugged interfaces to control here, separated by spaces."
+msgstr ""
+"Martxan konektatzen diren interfazeak hemen ezarri zuriunez bereizirik."
+
+#. Type: string
+#. Description
+#: ../ifplugd.templates:2001
+msgid ""
+"You may use the magic string \"all\" to make the hotplug script start an "
+"ifplugd process for any hotplugged interface."
+msgstr ""
+"\"all\" kate magikoa erabili beharko duzu makina martxan dagoenean interfaze "
+"bat konektatzen hotplug script-ak ifplugd prozesu bat abiarazi dezan."
+
+#. Type: string
+#. Description
+#: ../ifplugd.templates:2001
+msgid ""
+"Hotplugged interfaces are usually interfaces on PCMCIA or WLAN adapters."
+msgstr ""
+"Makina martxan dagoela konektatu daitezkeen interfazeak arruntean PCMCIA edo "
+"haririk gabeko gailuak dira."
+
+#. Type: string
+#. Description
+#: ../ifplugd.templates:3001
+msgid "arguments to ifplugd:"
+msgstr "ifplugd-rentzako argumentuak:"
+
+#. Type: string
+#. Description
+#: ../ifplugd.templates:3001
+#, fuzzy
+#| msgid ""
+#| "You can give arguments to the ifplug daemon here. See the man page for a "
+#| "description or call ifplugd -h."
+msgid ""
+"You can give arguments to the ifplug daemon here.  Relevant options are:"
+msgstr ""
+"Hemen ifplugd deabruari argumentuak bidali diezazkiokezu. Manual orria ikusi "
+"edo 'ifplugd -h' abiarazi azalpen bat ikusteko."
+
+#. Type: string
+#. Description
+#: ../ifplugd.templates:3001
+msgid ""
+"-q Don't run script on daemon quit, -f Ignore detection failure and retry, -"
+"u Specify delay for configuring interface, -d Specify delay for "
+"deconfiguring interface, -w Wait until daemon fork finished, -I Don't exit "
+"on nonzero return value of program executed,"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../ifplugd.templates:3001
+msgid ""
+"-a Do not enable interface automatically,  -s Use stderr instead of syslog "
+"for debugging, -b Do not beep, -t Specify poll time in seconds, -p Don't run "
+"script on daemon startup, -l Run \"down\" script on startup if no cable is "
+"detected, -W Wait until the daemon died when running daemon is killed, -M "
+"Use interface monitoring,"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../ifplugd.templates:4001
+msgid "none"
+msgstr "batez"
+
+#. Type: select
+#. Choices
+#: ../ifplugd.templates:4001
+msgid "suspend"
+msgstr "eseki"
+
+#. Type: select
+#. Choices
+#: ../ifplugd.templates:4001
+msgid "stop"
+msgstr "gelditu"
+
+#. Type: select
+#. Description
+#: ../ifplugd.templates:4002
+msgid "suspend behaviour:"
+msgstr "eseki portamoldea:"
+
+#. Type: select
+#. Description
+#: ../ifplugd.templates:4002
+msgid ""
+"When you put your notebook into suspend mode, you can choose between three "
+"actions:"
+msgstr ""
+"Portatila esekitze moduan ipintzen hiru ekintza ezberdinen artean hautatu "
+"dezakezu:"
+
+#. Type: select
+#. Description
+#: ../ifplugd.templates:4002
+msgid "none: no action"
+msgstr "batez: ez ezer egin"
+
+#. Type: select
+#. Description
+#: ../ifplugd.templates:4002
+msgid ""
+"suspend: this puts ifplugd into suspend mode. In this mode, ifplugd does not "
+"check the link status. This is necessary for some broken network drivers."
+msgstr ""
+"eseki: honek ifplugd esekiera moduan ipiniko du. Modu honetan ifplugd-ek ez "
+"du interfaze egoera egiaztatuko. Hau beharrezkoa da zenbait sare "
+"kontrolagailuekin."
+
+#. Type: select
+#. Description
+#: ../ifplugd.templates:4002
+msgid ""
+"stop: this stops ifplugd. If the -q option is not given, ifplugd will stop "
+"the interface. After resume, it will be restarted. This makes sense if you "
+"use some mechanism (eg. guessnet or whereami) to detect your network "
+"environment, which may have changed while suspending."
+msgstr ""
+"gelditu: ifplugd gelditu. -q aukera ematen ez bada ifplugd-ek interfazea "
+"geldituko du. Saioa berreskuratzen abiaraziko da. Honek zentzua du zuk sare "
+"ingurunea atzemateko lanabes batenbat (adib. guessnet edo whereami) "
+"erabiltzen baduzu esekitzean aldatu egin daitezke eta."
diff --git a/debian/po/fi.po b/debian/po/fi.po
new file mode 100644
index 0000000..c3c6ca4
--- /dev/null
+++ b/debian/po/fi.po
@@ -0,0 +1,182 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: ifplugd\n"
+"Report-Msgid-Bugs-To: ifplugd@packages.debian.org\n"
+"POT-Creation-Date: 2008-03-04 20:07+0530\n"
+"PO-Revision-Date: 2008-01-11 23:50+0200\n"
+"Last-Translator: Esko Arajärvi <edu@iki.fi>\n"
+"Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Finnish\n"
+"X-Poedit-Country: Finland\n"
+
+#. Type: string
+#. Description
+#: ../ifplugd.templates:1001
+msgid "static interfaces to be watched by ifplugd:"
+msgstr "Staattiset liitännät, joita ifplugd kuuntelee:"
+
+#. Type: string
+#. Description
+#: ../ifplugd.templates:1001
+msgid ""
+"Specify the interfaces to control here, separated by spaces. Ifplugd "
+"processes will be started for each of these interfaces when the ifplugd "
+"initscript is called with the \"start\" argument. You may use the magic "
+"string \"auto\" to make the initscript start or stop ifplugd processes for "
+"ALL eth and wlan interfaces that are available according to /proc/net/dev.  "
+"Note that the list of interfaces appearing in /proc/net/dev may depend on "
+"which kernel modules you have loaded."
+msgstr ""
+"Anna kontrolloitavat verkkoliitännät välilyönnein eroteltuina. Jokaista "
+"näistä liitännöistä varten käynnistetään ifplugd-prosessi, kun ifplugd-"
+"käynnistyskomentosarjaa kutsutaan argumentilla ”start”. Merkkijonolla ”auto” "
+"voit käskeä käynnistyskomentosarjaa käynnistämään ja pysäyttämään ifplugd-"
+"prosessit kaikkia tiedoston /proc/net/dev tuntemia eth- ja wlan-liitäntöjä "
+"varten."
+
+#. Type: string
+#. Description
+#: ../ifplugd.templates:1001
+msgid ""
+"You should not add interfaces that are hotplugged (USB or PCMCIA) here, you "
+"will be asked for those in the next question."
+msgstr ""
+"Älä lisää tähän liitäntöjä, jotka toimivat pikaliitännällä (USB ja PCMCIA). "
+"Niitä kysytään seuraavassa kysymyksessä."
+
+#. Type: string
+#. Description
+#: ../ifplugd.templates:2001
+msgid "hotplugged interfaces to be watched by ifplugd:"
+msgstr "Pikaliitännällä toimivat liitännät, joita ifplugd kuuntelee:"
+
+#. Type: string
+#. Description
+#: ../ifplugd.templates:2001
+msgid "Specify the hotplugged interfaces to control here, separated by spaces."
+msgstr "Anna kontolloitavat pikaliitännät välilyönnein eroteltuina."
+
+#. Type: string
+#. Description
+#: ../ifplugd.templates:2001
+msgid ""
+"You may use the magic string \"all\" to make the hotplug script start an "
+"ifplugd process for any hotplugged interface."
+msgstr ""
+"Merkkijonolla ”all” voit käskeä pikaliitäntäkomentosarjaa käynnistämään "
+"ifplugd-prosessin kaikille pikaliitännöille."
+
+#. Type: string
+#. Description
+#: ../ifplugd.templates:2001
+msgid ""
+"Hotplugged interfaces are usually interfaces on PCMCIA or WLAN adapters."
+msgstr "Pikaliitännät ovat yleensä PCMCIA- tai WLAN-sovittimien liitäntöjä."
+
+#. Type: string
+#. Description
+#: ../ifplugd.templates:3001
+msgid "arguments to ifplugd:"
+msgstr "Ifplugdin argumentit:"
+
+#. Type: string
+#. Description
+#: ../ifplugd.templates:3001
+#, fuzzy
+#| msgid ""
+#| "You can give arguments to the ifplug daemon here. See the man page for a "
+#| "description or call ifplugd -h."
+msgid ""
+"You can give arguments to the ifplug daemon here.  Relevant options are:"
+msgstr ""
+"Tässä voit antaa ifplug-taustaohjelmalle argumentteja. Katso kuvaus man-"
+"ohjesivulta tai aja komento ”ifplugd -h”."
+
+#. Type: string
+#. Description
+#: ../ifplugd.templates:3001
+msgid ""
+"-q Don't run script on daemon quit, -f Ignore detection failure and retry, -"
+"u Specify delay for configuring interface, -d Specify delay for "
+"deconfiguring interface, -w Wait until daemon fork finished, -I Don't exit "
+"on nonzero return value of program executed,"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../ifplugd.templates:3001
+msgid ""
+"-a Do not enable interface automatically,  -s Use stderr instead of syslog "
+"for debugging, -b Do not beep, -t Specify poll time in seconds, -p Don't run "
+"script on daemon startup, -l Run \"down\" script on startup if no cable is "
+"detected, -W Wait until the daemon died when running daemon is killed, -M "
+"Use interface monitoring,"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../ifplugd.templates:4001
+msgid "none"
+msgstr "ei mitään"
+
+#. Type: select
+#. Choices
+#: ../ifplugd.templates:4001
+msgid "suspend"
+msgstr "keskeytä"
+
+#. Type: select
+#. Choices
+#: ../ifplugd.templates:4001
+msgid "stop"
+msgstr "pysäytä"
+
+#. Type: select
+#. Description
+#: ../ifplugd.templates:4002
+msgid "suspend behaviour:"
+msgstr "Keskeytyskäyttäytyminen:"
+
+#. Type: select
+#. Description
+#: ../ifplugd.templates:4002
+msgid ""
+"When you put your notebook into suspend mode, you can choose between three "
+"actions:"
+msgstr ""
+"Kun laitat kannettavan tietokoneesi keskeytystilaan, voit valita kolmesta "
+"toiminnosta:"
+
+#. Type: select
+#. Description
+#: ../ifplugd.templates:4002
+msgid "none: no action"
+msgstr "ei mitään: ei toimintoa"
+
+#. Type: select
+#. Description
+#: ../ifplugd.templates:4002
+msgid ""
+"suspend: this puts ifplugd into suspend mode. In this mode, ifplugd does not "
+"check the link status. This is necessary for some broken network drivers."
+msgstr ""
+"keskeytä: laittaa ifplugdin keskeytystilaan. Tässä tilassa ifplugd ei "
+"tarkista liitännän tilaa. Jotkin rikkinäiset verkkoajurit vaativat tämän."
+
+#. Type: select
+#. Description
+#: ../ifplugd.templates:4002
+msgid ""
+"stop: this stops ifplugd. If the -q option is not given, ifplugd will stop "
+"the interface. After resume, it will be restarted. This makes sense if you "
+"use some mechanism (eg. guessnet or whereami) to detect your network "
+"environment, which may have changed while suspending."
+msgstr ""
+"pysäytä: pysäyttää ifplugdin. Jos valitsinta -q ei ole annettu, ifplugd "
+"pysäyttää liitännän. Jatkamisen jälkeen se käynnistetään uudelleen. Tässä on "
+"järkeä, jos käytät jotain mekanismia (esimerkiksi guessnet tai whereami) "
+"selvittääksesi verkkoympäristösi, joka on saattanut vaihtua keskeytyksen "
+"aikana."
diff --git a/debian/po/fr.po b/debian/po/fr.po
index 924996b..ed1e2c5 100644
--- a/debian/po/fr.po
+++ b/debian/po/fr.po
@@ -12,8 +12,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ifplugd\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-11-24 07:23+0100\n"
+"Report-Msgid-Bugs-To: ifplugd@packages.debian.org\n"
+"POT-Creation-Date: 2008-03-04 20:07+0530\n"
 "PO-Revision-Date: 2006-04-10 19:05+0200\n"
 "Last-Translator: Jean-Luc Coulon (f5ibh) <jean-luc.coulon@wanadoo.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -80,8 +80,8 @@ msgid ""
 "You may use the magic string \"all\" to make the hotplug script start an "
 "ifplugd process for any hotplugged interface."
 msgstr ""
-"Vous pouvez utiliser l'argument « all » pour que le script hotplug démarre "
-"un processus ifplugd pour chaque interface connectée à chaud."
+"Vous pouvez utiliser l'argument « all » pour que le script hotplug démarre un "
+"processus ifplugd pour chaque interface connectée à chaud."
 
 #. Type: string
 #. Description
@@ -101,14 +101,38 @@ msgstr "Paramètres à passer à ifplugd :"
 #. Type: string
 #. Description
 #: ../ifplugd.templates:3001
+#, fuzzy
+#| msgid ""
+#| "You can give arguments to the ifplug daemon here. See the man page for a "
+#| "description or call ifplugd -h."
 msgid ""
-"You can give arguments to the ifplug daemon here. See the man page for a "
-"description or call ifplugd -h."
+"You can give arguments to the ifplug daemon here.  Relevant options are:"
 msgstr ""
 "Veuillez indiquer ici des paramètres à passer au démon ifplugd. Veuillez "
 "consulter la page de manuel pour en obtenir une description détaillée ou "
 "passez la commande « ifplugd -h »."
 
+#. Type: string
+#. Description
+#: ../ifplugd.templates:3001
+msgid ""
+"-q Don't run script on daemon quit, -f Ignore detection failure and retry, -"
+"u Specify delay for configuring interface, -d Specify delay for "
+"deconfiguring interface, -w Wait until daemon fork finished, -I Don't exit "
+"on nonzero return value of program executed,"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../ifplugd.templates:3001
+msgid ""
+"-a Do not enable interface automatically,  -s Use stderr instead of syslog "
+"for debugging, -b Do not beep, -t Specify poll time in seconds, -p Don't run "
+"script on daemon startup, -l Run \"down\" script on startup if no cable is "
+"detected, -W Wait until the daemon died when running daemon is killed, -M "
+"Use interface monitoring,"
+msgstr ""
+
 #. Type: select
 #. Choices
 #: ../ifplugd.templates:4001
diff --git a/debian/po/gl.po b/debian/po/gl.po
index 41d3583..6c547a5 100644
--- a/debian/po/gl.po
+++ b/debian/po/gl.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ifplugd\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-11-24 07:23+0100\n"
+"Report-Msgid-Bugs-To: ifplugd@packages.debian.org\n"
+"POT-Creation-Date: 2008-03-04 20:07+0530\n"
 "PO-Revision-Date: 2007-02-24 20:07+0100\n"
 "Last-Translator: Jacobo Tarrio <jtarrio@debian.org>\n"
 "Language-Team: Galician <proxecto@trasno.net>\n"
@@ -93,13 +93,37 @@ msgstr "Argumentos para ifplugd:"
 #. Type: string
 #. Description
 #: ../ifplugd.templates:3001
+#, fuzzy
+#| msgid ""
+#| "You can give arguments to the ifplug daemon here. See the man page for a "
+#| "description or call ifplugd -h."
 msgid ""
-"You can give arguments to the ifplug daemon here. See the man page for a "
-"description or call ifplugd -h."
+"You can give arguments to the ifplug daemon here.  Relevant options are:"
 msgstr ""
 "Pode fornecer aquí argumentos ao servizo ifplugd. Consulte a páxina man para "
 "unha descrición ou execute ifplugd -h."
 
+#. Type: string
+#. Description
+#: ../ifplugd.templates:3001
+msgid ""
+"-q Don't run script on daemon quit, -f Ignore detection failure and retry, -"
+"u Specify delay for configuring interface, -d Specify delay for "
+"deconfiguring interface, -w Wait until daemon fork finished, -I Don't exit "
+"on nonzero return value of program executed,"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../ifplugd.templates:3001
+msgid ""
+"-a Do not enable interface automatically,  -s Use stderr instead of syslog "
+"for debugging, -b Do not beep, -t Specify poll time in seconds, -p Don't run "
+"script on daemon startup, -l Run \"down\" script on startup if no cable is "
+"detected, -W Wait until the daemon died when running daemon is killed, -M "
+"Use interface monitoring,"
+msgstr ""
+
 #. Type: select
 #. Choices
 #: ../ifplugd.templates:4001
diff --git a/debian/po/it.po b/debian/po/it.po
new file mode 100644
index 0000000..e4a1839
--- /dev/null
+++ b/debian/po/it.po
@@ -0,0 +1,192 @@
+# Italian translation of the ifplugd debconf templates
+# This file is distributed under the same license as the ifplugd package
+# Copyright (C) 2007 Free Software Foundation, Inc.
+# Luca Monducci <luca.mo@tiscali.it>, 2007.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ifplugd 0.28 debconf templates\n"
+"Report-Msgid-Bugs-To: ifplugd@packages.debian.org\n"
+"POT-Creation-Date: 2008-03-04 20:07+0530\n"
+"PO-Revision-Date: 2007-12-29 13:27+0100\n"
+"Last-Translator: Luca Monducci <luca.mo@tiscali.it>\n"
+"Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: string
+#. Description
+#: ../ifplugd.templates:1001
+msgid "static interfaces to be watched by ifplugd:"
+msgstr "interfacce statiche da sorvegliare con ifplugd:"
+
+#. Type: string
+#. Description
+#: ../ifplugd.templates:1001
+msgid ""
+"Specify the interfaces to control here, separated by spaces. Ifplugd "
+"processes will be started for each of these interfaces when the ifplugd "
+"initscript is called with the \"start\" argument. You may use the magic "
+"string \"auto\" to make the initscript start or stop ifplugd processes for "
+"ALL eth and wlan interfaces that are available according to /proc/net/dev.  "
+"Note that the list of interfaces appearing in /proc/net/dev may depend on "
+"which kernel modules you have loaded."
+msgstr ""
+"Inserire le interfacce da controllare, separandole con degli spazi. Quando "
+"viene richiamato lo script di inizializzazione di ifplugd con argomento "
+"\"start\" verrà avviato un processo ifplugd per ogni interfaccia elencata. È "
+"possibile usare la stringa magica \"auto\" per far sì che lo script di "
+"inizializzazione avvii o fermi un processo ifplugd per TUTTE le interfacce "
+"eth e wlan che secondo /proc/net/dev sono disponibili. Notare che l'elenco "
+"delle interfacce presenti in /proc/net/dev può dipendere da quali moduli del "
+"kernel sono stati caricati."
+
+#. Type: string
+#. Description
+#: ../ifplugd.templates:1001
+msgid ""
+"You should not add interfaces that are hotplugged (USB or PCMCIA) here, you "
+"will be asked for those in the next question."
+msgstr ""
+"Non si devono aggiungere le interfacce ad inserimento a caldo (USB o "
+"PCMCIA), saranno l'argomento della prossima domanda."
+
+#. Type: string
+#. Description
+#: ../ifplugd.templates:2001
+msgid "hotplugged interfaces to be watched by ifplugd:"
+msgstr "interfacce ad inserimento a caldo da sorvegliare con ifplugd:"
+
+#. Type: string
+#. Description
+#: ../ifplugd.templates:2001
+msgid "Specify the hotplugged interfaces to control here, separated by spaces."
+msgstr ""
+"Inserire le interfacce ad inserimento a caldo da controllare, separandole "
+"con degli spazi."
+
+#. Type: string
+#. Description
+#: ../ifplugd.templates:2001
+msgid ""
+"You may use the magic string \"all\" to make the hotplug script start an "
+"ifplugd process for any hotplugged interface."
+msgstr ""
+"È possibile usare la stringa magica \"all\" per far avviare allo script "
+"hotplug un processo ifplugd per ogni interfaccia ad inserimento a caldo."
+
+#. Type: string
+#. Description
+#: ../ifplugd.templates:2001
+msgid ""
+"Hotplugged interfaces are usually interfaces on PCMCIA or WLAN adapters."
+msgstr ""
+"Solitamente le interfacce ad inserimento a caldo sono quelle su adattatori "
+"PCMCIA o WLAN."
+
+#. Type: string
+#. Description
+#: ../ifplugd.templates:3001
+msgid "arguments to ifplugd:"
+msgstr "argomenti per ifplugd:"
+
+#. Type: string
+#. Description
+#: ../ifplugd.templates:3001
+#, fuzzy
+#| msgid ""
+#| "You can give arguments to the ifplug daemon here. See the man page for a "
+#| "description or call ifplugd -h."
+msgid ""
+"You can give arguments to the ifplug daemon here.  Relevant options are:"
+msgstr ""
+"È possibile passare degli argomenti al demone ifplug. Per informazioni si "
+"veda la pagina man oppure eseguire «ifplugd -h»."
+
+#. Type: string
+#. Description
+#: ../ifplugd.templates:3001
+msgid ""
+"-q Don't run script on daemon quit, -f Ignore detection failure and retry, -"
+"u Specify delay for configuring interface, -d Specify delay for "
+"deconfiguring interface, -w Wait until daemon fork finished, -I Don't exit "
+"on nonzero return value of program executed,"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../ifplugd.templates:3001
+msgid ""
+"-a Do not enable interface automatically,  -s Use stderr instead of syslog "
+"for debugging, -b Do not beep, -t Specify poll time in seconds, -p Don't run "
+"script on daemon startup, -l Run \"down\" script on startup if no cable is "
+"detected, -W Wait until the daemon died when running daemon is killed, -M "
+"Use interface monitoring,"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../ifplugd.templates:4001
+msgid "none"
+msgstr "nessuna"
+
+#. Type: select
+#. Choices
+#: ../ifplugd.templates:4001
+msgid "suspend"
+msgstr "sospensione"
+
+#. Type: select
+#. Choices
+#: ../ifplugd.templates:4001
+msgid "stop"
+msgstr "arresto"
+
+#. Type: select
+#. Description
+#: ../ifplugd.templates:4002
+msgid "suspend behaviour:"
+msgstr "modalità alla sospensione:"
+
+#. Type: select
+#. Description
+#: ../ifplugd.templates:4002
+msgid ""
+"When you put your notebook into suspend mode, you can choose between three "
+"actions:"
+msgstr ""
+"Quando si mette il proprio portatile in modalità sospensione, è possibile "
+"scegliere fra tre azioni:"
+
+#. Type: select
+#. Description
+#: ../ifplugd.templates:4002
+msgid "none: no action"
+msgstr "nessuna: nessuna azione"
+
+#. Type: select
+#. Description
+#: ../ifplugd.templates:4002
+msgid ""
+"suspend: this puts ifplugd into suspend mode. In this mode, ifplugd does not "
+"check the link status. This is necessary for some broken network drivers."
+msgstr ""
+"sospensione: anche ifplugd passa in modalità sospensione; in questa modalità "
+"ifplugd non controlla lo stato del collegamento. Questa è necessaria con "
+"alcuni driver di rete difettosi."
+
+#. Type: select
+#. Description
+#: ../ifplugd.templates:4002
+msgid ""
+"stop: this stops ifplugd. If the -q option is not given, ifplugd will stop "
+"the interface. After resume, it will be restarted. This makes sense if you "
+"use some mechanism (eg. guessnet or whereami) to detect your network "
+"environment, which may have changed while suspending."
+msgstr ""
+"arresto: ifplugd viene fermato. Qualora non sia usata l'opzione -q, ifplugd "
+"ferma l'interfaccia. Dopo il ripristino l'interfaccia viene riattivata. "
+"Questo è utile se si utilizzano meccanismi (come guessnet o whereami) di "
+"rilevazione della rete circostante, la quale potrebbe essere cambiata "
+"durante la sospensione."
diff --git a/debian/po/ja.po b/debian/po/ja.po
new file mode 100644
index 0000000..934dec3
--- /dev/null
+++ b/debian/po/ja.po
@@ -0,0 +1,192 @@
+#
+#    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: ifplugd 0.28-2.3\n"
+"Report-Msgid-Bugs-To: ifplugd@packages.debian.org\n"
+"POT-Creation-Date: 2008-03-04 20:07+0530\n"
+"PO-Revision-Date: 2007-03-04 13:00+0900\n"
+"Last-Translator:  TANAKA, Atushi <atanaka@hotcake.halfmoon.jp>\n"
+"Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: string
+#. Description
+#: ../ifplugd.templates:1001
+msgid "static interfaces to be watched by ifplugd:"
+msgstr "ifplugd で監視する静的なインターフェース:"
+
+#. Type: string
+#. Description
+#: ../ifplugd.templates:1001
+msgid ""
+"Specify the interfaces to control here, separated by spaces. Ifplugd "
+"processes will be started for each of these interfaces when the ifplugd "
+"initscript is called with the \"start\" argument. You may use the magic "
+"string \"auto\" to make the initscript start or stop ifplugd processes for "
+"ALL eth and wlan interfaces that are available according to /proc/net/dev.  "
+"Note that the list of interfaces appearing in /proc/net/dev may depend on "
+"which kernel modules you have loaded."
+msgstr ""
+"制御するインターフェースを空白で区切って入力してください。ifplugd の "
+"initscript を引数 \"start\" で呼んだとき、ifplugd はインターフェース毎に起動"
+"します。特別な文字列 \"auto\" を引数に使うと、/proc/net/dev にある全ての eth "
+"と wlan のインターフェースについて、ifplugd プロセスを起動、停止させられま"
+"す。注意ですが、/proc/net/dev にあるインターフェースの一覧はロードしたカーネ"
+"ルモジュールに依存するかもしれません。"
+
+#. Type: string
+#. Description
+#: ../ifplugd.templates:1001
+msgid ""
+"You should not add interfaces that are hotplugged (USB or PCMCIA) here, you "
+"will be asked for those in the next question."
+msgstr ""
+"ここにホットプラグ (USB や PCMCIA) するインターフェースを加えるべきではありま"
+"せん。これについては後で尋ねます。"
+
+#. Type: string
+#. Description
+#: ../ifplugd.templates:2001
+msgid "hotplugged interfaces to be watched by ifplugd:"
+msgstr "ifplugd で監視するホットプラグする、インターフェース:"
+
+#. Type: string
+#. Description
+#: ../ifplugd.templates:2001
+msgid "Specify the hotplugged interfaces to control here, separated by spaces."
+msgstr "ホットプラグするインターフェースを空白で区切って入力してください。"
+
+#. Type: string
+#. Description
+#: ../ifplugd.templates:2001
+msgid ""
+"You may use the magic string \"all\" to make the hotplug script start an "
+"ifplugd process for any hotplugged interface."
+msgstr ""
+"特別な文字列 \"auto\" を引数に使うと、ホットプラグする全てのインターフェース"
+"で、hotplug スクリプトが ifplugd プロセスを起動、停止できます。"
+
+#. Type: string
+#. Description
+#: ../ifplugd.templates:2001
+msgid ""
+"Hotplugged interfaces are usually interfaces on PCMCIA or WLAN adapters."
+msgstr ""
+"ホットプラグするインターフェースは通例 PCMCIA か WLAN のアダプタ上です。"
+
+#. Type: string
+#. Description
+#: ../ifplugd.templates:3001
+msgid "arguments to ifplugd:"
+msgstr "ifplugd への引数:"
+
+#. Type: string
+#. Description
+#: ../ifplugd.templates:3001
+#, fuzzy
+#| msgid ""
+#| "You can give arguments to the ifplug daemon here. See the man page for a "
+#| "description or call ifplugd -h."
+msgid ""
+"You can give arguments to the ifplug daemon here.  Relevant options are:"
+msgstr ""
+"ここで ifplugd デーモンへの引数を与えることができます。詳細は man を見るか、"
+"ifplugd -h で調べてください。"
+
+#. Type: string
+#. Description
+#: ../ifplugd.templates:3001
+msgid ""
+"-q Don't run script on daemon quit, -f Ignore detection failure and retry, -"
+"u Specify delay for configuring interface, -d Specify delay for "
+"deconfiguring interface, -w Wait until daemon fork finished, -I Don't exit "
+"on nonzero return value of program executed,"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../ifplugd.templates:3001
+msgid ""
+"-a Do not enable interface automatically,  -s Use stderr instead of syslog "
+"for debugging, -b Do not beep, -t Specify poll time in seconds, -p Don't run "
+"script on daemon startup, -l Run \"down\" script on startup if no cable is "
+"detected, -W Wait until the daemon died when running daemon is killed, -M "
+"Use interface monitoring,"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../ifplugd.templates:4001
+msgid "none"
+msgstr "何もしない"
+
+#. Type: select
+#. Choices
+#: ../ifplugd.templates:4001
+msgid "suspend"
+msgstr "サスペンド"
+
+#. Type: select
+#. Choices
+#: ../ifplugd.templates:4001
+msgid "stop"
+msgstr "停止"
+
+#. Type: select
+#. Description
+#: ../ifplugd.templates:4002
+msgid "suspend behaviour:"
+msgstr "サスペンドでの振舞い:"
+
+#. Type: select
+#. Description
+#: ../ifplugd.templates:4002
+msgid ""
+"When you put your notebook into suspend mode, you can choose between three "
+"actions:"
+msgstr "ノートブックをサスペンドするとき、3 つの動作を選択できます:"
+
+#. Type: select
+#. Description
+#: ../ifplugd.templates:4002
+msgid "none: no action"
+msgstr "何もしない: 何もしません"
+
+#. Type: select
+#. Description
+#: ../ifplugd.templates:4002
+msgid ""
+"suspend: this puts ifplugd into suspend mode. In this mode, ifplugd does not "
+"check the link status. This is necessary for some broken network drivers."
+msgstr ""
+"サスペンド: ifplugd をサスペンドモードにします。このモードでは、ifplugd は接"
+"続の状態を調べません。壊れたネットワークドライバの中にはこれが必要なものがあ"
+"ります。"
+
+#. Type: select
+#. Description
+#: ../ifplugd.templates:4002
+msgid ""
+"stop: this stops ifplugd. If the -q option is not given, ifplugd will stop "
+"the interface. After resume, it will be restarted. This makes sense if you "
+"use some mechanism (eg. guessnet or whereami) to detect your network "
+"environment, which may have changed while suspending."
+msgstr ""
+"停止: ifplugd を停止します。もし -q オプションを与えなければ、 ifplugd はイン"
+"ターフェースを止めます。レジューム後には、再起動します。これが意味があるの"
+"は、サスペンド中のネットワーク環境の変化を検知できる(例えば guessnet や "
+"whereami で) 場合です。"
diff --git a/debian/po/nl.po b/debian/po/nl.po
new file mode 100644
index 0000000..83d1307
--- /dev/null
+++ b/debian/po/nl.po
@@ -0,0 +1,195 @@
+#
+#    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: ifplugd\n"
+"Report-Msgid-Bugs-To: ifplugd@packages.debian.org\n"
+"POT-Creation-Date: 2008-03-04 20:07+0530\n"
+"PO-Revision-Date: 2008-01-02 21:59+0100\n"
+"Last-Translator: Bart Cornelis <cobaco@skolelinux.no>\n"
+"Language-Team: debian-l10n-dutch <debian-l10n-dutch@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Dutch\n"
+
+#. Type: string
+#. Description
+#: ../ifplugd.templates:1001
+msgid "static interfaces to be watched by ifplugd:"
+msgstr "Door ifplugd te controleren statische interfaces:"
+
+#. Type: string
+#. Description
+#: ../ifplugd.templates:1001
+msgid ""
+"Specify the interfaces to control here, separated by spaces. Ifplugd "
+"processes will be started for each of these interfaces when the ifplugd "
+"initscript is called with the \"start\" argument. You may use the magic "
+"string \"auto\" to make the initscript start or stop ifplugd processes for "
+"ALL eth and wlan interfaces that are available according to /proc/net/dev.  "
+"Note that the list of interfaces appearing in /proc/net/dev may depend on "
+"which kernel modules you have loaded."
+msgstr ""
+"Hier geeft u de te controleren interfaces aan, gescheiden door spaties. Er "
+"wordt een ifplugd-proces gestart voor elk van deze interfaces wanneer het "
+"ifplugd-initscript aangeroepen wordt met het 'start' argument. U kunt hier "
+"ook de magische string 'auto' aangeven, waardoor het initscript ifplugd-"
+"processen start voor alle volgens /proc/net/dev beschikbare eth en wlan "
+"interfaces. Merk op dat de in /proc/net/dev verschijnende lijst van "
+"interfaces afhankelijk kan zijn van de geladen modules."
+
+#. Type: string
+#. Description
+#: ../ifplugd.templates:1001
+msgid ""
+"You should not add interfaces that are hotplugged (USB or PCMCIA) here, you "
+"will be asked for those in the next question."
+msgstr ""
+"Geef hier geen interfaces aan die 'hotplugged' zijn (zoals USB of PCMCIA), u "
+"krijgt daar zometeen de mogelijkheid voor."
+
+#. Type: string
+#. Description
+#: ../ifplugd.templates:2001
+msgid "hotplugged interfaces to be watched by ifplugd:"
+msgstr "Door ifplugd te controleren hotplug-interfaces:"
+
+#. Type: string
+#. Description
+#: ../ifplugd.templates:2001
+msgid "Specify the hotplugged interfaces to control here, separated by spaces."
+msgstr "Hier geeft u de 'hotplugged' interfaces aan, gescheiden door spaties."
+
+#. Type: string
+#. Description
+#: ../ifplugd.templates:2001
+msgid ""
+"You may use the magic string \"all\" to make the hotplug script start an "
+"ifplugd process for any hotplugged interface."
+msgstr ""
+"U kunt de magische string 'all' gebruiken om het hotplug-script een ifplugd-"
+"proces te laten starten voor alle hotplug-interfaces."
+
+#. Type: string
+#. Description
+#: ../ifplugd.templates:2001
+msgid ""
+"Hotplugged interfaces are usually interfaces on PCMCIA or WLAN adapters."
+msgstr "Hotplug-interfaces zijn gewoonlijk PCMCIA- of WLAN-adaptors."
+
+#. Type: string
+#. Description
+#: ../ifplugd.templates:3001
+msgid "arguments to ifplugd:"
+msgstr "Aan ifplugd mee te geven argumenten:"
+
+#. Type: string
+#. Description
+#: ../ifplugd.templates:3001
+#, fuzzy
+#| msgid ""
+#| "You can give arguments to the ifplug daemon here. See the man page for a "
+#| "description or call ifplugd -h."
+msgid ""
+"You can give arguments to the ifplug daemon here.  Relevant options are:"
+msgstr ""
+"Hier kunt u argumenten aangeven voor de ifplug-achtergronddienst. Meer "
+"informatie vindt u in de 'man'-pagina, of via het aanroepen van ifplugd -h."
+
+#. Type: string
+#. Description
+#: ../ifplugd.templates:3001
+msgid ""
+"-q Don't run script on daemon quit, -f Ignore detection failure and retry, -"
+"u Specify delay for configuring interface, -d Specify delay for "
+"deconfiguring interface, -w Wait until daemon fork finished, -I Don't exit "
+"on nonzero return value of program executed,"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../ifplugd.templates:3001
+msgid ""
+"-a Do not enable interface automatically,  -s Use stderr instead of syslog "
+"for debugging, -b Do not beep, -t Specify poll time in seconds, -p Don't run "
+"script on daemon startup, -l Run \"down\" script on startup if no cable is "
+"detected, -W Wait until the daemon died when running daemon is killed, -M "
+"Use interface monitoring,"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../ifplugd.templates:4001
+msgid "none"
+msgstr "geen"
+
+#. Type: select
+#. Choices
+#: ../ifplugd.templates:4001
+msgid "suspend"
+msgstr "suspend"
+
+#. Type: select
+#. Choices
+#: ../ifplugd.templates:4001
+msgid "stop"
+msgstr "stop"
+
+#. Type: select
+#. Description
+#: ../ifplugd.templates:4002
+msgid "suspend behaviour:"
+msgstr "suspend-gedrag:"
+
+#. Type: select
+#. Description
+#: ../ifplugd.templates:4002
+msgid ""
+"When you put your notebook into suspend mode, you can choose between three "
+"actions:"
+msgstr ""
+"Wanneer u uw notebook in suspend-modus brengt, kunt u kiezen uit drie acties:"
+
+#. Type: select
+#. Description
+#: ../ifplugd.templates:4002
+msgid "none: no action"
+msgstr "geen: geen actie"
+
+#. Type: select
+#. Description
+#: ../ifplugd.templates:4002
+msgid ""
+"suspend: this puts ifplugd into suspend mode. In this mode, ifplugd does not "
+"check the link status. This is necessary for some broken network drivers."
+msgstr ""
+"suspend: dit plaatst ifplugd in suspend-modus. In deze modus gaat ifplugd de "
+"link-status niet na. Dit is noodzakelijk voor sommige onjuist werkende "
+"netwerkstuurprogramma's"
+
+#. Type: select
+#. Description
+#: ../ifplugd.templates:4002
+msgid ""
+"stop: this stops ifplugd. If the -q option is not given, ifplugd will stop "
+"the interface. After resume, it will be restarted. This makes sense if you "
+"use some mechanism (eg. guessnet or whereami) to detect your network "
+"environment, which may have changed while suspending."
+msgstr ""
+"stop: dit stopt ifplugd. Als de -q optie niet gegeven is stopt ifplugd de "
+"interface. Na het terugkomen uit 'suspend'-modus wordt de interface "
+"herstart. Dit is zinnig als u een mechanisme om uw netwerkomgeving te "
+"detecteren (zoals bv. guessnet of whereami) gebruikt, daar dit kan "
+"veranderen wanneer u in 'suspend'-modus bent."
diff --git a/debian/po/pt.po b/debian/po/pt.po
index 3efc332..0d83157 100644
--- a/debian/po/pt.po
+++ b/debian/po/pt.po
@@ -1,12 +1,12 @@
 # Portuguese translation for ifplugd's debconf messages
 # Rui Branco <ruipb@debianpt.org>, 2006.
 # 2006-12-02 - Rui Branco - Initial translation
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: ifplugd\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-11-24 07:23+0100\n"
+"Report-Msgid-Bugs-To: ifplugd@packages.debian.org\n"
+"POT-Creation-Date: 2008-03-04 20:07+0530\n"
 "PO-Revision-Date: 2006-12-02 09:13+0000\n"
 "Last-Translator: Rui Branco <ruipb@debianpt.org>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -93,13 +93,37 @@ msgstr "Argumentos para o ifplugd:"
 #. Type: string
 #. Description
 #: ../ifplugd.templates:3001
+#, fuzzy
+#| msgid ""
+#| "You can give arguments to the ifplug daemon here. See the man page for a "
+#| "description or call ifplugd -h."
 msgid ""
-"You can give arguments to the ifplug daemon here. See the man page for a "
-"description or call ifplugd -h."
+"You can give arguments to the ifplug daemon here.  Relevant options are:"
 msgstr ""
 "Pode dar argumentos aqui para o ifplugd 'daemon'. Veja a página man para uma "
 "descrição ou faça ifplugd -h."
 
+#. Type: string
+#. Description
+#: ../ifplugd.templates:3001
+msgid ""
+"-q Don't run script on daemon quit, -f Ignore detection failure and retry, -"
+"u Specify delay for configuring interface, -d Specify delay for "
+"deconfiguring interface, -w Wait until daemon fork finished, -I Don't exit "
+"on nonzero return value of program executed,"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../ifplugd.templates:3001
+msgid ""
+"-a Do not enable interface automatically,  -s Use stderr instead of syslog "
+"for debugging, -b Do not beep, -t Specify poll time in seconds, -p Don't run "
+"script on daemon startup, -l Run \"down\" script on startup if no cable is "
+"detected, -W Wait until the daemon died when running daemon is killed, -M "
+"Use interface monitoring,"
+msgstr ""
+
 #. Type: select
 #. Choices
 #: ../ifplugd.templates:4001
diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po
index ad09207..3fd6e38 100644
--- a/debian/po/pt_BR.po
+++ b/debian/po/pt_BR.po
@@ -8,13 +8,13 @@
 # or http://www.debian.org/intl/l10n/po-debconf/README-trans
 # Developers do not need to manually edit POT or PO files.
 # felipe <EMAIL@ADDRESS>, 2005.
-# 
-# 
+#
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: ifplugd 0.26\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-11-24 07:23+0100\n"
+"Report-Msgid-Bugs-To: ifplugd@packages.debian.org\n"
+"POT-Creation-Date: 2008-03-04 20:07+0530\n"
 "PO-Revision-Date: 2005-03-13 22:13-0300\n"
 "Last-Translator: Felipe Augusto van de Wiel (faw) <felipe@cathedrallabs."
 "org>\n"
@@ -102,13 +102,37 @@ msgstr "argumentos para o ifplugd"
 #. Type: string
 #. Description
 #: ../ifplugd.templates:3001
+#, fuzzy
+#| msgid ""
+#| "You can give arguments to the ifplug daemon here. See the man page for a "
+#| "description or call ifplugd -h."
 msgid ""
-"You can give arguments to the ifplug daemon here. See the man page for a "
-"description or call ifplugd -h."
+"You can give arguments to the ifplug daemon here.  Relevant options are:"
 msgstr ""
 "Você pode dar argumentos para o serviço ifplugd. Veja a página \"man\" para "
 "uma descrição ou execute ifplugd -h."
 
+#. Type: string
+#. Description
+#: ../ifplugd.templates:3001
+msgid ""
+"-q Don't run script on daemon quit, -f Ignore detection failure and retry, -"
+"u Specify delay for configuring interface, -d Specify delay for "
+"deconfiguring interface, -w Wait until daemon fork finished, -I Don't exit "
+"on nonzero return value of program executed,"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../ifplugd.templates:3001
+msgid ""
+"-a Do not enable interface automatically,  -s Use stderr instead of syslog "
+"for debugging, -b Do not beep, -t Specify poll time in seconds, -p Don't run "
+"script on daemon startup, -l Run \"down\" script on startup if no cable is "
+"detected, -W Wait until the daemon died when running daemon is killed, -M "
+"Use interface monitoring,"
+msgstr ""
+
 #. Type: select
 #. Choices
 #: ../ifplugd.templates:4001
diff --git a/debian/po/ru.po b/debian/po/ru.po
index db843ea..3d57f25 100644
--- a/debian/po/ru.po
+++ b/debian/po/ru.po
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 0.28-2\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-11-24 07:23+0100\n"
+"Report-Msgid-Bugs-To: ifplugd@packages.debian.org\n"
+"POT-Creation-Date: 2008-03-04 20:07+0530\n"
 "PO-Revision-Date: 2006-12-05 23:34+0300\n"
 "Last-Translator: Yuri Kozlov <kozlov.y@gmail.com>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -100,13 +100,37 @@ msgstr "Параметры ifplugd:"
 #. Type: string
 #. Description
 #: ../ifplugd.templates:3001
+#, fuzzy
+#| msgid ""
+#| "You can give arguments to the ifplug daemon here. See the man page for a "
+#| "description or call ifplugd -h."
 msgid ""
-"You can give arguments to the ifplug daemon here. See the man page for a "
-"description or call ifplugd -h."
+"You can give arguments to the ifplug daemon here.  Relevant options are:"
 msgstr ""
 "Вы можете указать параметры для демона ifplug. Подробней смотрите на "
 "странице руководства или запустите ifplugd -h."
 
+#. Type: string
+#. Description
+#: ../ifplugd.templates:3001
+msgid ""
+"-q Don't run script on daemon quit, -f Ignore detection failure and retry, -"
+"u Specify delay for configuring interface, -d Specify delay for "
+"deconfiguring interface, -w Wait until daemon fork finished, -I Don't exit "
+"on nonzero return value of program executed,"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../ifplugd.templates:3001
+msgid ""
+"-a Do not enable interface automatically,  -s Use stderr instead of syslog "
+"for debugging, -b Do not beep, -t Specify poll time in seconds, -p Don't run "
+"script on daemon startup, -l Run \"down\" script on startup if no cable is "
+"detected, -W Wait until the daemon died when running daemon is killed, -M "
+"Use interface monitoring,"
+msgstr ""
+
 #. Type: select
 #. Choices
 #: ../ifplugd.templates:4001
diff --git a/debian/po/sv.po b/debian/po/sv.po
index 7d1b304..47f5505 100644
--- a/debian/po/sv.po
+++ b/debian/po/sv.po
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ifplugd 0.26-2\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-11-24 07:23+0100\n"
+"Report-Msgid-Bugs-To: ifplugd@packages.debian.org\n"
+"POT-Creation-Date: 2008-03-04 20:07+0530\n"
 "PO-Revision-Date: 2006-12-01 22:23+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -103,13 +103,37 @@ msgstr "argument till ifplugd:"
 #. Type: string
 #. Description
 #: ../ifplugd.templates:3001
+#, fuzzy
+#| msgid ""
+#| "You can give arguments to the ifplug daemon here. See the man page for a "
+#| "description or call ifplugd -h."
 msgid ""
-"You can give arguments to the ifplug daemon here. See the man page for a "
-"description or call ifplugd -h."
+"You can give arguments to the ifplug daemon here.  Relevant options are:"
 msgstr ""
 "Du kan ange argument till ifplugd-demonen här. Se manualsidan för en "
 "beskrivning eller starta ifplugd med flaggan -h."
 
+#. Type: string
+#. Description
+#: ../ifplugd.templates:3001
+msgid ""
+"-q Don't run script on daemon quit, -f Ignore detection failure and retry, -"
+"u Specify delay for configuring interface, -d Specify delay for "
+"deconfiguring interface, -w Wait until daemon fork finished, -I Don't exit "
+"on nonzero return value of program executed,"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../ifplugd.templates:3001
+msgid ""
+"-a Do not enable interface automatically,  -s Use stderr instead of syslog "
+"for debugging, -b Do not beep, -t Specify poll time in seconds, -p Don't run "
+"script on daemon startup, -l Run \"down\" script on startup if no cable is "
+"detected, -W Wait until the daemon died when running daemon is killed, -M "
+"Use interface monitoring,"
+msgstr ""
+
 #. Type: select
 #. Choices
 #: ../ifplugd.templates:4001
diff --git a/debian/po/templates.pot b/debian/po/templates.pot
index b270db6..8a5cfc9 100644
--- a/debian/po/templates.pot
+++ b/debian/po/templates.pot
@@ -1,22 +1,14 @@
-#
-#    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 PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-11-24 07:23+0100\n"
+"Report-Msgid-Bugs-To: ifplugd@packages.debian.org\n"
+"POT-Creation-Date: 2008-03-04 20:07+0530\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"
@@ -88,8 +80,28 @@ msgstr ""
 #. Description
 #: ../ifplugd.templates:3001
 msgid ""
-"You can give arguments to the ifplug daemon here. See the man page for a "
-"description or call ifplugd -h."
+"You can give arguments to the ifplug daemon here.  Relevant options are:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../ifplugd.templates:3001
+msgid ""
+"-q Don't run script on daemon quit, -f Ignore detection failure and retry, -"
+"u Specify delay for configuring interface, -d Specify delay for "
+"deconfiguring interface, -w Wait until daemon fork finished, -I Don't exit "
+"on nonzero return value of program executed,"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../ifplugd.templates:3001
+msgid ""
+"-a Do not enable interface automatically,  -s Use stderr instead of syslog "
+"for debugging, -b Do not beep, -t Specify poll time in seconds, -p Don't run "
+"script on daemon startup, -l Run \"down\" script on startup if no cable is "
+"detected, -W Wait until the daemon died when running daemon is killed, -M "
+"Use interface monitoring,"
 msgstr ""
 
 #. Type: select
diff --git a/debian/po/vi.po b/debian/po/vi.po
index fe518cc..545a931 100644
--- a/debian/po/vi.po
+++ b/debian/po/vi.po
@@ -1,12 +1,12 @@
 # Vietnamese Translation for ifplugd.
 # Copyright © 2006 Free Software Foundation, Inc.
 # Clytie Siddall <clytie@riverland.net.au>, 2005-2006.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: ifplugd 0.26-2\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-11-24 07:23+0100\n"
+"Report-Msgid-Bugs-To: ifplugd@packages.debian.org\n"
+"POT-Creation-Date: 2008-03-04 20:07+0530\n"
 "PO-Revision-Date: 2006-12-03 18:21+1030\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -96,13 +96,37 @@ msgstr "các đối số cho ifplugd:"
 #. Type: string
 #. Description
 #: ../ifplugd.templates:3001
+#, fuzzy
+#| msgid ""
+#| "You can give arguments to the ifplug daemon here. See the man page for a "
+#| "description or call ifplugd -h."
 msgid ""
-"You can give arguments to the ifplug daemon here. See the man page for a "
-"description or call ifplugd -h."
+"You can give arguments to the ifplug daemon here.  Relevant options are:"
 msgstr ""
 "Ở đây bạn có thể gán các đối số cho trình nền ifplugd. Xem trang hướng dẫn "
 "(man) để tìm mô tả, hoặc chạy lệnh « ifplugd -h »."
 
+#. Type: string
+#. Description
+#: ../ifplugd.templates:3001
+msgid ""
+"-q Don't run script on daemon quit, -f Ignore detection failure and retry, -"
+"u Specify delay for configuring interface, -d Specify delay for "
+"deconfiguring interface, -w Wait until daemon fork finished, -I Don't exit "
+"on nonzero return value of program executed,"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../ifplugd.templates:3001
+msgid ""
+"-a Do not enable interface automatically,  -s Use stderr instead of syslog "
+"for debugging, -b Do not beep, -t Specify poll time in seconds, -p Don't run "
+"script on daemon startup, -l Run \"down\" script on startup if no cable is "
+"detected, -W Wait until the daemon died when running daemon is killed, -M "
+"Use interface monitoring,"
+msgstr ""
+
 #. Type: select
 #. Choices
 #: ../ifplugd.templates:4001
diff --git a/debian/po/zh_TW.po b/debian/po/zh_TW.po
index 8dabff5..c3a2ef8 100644
--- a/debian/po/zh_TW.po
+++ b/debian/po/zh_TW.po
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ifplugd\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-11-24 07:23+0100\n"
+"Report-Msgid-Bugs-To: ifplugd@packages.debian.org\n"
+"POT-Creation-Date: 2008-03-04 20:07+0530\n"
 "PO-Revision-Date: 2005-03-15 16:49+0800\n"
 "Last-Translator: Asho Yeh <asho@debian.org.tw>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -95,11 +95,35 @@ msgstr "ifplugd 參數"
 #. Type: string
 #. Description
 #: ../ifplugd.templates:3001
+#, fuzzy
+#| msgid ""
+#| "You can give arguments to the ifplug daemon here. See the man page for a "
+#| "description or call ifplugd -h."
 msgid ""
-"You can give arguments to the ifplug daemon here. See the man page for a "
-"description or call ifplugd -h."
+"You can give arguments to the ifplug daemon here.  Relevant options are:"
 msgstr "輸入 ifplugd daemon 的參數。參閱說明文件的敘述或執行 ifplugd -h。"
 
+#. Type: string
+#. Description
+#: ../ifplugd.templates:3001
+msgid ""
+"-q Don't run script on daemon quit, -f Ignore detection failure and retry, -"
+"u Specify delay for configuring interface, -d Specify delay for "
+"deconfiguring interface, -w Wait until daemon fork finished, -I Don't exit "
+"on nonzero return value of program executed,"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../ifplugd.templates:3001
+msgid ""
+"-a Do not enable interface automatically,  -s Use stderr instead of syslog "
+"for debugging, -b Do not beep, -t Specify poll time in seconds, -p Don't run "
+"script on daemon startup, -l Run \"down\" script on startup if no cable is "
+"detected, -W Wait until the daemon died when running daemon is killed, -M "
+"Use interface monitoring,"
+msgstr ""
+
 #. Type: select
 #. Choices
 #: ../ifplugd.templates:4001
diff --git a/debian/ifplugd.postinst b/debian/postinst
index 0c90f26..0c90f26 100644
--- a/debian/ifplugd.postinst
+++ b/debian/postinst
diff --git a/debian/ifplugd.postrm b/debian/postrm
index 355e51b..355e51b 100644
--- a/debian/ifplugd.postrm
+++ b/debian/postrm
diff --git a/debian/preinst b/debian/preinst
new file mode 100644
index 0000000..e9fb922
--- /dev/null
+++ b/debian/preinst
@@ -0,0 +1,62 @@
+#!/bin/sh
+set -e
+
+# Remove a no-longer used conffile
+rm_conffile() {
+	PKGNAME="$1"
+	CONFFILE="$2"
+	if [ -e "$CONFFILE" ]; then
+		md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`"
+		old_md5sum="`dpkg-query -W -f='${Conffiles}' $PKGNAME | sed -n -e \"\\\\' $CONFFILE'{s/ obsolete$//;s/.* //p}\"`"
+		if [ "$md5sum" != "$old_md5sum" ]; then
+			echo "Obsolete conffile $CONFFILE has been modified by you."
+			echo "Saving as $CONFFILE.dpkg-old ..."
+			mv -f "$CONFFILE" "$CONFFILE".dpkg-old
+		else
+			echo "Removing obsolete conffile $CONFFILE ..."
+			rm -f "$CONFFILE"
+		fi
+	fi
+}
+
+LASTVERSION="0.28-1"
+
+case "$1" in
+    install)
+	    if dpkg --compare-versions "$2" le "$LASTVERSION"; then
+		    rm_conffile ifplugd "/etc/hotplug.d/net/ifplugd.hotplug"
+	    fi
+	    ;;
+    upgrade)
+	    ### Move old apm hook script if appropriate ###
+	    if [ -f /etc/apm/event.d/20ifplugd ] ; then
+		[ -d /etc/apm/scripts.d/ ] || mkdir /etc/apm/scripts.d/
+		if [ -f /etc/apm/scripts.d/ifplugd ] ; then
+			mv -f /etc/apm/event.d/20ifplugd /etc/apm/event.d/20ifplugd.dpkg-old
+			chmod ugo-x /etc/apm/event.d/20ifplugd.dpkg-old
+		else
+			mv -f /etc/apm/event.d/20ifplugd /etc/apm/scripts.d/ifplugd
+		fi
+		for F in /etc/apm/suspend.d/20ifplugd /etc/apm/resume.d/80ifplugd /etc/apm/other.d/50ifplugd ; do
+			[ -e $F ] && { mv -f $F ${F}.dpkg-old ; chmod ugo-x ${F}.dpkg-old ; }
+			ln -nsf ../scripts.d/ifplugd $F
+		done
+	    fi
+
+	    # rename old script (old typo bug), maybe user changed it:
+	    if [ -f /etc/apm/script.d/ifplugd ] ; then
+		    mv /etc/apm/script.d/ifplugd /etc/apm/script.d/ifplugd.dpkg-old
+	    fi
+
+	    # change permissions of the old /etc/udev/ifplugd.rules
+	    if [ -f /etc/udev/ifplugd.rules ] ; then
+		    chmod 644 /etc/udev/ifplugd.rules
+	    fi
+
+	    if dpkg --compare-versions "$2" le "$LASTVERSION"; then
+		    rm_conffile ifplugd "/etc/hotplug.d/net/ifplugd.hotplug"
+	    fi
+	;;
+esac
+
+#DEBHELPER#
diff --git a/debian/rules b/debian/rules
index fcd9348..58640b2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,4 @@
 #!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
@@ -23,40 +21,46 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
 	INSTALL_PROGRAM += -s
 endif
 
-config.status: patch configure
-	dh_testdir
-	# Add here commands to configure the package.
-	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --sysconfdir=/etc
+confopts = --disable-subversion \
+	--disable-xmltoman
 
+config.status: patch configure-stamp
+configure-stamp:
+	dh_testdir
+	[ ! -f ifplugd.spec ] || mv -f ifplugd.spec ifplugd.spec.ups
+ifneq "$(wildcard /usr/share/misc/config.sub)" ""
+	cp -f /usr/share/misc/config.sub config.sub
+endif
+ifneq "$(wildcard /usr/share/misc/config.guess)" ""
+	cp -f /usr/share/misc/config.guess config.guess
+endif
+	[ ! -f doc/README.html ] || mv -f doc/README.html doc/README.html.ups
+	[ ! -f doc/README ] || mv -f doc/README doc/README.ups
+	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --sysconfdir=/etc CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs" $(confopts)
+	touch $@
 
 build: build-stamp
-
-build-stamp:  config.status
+build-stamp: patch-stamp config.status
 	dh_testdir
-
 	$(MAKE)
-
 	# replace arbitrary paths with paths that make sense: (sick...)
 	( cd doc; \
           sed "s%file://localhost/.*doc/README%file://localhost/usr/share/doc/README%" \
 		< README > README.tmp; \
           mv README.tmp README \
         )
+	touch $@
 
-	touch build-stamp
-
-clean: unpatch
+clean: clean-patched unpatch
+clean-patched:
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp 
-
-	-$(MAKE) distclean
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
-	cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
-	cp -f /usr/share/misc/config.guess config.guess
-endif
+	rm -f build-stamp configure-stamp
+	[ ! -f Makefile ] || $(MAKE) distclean
+	[ ! -f doc/README.ups ] || mv -f doc/README.ups doc/README
+	[ ! -f doc/README.html.ups ] || mv -f doc/README.html.ups doc/README.html
+	rm -f config.guess config.sub
+	[ ! -f ifplugd.spec.ups ] || mv -f ifplugd.spec.ups ifplugd.spec
 	debconf-updatepo
 	dh_clean
 
@@ -65,7 +69,6 @@ install: build
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
-
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/ifplugd
 	# now handled by debconf:
 	rm -f $(CURDIR)/debian/ifplugd/etc/ifplugd/ifplugd.conf
@@ -84,9 +87,9 @@ binary-arch: build install
 	dh_testroot
 	dh_installchangelogs 
 	dh_installdocs
-	dh_installdebconf -- debian/ifplugd.templates
+	dh_installdebconf
 	dh_installinit
-	dh_installman man/*.5 man/*.8
+	dh_installman
 	dh_link
 	dh_strip
 	dh_compress
@@ -98,4 +101,4 @@ binary-arch: build install
 	dh_builddeb
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install 
+.PHONY: build clean binary-indep binary-arch binary install patch unpatch
diff --git a/debian/shlibs.local b/debian/shlibs.local
deleted file mode 100644
index 9dcf467..0000000
--- a/debian/shlibs.local
+++ /dev/null
@@ -1 +0,0 @@
-libdaemon     0    libdaemon0 (>= 0.7)
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..b557c1d
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,3 @@
+version=3
+
+http://0pointer.de/lennart/projects/ifplugd/ifplugd-(.*)\.tar\.gz
diff --git a/man/ifplugd.8.xml.in b/man/ifplugd.8.xml.in
index dd23e36..9240891 100644
--- a/man/ifplugd.8.xml.in
+++ b/man/ifplugd.8.xml.in
@@ -185,7 +185,7 @@
 	  <option>
 	  	<p><opt>-M | --monitor</opt></p>
 		<optdesc><p>
-			Don't fail when the network interface is not available, instead use NETLINK to monitor device availability. The is useful for PCMCIA devices and similar. 
+			Don't fail when the network interface is not available, instead use NETLINK to monitor device avaibility. The is useful for PCMCIA devices and similar. 
 		</p></optdesc>
 	  </option>
 	  
@@ -218,7 +218,7 @@
 	  </option>
 	  
 	  <option>
-		<p><opt>-S | --suspend</opt></p> <optdesc><p> Suspend a running
+		<p><opt>-S | --supend</opt></p> <optdesc><p> Suspend a running
 		daemon. The daemon will no longer check the link status until
 		it is resumed (-R) again. (Specify -i to select the daemon instance
 		to suspend.)  </p></optdesc>
@@ -241,14 +241,14 @@
 	
 	<section name="Files">
 	  
-	  <p><file>@sysconfdir@/default/ifplugd.conf</file>: this file is sourced
+	  <p><file>@sysconfdir@/ifplugd/ifplugd.conf</file>: this file is sourced
 		by the init script <file>@sysconfdir@/init.d/ifplugd</file> and
 		contains the interface to be monitored and the options to be
 		used.</p>
 	  
 	  <p><file>@sysconfdir@/ifplugd/ifplugd.action</file>: this is the script
 		which will be called by the daemon whenever the state of the
-	 	interface changes. It takes two arguments: the first is the interface
+	 	interface changes. It takes two areguments: the first is the interface
 		name (eg. eth0), the second either "up" or "down". </p>
 		
 	  <p><file>/var/run/ifplugd.&lt;iface&gt;.pid</file>: the pid file
diff --git a/man/ifplugd.conf.5.xml.in b/man/ifplugd.conf.5.xml.in
index 70c0153..7da7da0 100644
--- a/man/ifplugd.conf.5.xml.in
+++ b/man/ifplugd.conf.5.xml.in
@@ -25,7 +25,7 @@
   <manpage name="ifplugd.conf" section="5" desc="ifplugd configuration file">
 
 	<synopsis>
-	  <cmd>@sysconfdir@/default/ifplugd.conf</cmd>
+	  <cmd>@sysconfdir@/ifplugd/ifplugd.conf</cmd>
 	</synopsis>
 	
 	<description>
@@ -40,7 +40,7 @@
 	  <option>
 		<p><opt>INTERFACES</opt></p> <optdesc><p>Specifies the
 		ethernet interfaces to monitor. It has to contain a space
-		separated list of network interfaces names. Most users will
+		seperated list of network interfaces names. Most users will
 		probably use "eth0" here, however you may add additional
 		interfaces for monitoring more than one device. A special
 		value is supported as well: "auto" will enable a more or less
author	Y Giridhar Appaji Nag <giridhar@appaji.net>	2008-03-06 08:46:28 +0530
committer	Andrew Shadura <andrew.shadura@collabora.co.uk>	2016-06-21 11:57:28 +0200
commit	b3e7e0ff387f2f526b29039c0eaa9b6c07b6f9fc (patch)
tree	16ef9b7cf00f35c41b83a32380ff97ff68c9054b
parent	f9134c0be076c5d2ed4084382a73115d7709e5c5 (diff)