diff -Nru uswsusp-1.0/config.guess uswsusp-1.0+20110509/config.guess
--- uswsusp-1.0/config.guess	2011-03-07 00:24:32.000000000 +0100
+++ uswsusp-1.0+20110509/config.guess	1970-01-01 01:00:00.000000000 +0100
@@ -1,1511 +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, 2007, 2008, 2009
-#   Free Software Foundation, Inc.
-
-timestamp='2009-11-20'
-
-# 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.  Please send patches (context
-# diff format) to <config-patches@gnu.org> and include a 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.
-#
-# You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
-
-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, 2006, 2007, 2008 Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-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
-
-case "${UNAME_MACHINE}" in
-    i?86)
-	test -z "$VENDOR" && VENDOR=pc
-	;;
-    *)
-	test -z "$VENDOR" && VENDOR=unknown
-	;;
-esac
-test -f /etc/SuSE-release -o -f /.buildenv && VENDOR=suse
-
-# 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 -q __ELF__
-		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}-${VENDOR}-openbsd${UNAME_RELEASE}
-	exit ;;
-    *:ekkoBSD:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-ekkobsd${UNAME_RELEASE}
-	exit ;;
-    *:SolidBSD:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-solidbsd${UNAME_RELEASE}
-	exit ;;
-    macppc:MirBSD:*:*)
-	echo powerpc-${VENDOR}-mirbsd${UNAME_RELEASE}
-	exit ;;
-    *:MirBSD:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-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-${VENDOR}-sysv4
-	exit ;;
-    *:[Aa]miga[Oo][Ss]:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-amigaos
-	exit ;;
-    *:[Mm]orph[Oo][Ss]:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-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-${VENDOR}-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 ;;
-    s390x:SunOS:*:*)
-	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    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:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
-	echo i386-pc-auroraux${UNAME_RELEASE}
-	exit ;;
-    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
-	eval $set_cc_for_build
-	SUN_ARCH="i386"
-	# If there is a compiler, see if it is configured for 64-bit objects.
-	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
-	# This test works for both compilers.
-	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
-	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
-		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
-		grep IS_64BIT_ARCH >/dev/null
-	    then
-		SUN_ARCH="x86_64"
-	    fi
-	fi
-	echo ${SUN_ARCH}-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-${VENDOR}-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:*:[456])
-	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
-	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
-		IBM_ARCH=rs6000
-	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 -q __LP64__
-	    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}-${VENDOR}-osf1mk
-	else
-	    echo ${UNAME_MACHINE}-${VENDOR}-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-${VENDOR}-bsdi${UNAME_RELEASE}
-	exit ;;
-    *:BSD/OS:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-bsdi${UNAME_RELEASE}
-	exit ;;
-    *:FreeBSD:*:*)
-	case ${UNAME_MACHINE} in
-	    pc98)
-		echo i386-${VENDOR}-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-	    amd64)
-		echo x86_64-${VENDOR}-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-	    *)
-		echo ${UNAME_MACHINE}-${VENDOR}-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*:*)
-    	case ${UNAME_MACHINE} in
-	    x86)
-		echo i586-pc-interix${UNAME_RELEASE}
-		exit ;;
-	    authenticamd | genuineintel | EM64T)
-		echo x86_64-${VENDOR}-interix${UNAME_RELEASE}
-		exit ;;
-	    IA64)
-		echo ia64-${VENDOR}-interix${UNAME_RELEASE}
-		exit ;;
-	esac ;;
-    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
-	echo i${UNAME_MACHINE}-pc-mks
-	exit ;;
-    8664:Windows_NT:*)
-	echo x86_64-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-${VENDOR}-cygwin
-	exit ;;
-    p*:CYGWIN*:*)
-	echo powerpcle-${VENDOR}-cygwin
-	exit ;;
-    prep*:SunOS:5.*:*)
-	echo powerpcle-${VENDOR}-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    *:GNU:*:*)
-	# the GNU system
-	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-${VENDOR}-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
-	exit ;;
-    *:GNU/*:*:*)
-	# other systems with GNU libc and userland
-	echo ${UNAME_MACHINE}-${VENDOR}-`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 ;;
-    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 -q ld.so.1
-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-	echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu${LIBC}
-	exit ;;
-    arm*:Linux:*:*)
-	eval $set_cc_for_build
-	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
-	    | grep -q __ARM_EABI__
-	then
-	    echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
-	else
-	    echo ${UNAME_MACHINE}-${VENDOR}-linux-gnueabi
-	fi
-	exit ;;
-    avr32*:Linux:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
-	exit ;;
-    cris:Linux:*:*)
-	echo cris-axis-linux-gnu
-	exit ;;
-    crisv32:Linux:*:*)
-	echo crisv32-axis-linux-gnu
-	exit ;;
-    frv:Linux:*:*)
-    	echo frv-${VENDOR}-linux-gnu
-	exit ;;
-    i*86:Linux:*:*)
-	LIBC=gnu
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#ifdef __dietlibc__
-	LIBC=dietlibc
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
-	echo "${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}"
-	exit ;;
-    ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
-	exit ;;
-    m32r*:Linux:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
-	exit ;;
-    m68*:Linux:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
-	exit ;;
-    mips:Linux:*:* | mips64:Linux:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#undef CPU
-	#undef ${UNAME_MACHINE}
-	#undef ${UNAME_MACHINE}el
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=${UNAME_MACHINE}el
-	#else
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=${UNAME_MACHINE}
-	#else
-	CPU=
-	#endif
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
-	test x"${CPU}" != x && { echo "${CPU}-${VENDOR}-linux-gnu"; exit; }
-	;;
-    or32:Linux:*:*)
-	echo or32-${VENDOR}-linux-gnu
-	exit ;;
-    padre:Linux:*:*)
-	echo sparc-${VENDOR}-linux-gnu
-	exit ;;
-    parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-${VENDOR}-linux-gnu
-	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-${VENDOR}-linux-gnu ;;
-	  PA8*) echo hppa2.0-${VENDOR}-linux-gnu ;;
-	  *)    echo hppa-${VENDOR}-linux-gnu ;;
-	esac
-	exit ;;
-    ppc64:Linux:*:*)
-	echo powerpc64-${VENDOR}-linux-gnu
-	exit ;;
-    ppc:Linux:*:*)
-	echo powerpc-${VENDOR}-linux-gnu
-	exit ;;
-    s390:Linux:*:* | s390x:Linux:*:*)
-	echo ${UNAME_MACHINE}-ibm-linux
-	exit ;;
-    sh64*:Linux:*:*)
-    	echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
-	exit ;;
-    sh*:Linux:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
-	exit ;;
-    sparc:Linux:*:* | sparc64:Linux:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
-	exit ;;
-    vax:Linux:*:*)
-	echo ${UNAME_MACHINE}-dec-linux-gnu
-	exit ;;
-    x86_64:Linux:*:*)
-	echo x86_64-${VENDOR}-linux-gnu
-	exit ;;
-    xtensa*:Linux:*:*)
-    	echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
-	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}-${VENDOR}-stop
-	exit ;;
-    i*86:atheos:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-atheos
-	exit ;;
-    i*86:syllable:*:*)
-	echo ${UNAME_MACHINE}-pc-syllable
-	exit ;;
-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
-	echo i386-${VENDOR}-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}-${VENDOR}-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 i586.
-	# Note: whatever this is, it MUST be the same as what config.sub
-	# prints for the "djgpp" host, or else GDB configury will decide that
-	# this is a cross-build.
-	echo i586-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-${VENDOR}-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; } ;;
-    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
-	OS_REL='.3'
-	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; }
-	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
-	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
-    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
-	echo m68k-${VENDOR}-lynxos${UNAME_RELEASE}
-	exit ;;
-    mc68030:UNIX_System_V:4.*:*)
-	echo m68k-atari-sysv4
-	exit ;;
-    TSUNAMI:LynxOS:2.*:*)
-	echo sparc-${VENDOR}-lynxos${UNAME_RELEASE}
-	exit ;;
-    rs6000:LynxOS:2.*:*)
-	echo rs6000-${VENDOR}-lynxos${UNAME_RELEASE}
-	exit ;;
-    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
-	echo powerpc-${VENDOR}-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-${VENDOR}-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 ;;
-    BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
-	echo i586-pc-haiku
-	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
-	    i386)
-		eval $set_cc_for_build
-		if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
-		  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
-		      (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
-		      grep IS_64BIT_ARCH >/dev/null
-		  then
-		      UNAME_PROCESSOR="x86_64"
-		  fi
-		fi ;;
-	    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}-${VENDOR}-plan9
-	exit ;;
-    *:TOPS-10:*:*)
-	echo pdp10-${VENDOR}-tops10
-	exit ;;
-    *:TENEX:*:*)
-	echo pdp10-${VENDOR}-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-${VENDOR}-tops20
-	exit ;;
-    *:ITS:*:*)
-	echo pdp10-${VENDOR}-its
-	exit ;;
-    SEI:*:*:SEIUX)
-        echo mips-sei-seiux${UNAME_RELEASE}
-	exit ;;
-    *:DragonFly:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-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 ;;
-    i*86:AROS:*:*)
-	echo ${UNAME_MACHINE}-pc-aros
-	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://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
-and
-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
-
-If the version you run ($0) is already up to date, please
-send the following data and any information you think might be
-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 -Nru uswsusp-1.0/config.sub uswsusp-1.0+20110509/config.sub
--- uswsusp-1.0/config.sub	2011-03-07 00:24:32.000000000 +0100
+++ uswsusp-1.0+20110509/config.sub	1970-01-01 01:00:00.000000000 +0100
@@ -1,1705 +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, 2007, 2008, 2009
-#   Free Software Foundation, Inc.
-
-timestamp='2009-11-20'
-
-# 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 GNU 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.
-
-# You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
-
-# 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, 2006, 2007, 2008 Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-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* | \
-  kopensolaris*-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 | -microblaze)
-		os=
-		basic_machine=$1
-		;;
-        -bluegene*)
-	        os=-cnk
-		;;
-	-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 \
-	| lm32 \
-	| m32c | m32r | m32rle | m68000 | m68k | m88k \
-	| maxq | mb | microblaze | mcore | mep | metag \
-	| mips | mipsbe | mipseb | mipsel | mipsle \
-	| mips16 \
-	| mips64 | mips64el \
-	| mips64octeon | mips64octeonel \
-	| mips64orion | mips64orionel \
-	| mips64r5900 | mips64r5900el \
-	| mips64vr | mips64vrel \
-	| mips64vr4100 | mips64vr4100el \
-	| mips64vr4300 | mips64vr4300el \
-	| mips64vr5000 | mips64vr5000el \
-	| mips64vr5900 | mips64vr5900el \
-	| mipsisa32 | mipsisa32el \
-	| mipsisa32r2 | mipsisa32r2el \
-	| mipsisa64 | mipsisa64el \
-	| mipsisa64r2 | mipsisa64r2el \
-	| mipsisa64sb1 | mipsisa64sb1el \
-	| mipsisa64sr71k | mipsisa64sr71kel \
-	| mipstx39 | mipstx39el \
-	| mn10200 | mn10300 \
-	| moxie \
-	| mt \
-	| msp430 \
-	| nios | nios2 \
-	| ns16k | ns32k \
-	| or32 \
-	| pdp10 | pdp11 | pj | pjl \
-	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
-	| pyramid \
-	| rx \
-	| score \
-	| sh | sh[1234] | sh[24]a | sh[24]aeb | 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 \
-	| ubicom32 \
-	| v850 | v850e \
-	| we32k \
-	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
-	| z8k | z80)
-		basic_machine=$basic_machine-unknown
-		;;
-	m6811 | m68hc11 | m6812 | m68hc12 | picochip)
-		# 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-* \
-	| lm32-* \
-	| m32c-* | m32r-* | m32rle-* \
-	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
-	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
-	| mips16-* \
-	| mips64-* | mips64el-* \
-	| mips64octeon-* | mips64octeonel-* \
-	| mips64orion-* | mips64orionel-* \
-	| mips64r5900-* | mips64r5900el-* \
-	| mips64vr-* | mips64vrel-* \
-	| 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-* | rx-* \
-	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | 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-* | tile-* \
-	| tron-* \
-	| ubicom32-* \
-	| v850-* | v850e-* | vax-* \
-	| we32k-* \
-	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
-	| xstormy16-* | xtensa*-* \
-	| ymp-* \
-	| z8k-* | z80-*)
-		;;
-	# Recognize the basic CPU types without company name, with glob match.
-	xtensa*)
-		basic_machine=$basic_machine-unknown
-		;;
-	# 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
-		;;
-	aros)
-		basic_machine=i386-pc
-		os=-aros
-		;;
-	aux)
-		basic_machine=m68k-apple
-		os=-aux
-		;;
-	balance)
-		basic_machine=ns32k-sequent
-		os=-dynix
-		;;
-	blackfin)
-		basic_machine=bfin-unknown
-		os=-linux
-		;;
-	blackfin-*)
-		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
-		os=-linux
-		;;
-	bluegene*)
-		basic_machine=powerpc-ibm
-		os=-cnk
-		;;
-	c90)
-		basic_machine=c90-cray
-		os=-unicos
-		;;
-        cegcc)
-		basic_machine=arm-unknown
-		os=-cegcc
-		;;
-	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
-		;;
-	dicos)
-		basic_machine=i686-pc
-		os=-dicos
-		;;
-	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
-		;;
-	m68knommu)
-		basic_machine=m68k-unknown
-		os=-linux
-		;;
-	m68knommu-*)
-		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
-		os=-linux
-		;;
-	m88k-omron*)
-		basic_machine=m88k-omron
-		;;
-	magnum | m3230)
-		basic_machine=mips-mips
-		os=-sysv
-		;;
-	merlin)
-		basic_machine=ns32k-utek
-		os=-sysv
-		;;
-        microblaze)
-		basic_machine=microblaze-xilinx
-		;;
-	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
-		;;
-	parisc)
-		basic_machine=hppa-unknown
-		os=-linux
-		;;
-	parisc-*)
-		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
-		os=-linux
-		;;
-	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
-		;;
-	tile*)
-		basic_machine=tile-unknown
-		os=-linux-gnu
-		;;
-	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
-		;;
-	z80-*-coff)
-		basic_machine=z80-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[24]aeb | 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.
-        -auroraux)
-	        os=-auroraux
-		;;
-	-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* | -cnk* | -sunos | -sunos[34]*\
-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
-	      | -sym* | -kopensolaris* \
-	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-	      | -aos* | -aros* \
-	      | -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* | -cegcc* \
-	      | -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* | -es*)
-	# 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
-		;;
-	-dicos*)
-		os=-dicos
-		;;
-	-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
-				;;
-			-cnk*|-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 -Nru uswsusp-1.0/debian/changelog uswsusp-1.0+20110509/debian/changelog
--- uswsusp-1.0/debian/changelog	2011-04-30 12:17:32.000000000 +0200
+++ uswsusp-1.0+20110509/debian/changelog	2011-11-18 20:20:10.000000000 +0100
@@ -1,3 +1,64 @@
+uswsusp (1.0+20110509-2ubuntu1) precise; urgency=low
+
+  * Merge from debian unstable (LP: #892306).  Remaining changes:
+    - debian/rules: 
+      + Remove the SPLASHY_LIBS piece, it's useless since the splashy support
+        has been disabled
+
+ -- Leo Iannacone <l3on@ubuntu.com>  Fri, 18 Nov 2011 12:11:05 +0000
+
+uswsusp (1.0+20110509-2) unstable; urgency=low
+
+  [ Rodolfo García Peñas (kix) ]
+  * In the version 1.0-1 the uswsusp uses KMS and follow the kernel
+    [Closes: #500794] 
+  * Machine support using whitelist finished in version 1.0-1
+    [Closes: #520848, #518369, #498195, #497848, #526938, #509635]
+    [Closes: #495436, #497842, #591066, #402365, #498917, #521147]
+    [Closes: #541135, #530389, #574874]
+  * In version 1.0-2: Corrected the doble quote in the uswsusp hook
+    [Closes: #604427]
+  * All debian/patches includes now description. DEP-3
+  * Debian standard version is now 3.9.2
+  * Debian changelog is now DEP-5
+
+ -- Rodolfo García Peñas (kix) <kix@kix.es>  Sun, 25 Sep 2011 16:17:13 +0200
+
+uswsusp (1.0+20110509-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix pending l10n issues. Debconf translations:
+    - Vietnamese (Clytie Siddall).  Closes: #601560
+    - Dutch (willem kuyn).  Closes: #622914
+    - Danish (Joe Hansen).  Closes: #624659
+
+ -- Christian Perrier <bubulle@debian.org>  Sun, 24 Jul 2011 12:29:35 +0200
+
+uswsusp (1.0+20110509-1) unstable; urgency=low
+
+  [ Rodolfo García Peñas (kix) ]
+  * New upstream version from git
+  * Now the postinst script checks if /dev/MAKEDEV exists [Closes: #522707]
+  * The uswsusp.postinst file writes correctly the conf file [Closes: #524301]
+  * Added "shutdown_method" in the NOTQ in uswsusp.config. 
+    Is included in the 0.7 version, but not in 0.8. [Closes: #503337]
+
+ -- Rodolfo García Peñas (kix) <kix@kix.es>  Mon, 9 May 2011 00:04:43 +0200
+
+uswsusp (1.0-2) unstable; urgency=low
+
+  [ Rodolfo García Peñas (kix) ]
+  * Patch for vt when not needed [Closes: #530713]
+  * Corrected some spelling problems [Closes: #609418, #518636]
+  * Vietnamese debconf template update [Closes: #601560]
+  * The orig file includes the wlcsv2c.pl file (needed to make)
+  * s2ram --force compatibility with PPC platform [Closes: #523552]
+  * Corrected the doble quote in the uswsusp hook [Closes: #606732, #600572]
+  * The bug #525001 was solved previously [Closes: #525001]
+  * Added the > character in the uswsusp.conf file [Closes: #539116]
+
+ -- Rodolfo García Peñas (kix) <kix@kix.es>  Thu, 18 Mar 2011 20:39:03 +0100
+
 uswsusp (1.0-1ubuntu1) oneiric; urgency=low
 
   * Merge from debian unstable, remaining changes:
@@ -454,3 +515,4 @@
     are alternatives in debian.
 
  -- Tim Dijkstra <tim@famdijkstra.org>  Fri, 30 Jun 2006 09:38:19 +0200
+
diff -Nru uswsusp-1.0/debian/control uswsusp-1.0+20110509/debian/control
--- uswsusp-1.0/debian/control	2011-04-30 12:02:49.000000000 +0200
+++ uswsusp-1.0+20110509/debian/control	2011-11-18 20:15:46.000000000 +0100
@@ -4,8 +4,8 @@
 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: Tim Dijkstra <tim@debian.org>
 Uploaders: Anibal Monsalve Salazar <anibal@debian.org>, Rodolfo García Peñas (kix) <kix@kix.es>
-Build-Depends: debhelper (>= 7.0.50~), autotools-dev, libpci-dev, docbook-xml, xsltproc, po-debconf, zlib1g-dev, libx86-dev [amd64 i386], pkg-config, autotools-dev, quilt, liblzo2-dev, libgcrypt11-dev, docbook2x
-Standards-Version: 3.9.1
+Build-Depends: debhelper (>= 7.0.50~), autotools-dev, libpci-dev, docbook-xsl, docbook-xml, xsltproc, po-debconf, zlib1g-dev, libx86-dev [amd64 i386], pkg-config, autotools-dev, liblzo2-dev, libgcrypt11-dev, docbook2x
+Standards-Version: 3.9.2
 Homepage: http://suspend.sourceforge.net/
 
 Package: uswsusp
diff -Nru uswsusp-1.0/debian/copyright uswsusp-1.0+20110509/debian/copyright
--- uswsusp-1.0/debian/copyright	2011-03-14 03:16:45.000000000 +0100
+++ uswsusp-1.0+20110509/debian/copyright	2011-09-25 17:40:56.000000000 +0200
@@ -1,164 +1,86 @@
-This work was packaged for Debian by:
-
-    Rodolfo García Peñas (kix) <kix@kix.es> on Sun, 05 Sep 2010 12:15:47 +0200
-
-It was downloaded from:
-
-    http://git.kernel.org/?p=linux/kernel/git/rafael/suspend-utils.git
-
-Upstream Author(s):
-
-    Copyright (C) 2005 Rafael J. Wysocki <rjw@sisk.pl>
-    Copyright (C) 2006 Pavel Machek <pavel@suse.cz>
-
-Copyright:
-
-    Copyright (C) 2005 Rafael J. Wysocki <rjw@sisk.pl>
-    Copyright (C) 2006 Pavel Machek <pavel@suse.cz>
-
-License:
-
-    uswsusp is released under the terms of the GNU General Public License
-    version 2. see '/usr/share/common-licenses/GPL-2'
-
-The Debian packaging is:
-
-    Copyright is (C) 2006, Tim Dijkstra <tim@famdijkstra.org> and
-    is licensed under the GPL, see `/usr/share/common-licenses/GPL-2'.
-    Copyright (C) 2010 Rodolfo García Peñas (kix) <kix@kix.es> and
-    is licensed under the GPL version 2, see "/usr/share/common-licenses/GPL-2".
-
-It includes the file radeontool.c
-
-    Radeontool   v1.4
-    by Frederick Dean <software@fdd.com>
-    Copyright 2002-2004 Frederick Dean
-    Use hereby granted under the zlib license.
-
-It includes the source of vbetool-0.5-1. Copyright:
-
-    Copyright Matthew Garrett <mjg59@srcf.ucam.org>, heavily based on
-    vbetest.c from the lrmi package and read-edid.c by John Fremlin
-
-    This program is released under the terms of the GNU General Public License,
-    version 2
-
-    Upstream Author: Matthew Garrett <mjg59@srcf.ucam.org>
-
-    License:
-
-    vbetool is released under the terms of the GNU General Public License
-    version 2
-
-It includes the bootsplash method. Copyright:
-
-    Copyright (C) 2006 Holger Macht <holger@homac.de>
-    This file is released under the GPLv2.
-
-It includes the DMI decoder for s2ram.
-
-    DMI decoder for s2ram.
-    (C) 2000,2001 Alan Cox <alan@redhat.com>
-
-    2-July-2001 Matt Domsch <Matt_Domsch@dell.com>
-    Additional structures displayed per SMBIOS 2.3.1 spec
-
-    (C) 2006 Pavel Machek <pavel@suse.cz>
-    Licensed under the GNU General Public license v2.
-
-It includes the framebuffer splash (fbsplash).
-
-    fbsplash (framebuffer splash) splash method support
-    Copyright (C) 2007 Alon Bar-Lev <alon.barlev@gmail.com>
-    This file is released under the GPLv2.
-
-It includes the suspend database management using CVS files
-
-    Rodolfo García <kix@kix.es>
-    Licensed under the GNU General Public license v2.
-
-It includes the vbetool, with the Linux Real Mode Interface. Copyrigth:
-
-    Linux Real Mode Interface - A library of DPMI-like functions for Linux.
-
-    Copyright (C) 1998 by Josh Vanderhoof
-
-    Permission is hereby granted, free of charge, to any person obtaining
-    a copy of this software and associated documentation files (the
-    "Software"), to deal in the Software without restriction, including
-    without limitation the rights to use, copy, modify, merge, publish,
-    distribute, sublicense, and/or sell copies of the Software, and to
-    permit persons to whom the Software is furnished to do so, subject to
-    the following conditions:
-
-    The above copyright notice and this permission notice shall be
-    included in all copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-    IN NO EVENT SHALL JOSH VANDERHOOF BE LIABLE FOR ANY CLAIM, DAMAGES OR
-    OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-    ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-    OTHER DEALINGS IN THE SOFTWARE.
-
-It includes the vbetool.c. Copyright:
-
-    Run video BIOS code for various purposes
-
-    Copyright Matthew Garrett <mjg59@srcf.ucam.org>, heavily based on
-    vbetest.c from the lrmi package and read-edid.c by John Fremlin
-
-    This program is released under the terms of the GNU General Public License,
-    version 2
-
-It includes the x86emu. Copyright
-
-    Realmode X86 Emulator Library
-    Copyright (C) 1996-1999 SciTech Software, Inc.
-    Copyright (C) David Mosberger-Tang
-    Copyright (C) 1999 Egbert Eich
-  
-    Permission to use, copy, modify, distribute, and sell this software and
-    its documentation for any purpose is hereby granted without fee,
-    provided that the above copyright notice appear in all copies and that
-    both that copyright notice and this permission notice appear in
-    supporting documentation, and that the name of the authors not be used
-    in advertising or publicity pertaining to distribution of the software
-    without specific, written prior permission.  The authors makes no
-    representations about the suitability of this software for any purpose.
-    It is provided "as is" without express or implied warranty.
-  
-    THE AUTHORS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-    INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-    EVENT SHALL THE AUTHORS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-    CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
-    USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-    OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-    PERFORMANCE OF THIS SOFTWARE.
-
-And the file lrmi.c
-
-    Linux Real Mode Interface - A library of DPMI-like functions for Linux.
-
-    Copyright (C) 1998 by Josh Vanderhoof
-
-    Permission is hereby granted, free of charge, to any person obtaining
-    a copy of this software and associated documentation files (the
-    "Software"), to deal in the Software without restriction, including
-    without limitation the rights to use, copy, modify, merge, publish,
-    distribute, sublicense, and/or sell copies of the Software, and to
-    permit persons to whom the Software is furnished to do so, subject to
-    the following conditions:
-
-    The above copyright notice and this permission notice shall be
-    included in all copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-    IN NO EVENT SHALL JOSH VANDERHOOF BE LIABLE FOR ANY CLAIM, DAMAGES OR
-    OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-    ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-    OTHER DEALINGS IN THE SOFTWARE.
-
+Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?view=co&pathrev=174
+Upstream-Name: suspend-utils
+Upstream-Contact: suspend-devel@lists.sourceforge.net
+Source: http://git.kernel.org/?p=linux/kernel/git/rafael/suspend-utils.git
+
+Files: *
+Copyright: 2005, Rafael J. Wysocki <rjw@sisk.pl>
+           2006, Pavel Machek <pavel@suse.cz>
+           2011, Rafael J. Wysocki <rjw@sisk.pl>
+License: GPL-2+
+
+Files: debian/*
+Copyright: 2006, Tim Dijkstra <tim@famdijkstra.org>
+           2007, Tim Dijkstra <tim@famdijkstra.org>
+           2008, Christian Perrier <bubulle@debian.org>
+           2009, Michael Prokop <mika@debian.org>
+           2011, Rodolfo García Peñas (kix) <kix@kix.es>
+License: GPL-2+
+
+Files: radeontool.c
+Copyright: 2002, Frederick Dean <software@fdd.com>
+           2003, Frederick Dean <software@fdd.com>
+           2004, Frederick Dean <software@fdd.com>
+License: Zlib
+
+Files: vbetool/*
+Copyright: 2006, Matthew Garrett <mjg59@srcf.ucam.org>
+License: GPL-2+
+
+Files: bootsplash.*
+Copyright: 2006, Holger Macht <holger@homac.de>
+License: GPL-2+
+
+Files: dmidecode.c
+Copyright: 2000, Alan Cox <alan@redhat.com>
+           2001, Alan Cox <alan@redhat.com>
+           2001, Matt Domsch <Matt_Domsch@dell.com>
+           2006, Pavel Machek <pavel@suse.cz>
+License: GPL-2+
+
+Files: fbsplash*
+Copyright: 2007, Alon Bar-Lev <alon.barlev@gmail.com>
+License: GPL-2+
+
+Files: wlcsv2c.pl
+Copyright: 2010, Rodolfo García Peñas (kix) <kix@kix.es>
+License: GPL-2+
+
+License: GPL-2+
+ This program is free software; you can redistribute it
+ and/or modify it under the terms of the GNU General Public
+ License as published by the Free Software Foundation; 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 package; if not, write to the Free
+ Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ Boston, MA  02110-1301 USA
+ .
+ On Debian systems, the full text of the GNU General Public
+ License version 2 can be found in the file
+ `/usr/share/common-licenses/GPL-2'.
+
+License: Zlib
+ This software is provided 'as-is', without any express or implied
+ warranty.  In no event will the authors be held liable for any damages
+ arising from the use of this software.
+ .
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+ .
+ 1. The origin of this software must not be misrepresented; you must not
+    claim that you wrote the original software. If you use this software
+    in a product, an acknowledgment in the product documentation would be
+    appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+    misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
diff -Nru uswsusp-1.0/debian/initramfs-tools/hooks/uswsusp uswsusp-1.0+20110509/debian/initramfs-tools/hooks/uswsusp
--- uswsusp-1.0/debian/initramfs-tools/hooks/uswsusp	2011-03-11 23:53:37.000000000 +0100
+++ uswsusp-1.0+20110509/debian/initramfs-tools/hooks/uswsusp	2011-05-11 08:33:41.000000000 +0200
@@ -28,7 +28,7 @@
 # The only obligatory option ..
 RES_DEV=$(sed -rn 's/^resume device[[:space:]]+[:=][[:space:]]+// p' /etc/uswsusp.conf)
 
-if [ -z "$RES_DEV" ] || [ ! -b $RES_DEV ]; then
+if [ -z "$RES_DEV" ] || [ ! -b "$RES_DEV" ]; then
     exit 0;
 fi
 
diff -Nru uswsusp-1.0/debian/manpages uswsusp-1.0+20110509/debian/manpages
--- uswsusp-1.0/debian/manpages	2011-03-11 23:53:37.000000000 +0100
+++ uswsusp-1.0+20110509/debian/manpages	2011-07-14 22:58:01.000000000 +0200
@@ -1,5 +1,5 @@
-s2disk.8
-uswsusp.conf.5
-s2ram.8
-suspend-keygen.8
-swap-offset.8
+debian/s2disk.8
+debian/uswsusp.conf.5
+debian/s2ram.8
+debian/suspend-keygen.8
+debian/swap-offset.8
diff -Nru uswsusp-1.0/debian/patches/01_uswsusp_rename.patch uswsusp-1.0+20110509/debian/patches/01_uswsusp_rename.patch
--- uswsusp-1.0/debian/patches/01_uswsusp_rename.patch	1970-01-01 01:00:00.000000000 +0100
+++ uswsusp-1.0+20110509/debian/patches/01_uswsusp_rename.patch	2011-09-25 16:11:45.000000000 +0200
@@ -0,0 +1,97 @@
+Description: This patch changes the name of the /etc/suspend.{conf|key} files to /etc/uswsusp.{conf|key}
+Author: Rodolfo García Peñas (kix) <kix@kix.es>
+Last-Update: 2011-10-25
+Index: uswsusp-1.0/HOWTO
+===================================================================
+--- uswsusp-1.0.orig/HOWTO	2011-07-14 22:03:47.261924563 +0200
++++ uswsusp-1.0/HOWTO	2011-07-14 22:19:39.401924791 +0200
+@@ -153,7 +153,7 @@
+ 
+ (f) Optinally create initramfs image
+ 
+-- Edit conf/suspend.conf file to reflect the configuration
++- Edit conf/uswsusp.conf file to reflect the configuration
+ of your system (please refer to Section II of this document for details).
+ 
+ [There should be just one resume partition, for now. You'll need at most 1/2
+@@ -280,7 +280,7 @@
+ in the directory where you have placed the sources.
+ 
+ 4) Create the configuration file for the s2disk tool.  Its default name
+-is /etc/suspend.conf, but this can be customized by changing CONFIG_FILE
++is /etc/uswsusp.conf, but this can be customized by changing CONFIG_FILE
+ in config_parser.h.  It is also possible to specify the configuration file
+ name from the command line, by using the -f option, eg.
+ 
+@@ -382,7 +382,7 @@
+ for it explicitly.
+ 
+ In order to create the configuration file for s2disk and/or resume, it is
+-recommended to edit the file suspend.conf in the conf/ subdirectory of the
++recommended to edit the file uswsusp.conf in the conf/ subdirectory of the
+ package source.  Then this file will be automatically placed in /etc and
+ in the resume initrd file by scripts provided in this package.
+ 
+@@ -499,7 +499,7 @@
+ (j) Put the configuration file for the resume tool in the etc directory on
+ the initrd filesystem, eg.
+ 
+-# cp /etc/suspend.conf /mnt/etc/
++# cp /etc/uswsusp.conf /mnt/etc/
+ 
+ (k) Unmount the initrd filesystem and move the file containing it to your /boot
+ directory, eg.
+@@ -527,7 +527,7 @@
+ 	TEMPLATE resume
+ 	BEGIN
+ 		FILE "/usr/local/sbin/resume"
+-		FILE "/etc/suspend.conf"
++		FILE "/etc/uswsusp.conf"
+ 		SCRIPT "/init"
+ 		BEGIN
+ 			!if [ -z "$noresume" ]
+@@ -602,7 +602,7 @@
+ 
+ For this purpose you need to generate the RSA key pair using the
+ suspend-keygen tool provided along with the s2disk and resume tools.  The
+-output file of suspend-keygen should be saved as /etc/suspend.key (or
++output file of suspend-keygen should be saved as /etc/uswsusp.key (or
+ something else pointed to by the "RSA key file =" configuration  parameter of
+ s2disk).  This file contains the public modulus (n), public exponent (e), the
+ AES-encrypted private exponent (d), the AES-encrypted primes (p), (q) and
+Index: uswsusp-1.0/config_parser.h
+===================================================================
+--- uswsusp-1.0.orig/config_parser.h	2011-07-14 22:03:47.293924879 +0200
++++ uswsusp-1.0/config_parser.h	2011-07-14 22:19:39.401924791 +0200
+@@ -27,4 +27,4 @@
+ void usage(char *my_name, struct option options[], const char *short_options);
+ void version(char *my_name, char *extra_version);
+ 
+-#define CONFIG_FILE	"/etc/suspend.conf"
++#define CONFIG_FILE	"/etc/uswsusp.conf"
+Index: uswsusp-1.0/encrypt.h
+===================================================================
+--- uswsusp-1.0.orig/encrypt.h	2011-07-14 22:03:47.277925478 +0200
++++ uswsusp-1.0/encrypt.h	2011-07-14 22:19:39.401924791 +0200
+@@ -59,7 +59,7 @@
+ void encrypt_init(unsigned char *, unsigned char *, char *);
+ void get_random_salt(unsigned char *salt, size_t size);
+ 
+-#define SUSPEND_KEY_FILE_PATH	"/etc/suspend.key"
++#define SUSPEND_KEY_FILE_PATH	"/etc/uswsusp.key"
+ #define ENCRYPT_BUF_PAGES	256
+ 
+ extern gcry_cipher_hd_t cipher_handle;
+Index: uswsusp-1.0/keygen.c
+===================================================================
+--- uswsusp-1.0.orig/keygen.c	2011-07-14 22:03:47.317924270 +0200
++++ uswsusp-1.0/keygen.c	2011-07-14 22:19:39.405925821 +0200
+@@ -27,7 +27,7 @@
+ #define MAX_KEY_BITS	4096
+ #define MAX_OUT_SIZE	(sizeof(struct RSA_data))
+ #define MAX_STR_LEN	256
+-#define DEFAULT_FILE	"suspend.key"
++#define DEFAULT_FILE	"uswsusp.key"
+ 
+ static char in_buffer[MAX_STR_LEN];
+ static char pass_buf[MAX_STR_LEN];
diff -Nru uswsusp-1.0/debian/patches/02_s2ram_no_vt_switch.patch uswsusp-1.0+20110509/debian/patches/02_s2ram_no_vt_switch.patch
--- uswsusp-1.0/debian/patches/02_s2ram_no_vt_switch.patch	1970-01-01 01:00:00.000000000 +0100
+++ uswsusp-1.0+20110509/debian/patches/02_s2ram_no_vt_switch.patch	2011-09-25 16:14:45.000000000 +0200
@@ -0,0 +1,54 @@
+Description: VT switching is removed because is not needed
+Author: Didier Raboud <didier@raboud.com>
+Last-Update: 2011-10-25
+Index: uswsusp-1.0/s2ram-main.c
+===================================================================
+--- uswsusp-1.0.orig/s2ram-main.c	2011-07-14 22:03:47.125925007 +0200
++++ uswsusp-1.0/s2ram-main.c	2011-07-14 22:20:25.402424220 +0200
+@@ -17,7 +17,6 @@
+ #ifndef S2RAM
+ #define S2RAM
+ #endif
+-#include "vt.h"
+ #include "whitelist.h"
+ #include "s2ram.h"
+ #include "config_parser.h"
+@@ -26,7 +25,6 @@
+ int main(int argc, char *argv[])
+ {
+ 	int i, ret = 0;
+-	int active_console = -1;
+ 	struct option options[] = {
+ 	    	{ 
+ 		    "help\0\tthis text.",	
+@@ -89,15 +87,6 @@
+ 	if (ret)
+ 		goto out;
+ 
+-	/* switch to console 1 first, since we might be in X */
+-	active_console = fgconsole();
+-	printf("switching from vt%d to vt1... ", active_console);
+-	if (chvt(1))
+-		printf("succeeded\n");
+-	else
+-		printf("failed\n");
+-
+-
+ 	ret = s2ram_hacks();
+ 	if (ret)
+ 		goto out;
+@@ -105,14 +94,5 @@
+ 	s2ram_resume();
+ 
+  out:
+-	/* if we switched consoles before suspend, switch back */
+-	if (active_console > 0) {
+-		printf("switching back to vt%d... ", active_console);
+-		if (chvt(active_console))
+-			printf("succeeded\n");
+-		else
+-			printf("failed\n");
+-	}
+-
+ 	return ret;
+ }
diff -Nru uswsusp-1.0/debian/patches/03_s2ram_ppc_force.patch uswsusp-1.0+20110509/debian/patches/03_s2ram_ppc_force.patch
--- uswsusp-1.0/debian/patches/03_s2ram_ppc_force.patch	1970-01-01 01:00:00.000000000 +0100
+++ uswsusp-1.0+20110509/debian/patches/03_s2ram_ppc_force.patch	2011-09-25 16:12:51.000000000 +0200
@@ -0,0 +1,15 @@
+Description: Force option is supported in PPC platform for compatibility with x86 platform (for scripts, tools,...)
+Author: Rodolfo García Peñas (kix) <kix@kix.es>
+Last-Update: 2011-10-25
+Index: uswsusp-1.0/s2ram-ppc.h
+===================================================================
+--- uswsusp-1.0.orig/s2ram-ppc.h	2011-07-14 22:03:47.025924981 +0200
++++ uswsusp-1.0/s2ram-ppc.h	2011-07-14 22:21:39.749926679 +0200
+@@ -1,2 +1,6 @@
+ /* No additional options for PPC */
+-#define HACKS_LONG_OPTS
++#define HACKS_LONG_OPTS \
++	{\
++		"force\0\tDon't do anything, only for compatibility with x86 platform.",\
++		no_argument,		   NULL, 1 \
++	},
diff -Nru uswsusp-1.0/debian/patches/04_debian_paths.patch uswsusp-1.0+20110509/debian/patches/04_debian_paths.patch
--- uswsusp-1.0/debian/patches/04_debian_paths.patch	1970-01-01 01:00:00.000000000 +0100
+++ uswsusp-1.0+20110509/debian/patches/04_debian_paths.patch	2011-09-25 16:13:29.000000000 +0200
@@ -0,0 +1,2380 @@
+Description: Change the Debian Paths in some files
+Author: Rodolfo García Peñas (kix) <kix@kix.es>
+Last-Update: 2011-10-25
+Index: uswsusp-1.0/configure
+===================================================================
+--- uswsusp-1.0.orig/configure	2011-07-14 23:23:50.553928579 +0200
++++ uswsusp-1.0/configure	2011-07-14 23:35:21.013923075 +0200
+@@ -1,11 +1,11 @@
+ #! /bin/sh
+ # Guess values for system-dependent variables and create Makefiles.
+-# Generated by GNU Autoconf 2.65 for suspend-utils 1.0.
++# Generated by GNU Autoconf 2.68 for suspend-utils 1.0.
+ #
+ #
+ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
++# Foundation, Inc.
+ #
+ #
+ # This configure script is free software; the Free Software Foundation
+@@ -89,6 +89,7 @@
+ IFS=" ""	$as_nl"
+ 
+ # Find who we are.  Look in the path if we contain no directory separator.
++as_myself=
+ case $0 in #((
+   *[\\/]* ) as_myself=$0 ;;
+   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+@@ -214,11 +215,18 @@
+   # We cannot yet assume a decent shell, so we have to provide a
+ 	# neutralization value for shells without unset; and this also
+ 	# works around shells that cannot unset nonexistent variables.
++	# Preserve -v and -x to the replacement shell.
+ 	BASH_ENV=/dev/null
+ 	ENV=/dev/null
+ 	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+ 	export CONFIG_SHELL
+-	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
++	case $- in # ((((
++	  *v*x* | *x*v* ) as_opts=-vx ;;
++	  *v* ) as_opts=-v ;;
++	  *x* ) as_opts=-x ;;
++	  * ) as_opts= ;;
++	esac
++	exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
+ fi
+ 
+     if test x$as_have_required = xno; then :
+@@ -316,7 +324,7 @@
+       test -d "$as_dir" && break
+     done
+     test -z "$as_dirs" || eval "mkdir $as_dirs"
+-  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
++  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+ 
+ 
+ } # as_fn_mkdir_p
+@@ -356,19 +364,19 @@
+ fi # as_fn_arith
+ 
+ 
+-# as_fn_error ERROR [LINENO LOG_FD]
+-# ---------------------------------
++# as_fn_error STATUS ERROR [LINENO LOG_FD]
++# ----------------------------------------
+ # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+ # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+-# script with status $?, using 1 if that was 0.
++# script with STATUS, using 1 if that was 0.
+ as_fn_error ()
+ {
+-  as_status=$?; test $as_status -eq 0 && as_status=1
+-  if test "$3"; then
+-    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
++  as_status=$1; test $as_status -eq 0 && as_status=1
++  if test "$4"; then
++    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
++    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+   fi
+-  $as_echo "$as_me: error: $1" >&2
++  $as_echo "$as_me: error: $2" >&2
+   as_fn_exit $as_status
+ } # as_fn_error
+ 
+@@ -679,7 +687,7 @@
+ exec 6>&1
+ 
+ # Name of the host.
+-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
++# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
+ # so uname gets run too.
+ ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
+ 
+@@ -1000,8 +1008,9 @@
+   fi
+ 
+   case $ac_option in
+-  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+-  *)	ac_optarg=yes ;;
++  *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
++  *=)   ac_optarg= ;;
++  *)    ac_optarg=yes ;;
+   esac
+ 
+   # Accept the important Cygnus configure options, so we can diagnose typos.
+@@ -1046,7 +1055,7 @@
+     ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+     # Reject names that are not valid shell variable names.
+     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+-      as_fn_error "invalid feature name: $ac_useropt"
++      as_fn_error $? "invalid feature name: $ac_useropt"
+     ac_useropt_orig=$ac_useropt
+     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+     case $ac_user_opts in
+@@ -1072,7 +1081,7 @@
+     ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+     # Reject names that are not valid shell variable names.
+     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+-      as_fn_error "invalid feature name: $ac_useropt"
++      as_fn_error $? "invalid feature name: $ac_useropt"
+     ac_useropt_orig=$ac_useropt
+     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+     case $ac_user_opts in
+@@ -1276,7 +1285,7 @@
+     ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+     # Reject names that are not valid shell variable names.
+     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+-      as_fn_error "invalid package name: $ac_useropt"
++      as_fn_error $? "invalid package name: $ac_useropt"
+     ac_useropt_orig=$ac_useropt
+     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+     case $ac_user_opts in
+@@ -1292,7 +1301,7 @@
+     ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+     # Reject names that are not valid shell variable names.
+     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+-      as_fn_error "invalid package name: $ac_useropt"
++      as_fn_error $? "invalid package name: $ac_useropt"
+     ac_useropt_orig=$ac_useropt
+     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+     case $ac_user_opts in
+@@ -1322,8 +1331,8 @@
+   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
+     x_libraries=$ac_optarg ;;
+ 
+-  -*) as_fn_error "unrecognized option: \`$ac_option'
+-Try \`$0 --help' for more information."
++  -*) as_fn_error $? "unrecognized option: \`$ac_option'
++Try \`$0 --help' for more information"
+     ;;
+ 
+   *=*)
+@@ -1331,7 +1340,7 @@
+     # Reject names that are not valid shell variable names.
+     case $ac_envvar in #(
+       '' | [0-9]* | *[!_$as_cr_alnum]* )
+-      as_fn_error "invalid variable name: \`$ac_envvar'" ;;
++      as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
+     esac
+     eval $ac_envvar=\$ac_optarg
+     export $ac_envvar ;;
+@@ -1341,7 +1350,7 @@
+     $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+       $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+-    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
++    : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
+     ;;
+ 
+   esac
+@@ -1349,13 +1358,13 @@
+ 
+ if test -n "$ac_prev"; then
+   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
+-  as_fn_error "missing argument to $ac_option"
++  as_fn_error $? "missing argument to $ac_option"
+ fi
+ 
+ if test -n "$ac_unrecognized_opts"; then
+   case $enable_option_checking in
+     no) ;;
+-    fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
++    fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
+     *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+   esac
+ fi
+@@ -1378,7 +1387,7 @@
+     [\\/$]* | ?:[\\/]* )  continue;;
+     NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
+   esac
+-  as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
++  as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
+ done
+ 
+ # There might be people who depend on the old broken behavior: `$host'
+@@ -1392,8 +1401,8 @@
+ if test "x$host_alias" != x; then
+   if test "x$build_alias" = x; then
+     cross_compiling=maybe
+-    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+-    If a cross compiler is detected then cross compile mode will be used." >&2
++    $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
++    If a cross compiler is detected then cross compile mode will be used" >&2
+   elif test "x$build_alias" != "x$host_alias"; then
+     cross_compiling=yes
+   fi
+@@ -1408,9 +1417,9 @@
+ ac_pwd=`pwd` && test -n "$ac_pwd" &&
+ ac_ls_di=`ls -di .` &&
+ ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
+-  as_fn_error "working directory cannot be determined"
++  as_fn_error $? "working directory cannot be determined"
+ test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
+-  as_fn_error "pwd does not report name of working directory"
++  as_fn_error $? "pwd does not report name of working directory"
+ 
+ 
+ # Find the source files, if location was not specified.
+@@ -1449,11 +1458,11 @@
+ fi
+ if test ! -r "$srcdir/$ac_unique_file"; then
+   test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
+-  as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
++  as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
+ fi
+ ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
+ ac_abs_confdir=`(
+-	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
++	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
+ 	pwd)`
+ # When building in place, set srcdir=.
+ if test "$ac_abs_confdir" = "$ac_pwd"; then
+@@ -1493,7 +1502,7 @@
+       --help=short        display options specific to this package
+       --help=recursive    display the short help of all the included packages
+   -V, --version           display version information and exit
+-  -q, --quiet, --silent   do not print \`checking...' messages
++  -q, --quiet, --silent   do not print \`checking ...' messages
+       --cache-file=FILE   cache test results in FILE [disabled]
+   -C, --config-cache      alias for \`--cache-file=config.cache'
+   -n, --no-create         do not create output files
+@@ -1694,9 +1703,9 @@
+ if $ac_init_version; then
+   cat <<\_ACEOF
+ suspend-utils configure 1.0
+-generated by GNU Autoconf 2.65
++generated by GNU Autoconf 2.68
+ 
+-Copyright (C) 2009 Free Software Foundation, Inc.
++Copyright (C) 2010 Free Software Foundation, Inc.
+ This configure script is free software; the Free Software Foundation
+ gives unlimited permission to copy, distribute and modify it.
+ _ACEOF
+@@ -1740,7 +1749,7 @@
+ 
+ 	ac_retval=1
+ fi
+-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+   as_fn_set_status $ac_retval
+ 
+ } # ac_fn_c_try_compile
+@@ -1786,7 +1795,7 @@
+   # interfere with the next link command; also delete a directory that is
+   # left behind by Apple's compiler.  We do this before executing the actions.
+   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+   as_fn_set_status $ac_retval
+ 
+ } # ac_fn_c_try_link
+@@ -1800,7 +1809,7 @@
+   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+ $as_echo_n "checking for $2... " >&6; }
+-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
++if eval \${$3+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -1818,7 +1827,7 @@
+ eval ac_res=\$$3
+ 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+ $as_echo "$ac_res" >&6; }
+-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ 
+ } # ac_fn_c_check_header_compile
+ 
+@@ -1843,7 +1852,7 @@
+     mv -f conftest.er1 conftest.err
+   fi
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+-  test $ac_status = 0; } >/dev/null && {
++  test $ac_status = 0; } > conftest.i && {
+ 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        }; then :
+@@ -1854,7 +1863,7 @@
+ 
+     ac_retval=1
+ fi
+-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+   as_fn_set_status $ac_retval
+ 
+ } # ac_fn_c_try_cpp
+@@ -1896,7 +1905,7 @@
+        ac_retval=$ac_status
+ fi
+   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+   as_fn_set_status $ac_retval
+ 
+ } # ac_fn_c_try_run
+@@ -1909,7 +1918,7 @@
+   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+ $as_echo_n "checking for $2... " >&6; }
+-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
++if eval \${$3+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -1964,7 +1973,7 @@
+ eval ac_res=\$$3
+ 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+ $as_echo "$ac_res" >&6; }
+-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ 
+ } # ac_fn_c_check_func
+ 
+@@ -1976,10 +1985,10 @@
+ ac_fn_c_check_header_mongrel ()
+ {
+   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+-  if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
++  if eval \${$3+:} false; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+ $as_echo_n "checking for $2... " >&6; }
+-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
++if eval \${$3+:} false; then :
+   $as_echo_n "(cached) " >&6
+ fi
+ eval ac_res=\$$3
+@@ -2015,7 +2024,7 @@
+ else
+   ac_header_preproc=no
+ fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
+ $as_echo "$ac_header_preproc" >&6; }
+ 
+@@ -2042,7 +2051,7 @@
+ esac
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+ $as_echo_n "checking for $2... " >&6; }
+-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
++if eval \${$3+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   eval "$3=\$ac_header_compiler"
+@@ -2051,7 +2060,7 @@
+ 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+ $as_echo "$ac_res" >&6; }
+ fi
+-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ 
+ } # ac_fn_c_check_header_mongrel
+ cat >config.log <<_ACEOF
+@@ -2059,7 +2068,7 @@
+ running configure, to aid debugging if configure makes a mistake.
+ 
+ It was created by suspend-utils $as_me 1.0, which was
+-generated by GNU Autoconf 2.65.  Invocation command line was
++generated by GNU Autoconf 2.68.  Invocation command line was
+ 
+   $ $0 $@
+ 
+@@ -2169,11 +2178,9 @@
+   {
+     echo
+ 
+-    cat <<\_ASBOX
+-## ---------------- ##
++    $as_echo "## ---------------- ##
+ ## Cache variables. ##
+-## ---------------- ##
+-_ASBOX
++## ---------------- ##"
+     echo
+     # The following way of writing the cache mishandles newlines in values,
+ (
+@@ -2207,11 +2214,9 @@
+ )
+     echo
+ 
+-    cat <<\_ASBOX
+-## ----------------- ##
++    $as_echo "## ----------------- ##
+ ## Output variables. ##
+-## ----------------- ##
+-_ASBOX
++## ----------------- ##"
+     echo
+     for ac_var in $ac_subst_vars
+     do
+@@ -2224,11 +2229,9 @@
+     echo
+ 
+     if test -n "$ac_subst_files"; then
+-      cat <<\_ASBOX
+-## ------------------- ##
++      $as_echo "## ------------------- ##
+ ## File substitutions. ##
+-## ------------------- ##
+-_ASBOX
++## ------------------- ##"
+       echo
+       for ac_var in $ac_subst_files
+       do
+@@ -2242,11 +2245,9 @@
+     fi
+ 
+     if test -s confdefs.h; then
+-      cat <<\_ASBOX
+-## ----------- ##
++      $as_echo "## ----------- ##
+ ## confdefs.h. ##
+-## ----------- ##
+-_ASBOX
++## ----------- ##"
+       echo
+       cat confdefs.h
+       echo
+@@ -2301,7 +2302,12 @@
+ ac_site_file1=NONE
+ ac_site_file2=NONE
+ if test -n "$CONFIG_SITE"; then
+-  ac_site_file1=$CONFIG_SITE
++  # We do not want a PATH search for config.site.
++  case $CONFIG_SITE in #((
++    -*)  ac_site_file1=./$CONFIG_SITE;;
++    */*) ac_site_file1=$CONFIG_SITE;;
++    *)   ac_site_file1=./$CONFIG_SITE;;
++  esac
+ elif test "x$prefix" != xNONE; then
+   ac_site_file1=$prefix/share/config.site
+   ac_site_file2=$prefix/etc/config.site
+@@ -2316,7 +2322,11 @@
+     { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
+ $as_echo "$as_me: loading site script $ac_site_file" >&6;}
+     sed 's/^/| /' "$ac_site_file" >&5
+-    . "$ac_site_file"
++    . "$ac_site_file" \
++      || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++as_fn_error $? "failed to load site script $ac_site_file
++See \`config.log' for more details" "$LINENO" 5; }
+   fi
+ done
+ 
+@@ -2392,7 +2402,7 @@
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+   { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
+ $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+-  as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
++  as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
+ fi
+ ## -------------------- ##
+ ## Main body of script. ##
+@@ -2409,16 +2419,22 @@
+ 
+ ac_aux_dir=
+ for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
+-  for ac_t in install-sh install.sh shtool; do
+-    if test -f "$ac_dir/$ac_t"; then
+-      ac_aux_dir=$ac_dir
+-      ac_install_sh="$ac_aux_dir/$ac_t -c"
+-      break 2
+-    fi
+-  done
++  if test -f "$ac_dir/install-sh"; then
++    ac_aux_dir=$ac_dir
++    ac_install_sh="$ac_aux_dir/install-sh -c"
++    break
++  elif test -f "$ac_dir/install.sh"; then
++    ac_aux_dir=$ac_dir
++    ac_install_sh="$ac_aux_dir/install.sh -c"
++    break
++  elif test -f "$ac_dir/shtool"; then
++    ac_aux_dir=$ac_dir
++    ac_install_sh="$ac_aux_dir/shtool install -c"
++    break
++  fi
+ done
+ if test -z "$ac_aux_dir"; then
+-  as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
++  as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
+ fi
+ 
+ # These three variables are undocumented and unsupported,
+@@ -2447,7 +2463,7 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
+ $as_echo_n "checking for a BSD-compatible install... " >&6; }
+ if test -z "$INSTALL"; then
+-if test "${ac_cv_path_install+set}" = set; then :
++if ${ac_cv_path_install+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+@@ -2534,11 +2550,11 @@
+ '
+ case `pwd` in
+   *[\\\"\#\$\&\'\`$am_lf]*)
+-    as_fn_error "unsafe absolute working directory name" "$LINENO" 5;;
++    as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
+ esac
+ case $srcdir in
+   *[\\\"\#\$\&\'\`$am_lf\ \	]*)
+-    as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
++    as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
+ esac
+ 
+ # Do `set' in a subshell so we don't clobber the current shell's
+@@ -2560,7 +2576,7 @@
+       # if, for instance, CONFIG_SHELL is bash and it inherits a
+       # broken ls alias from the environment.  This has actually
+       # happened.  Such a system could not be considered "sane".
+-      as_fn_error "ls -t appears to fail.  Make sure there is not a broken
++      as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
+ alias in your environment" "$LINENO" 5
+    fi
+ 
+@@ -2570,7 +2586,7 @@
+    # Ok.
+    :
+ else
+-   as_fn_error "newly created file is older than distributed files!
++   as_fn_error $? "newly created file is older than distributed files!
+ Check your system clock" "$LINENO" 5
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+@@ -2624,7 +2640,7 @@
+ set dummy ${ac_tool_prefix}strip; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_STRIP+set}" = set; then :
++if ${ac_cv_prog_STRIP+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$STRIP"; then
+@@ -2664,7 +2680,7 @@
+ set dummy strip; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
++if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$ac_ct_STRIP"; then
+@@ -2717,7 +2733,7 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
+ $as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
+ if test -z "$MKDIR_P"; then
+-  if test "${ac_cv_path_mkdir+set}" = set; then :
++  if ${ac_cv_path_mkdir+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+@@ -2768,7 +2784,7 @@
+ set dummy $ac_prog; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_AWK+set}" = set; then :
++if ${ac_cv_prog_AWK+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$AWK"; then
+@@ -2808,7 +2824,7 @@
+ $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
+ set x ${MAKE-make}
+ ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
++if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat >conftest.make <<\_ACEOF
+@@ -2816,7 +2832,7 @@
+ all:
+ 	@echo '@@@%%%=$(MAKE)=@@@%%%'
+ _ACEOF
+-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
++# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
+ case `${MAKE-make} -f conftest.make 2>/dev/null` in
+   *@@@%%%=?*=@@@%%%*)
+     eval ac_cv_prog_make_${ac_make}_set=yes;;
+@@ -2850,7 +2866,7 @@
+   am__isrc=' -I$(srcdir)'
+   # test to see if srcdir already configured
+   if test -f $srcdir/config.status; then
+-    as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
++    as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
+   fi
+ fi
+ 
+@@ -2912,27 +2928,27 @@
+ 
+ # Make sure we can run config.sub.
+ $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
+-  as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
++  as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
+ $as_echo_n "checking build system type... " >&6; }
+-if test "${ac_cv_build+set}" = set; then :
++if ${ac_cv_build+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_build_alias=$build_alias
+ test "x$ac_build_alias" = x &&
+   ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
+ test "x$ac_build_alias" = x &&
+-  as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
++  as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
+ ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
+-  as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
++  as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
+ 
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
+ $as_echo "$ac_cv_build" >&6; }
+ case $ac_cv_build in
+ *-*-*) ;;
+-*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
++*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
+ esac
+ build=$ac_cv_build
+ ac_save_IFS=$IFS; IFS='-'
+@@ -2950,14 +2966,14 @@
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
+ $as_echo_n "checking host system type... " >&6; }
+-if test "${ac_cv_host+set}" = set; then :
++if ${ac_cv_host+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test "x$host_alias" = x; then
+   ac_cv_host=$ac_cv_build
+ else
+   ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
+-    as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
++    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
+ fi
+ 
+ fi
+@@ -2965,7 +2981,7 @@
+ $as_echo "$ac_cv_host" >&6; }
+ case $ac_cv_host in
+ *-*-*) ;;
+-*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
++*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
+ esac
+ host=$ac_cv_host
+ ac_save_IFS=$IFS; IFS='-'
+@@ -3134,7 +3150,7 @@
+ set dummy ${ac_tool_prefix}gcc; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_CC+set}" = set; then :
++if ${ac_cv_prog_CC+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$CC"; then
+@@ -3174,7 +3190,7 @@
+ set dummy gcc; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
++if ${ac_cv_prog_ac_ct_CC+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$ac_ct_CC"; then
+@@ -3227,7 +3243,7 @@
+ set dummy ${ac_tool_prefix}cc; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_CC+set}" = set; then :
++if ${ac_cv_prog_CC+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$CC"; then
+@@ -3267,7 +3283,7 @@
+ set dummy cc; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_CC+set}" = set; then :
++if ${ac_cv_prog_CC+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$CC"; then
+@@ -3326,7 +3342,7 @@
+ set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_CC+set}" = set; then :
++if ${ac_cv_prog_CC+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$CC"; then
+@@ -3370,7 +3386,7 @@
+ set dummy $ac_prog; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
++if ${ac_cv_prog_ac_ct_CC+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$ac_ct_CC"; then
+@@ -3424,8 +3440,8 @@
+ 
+ test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error "no acceptable C compiler found in \$PATH
+-See \`config.log' for more details." "$LINENO" 5; }
++as_fn_error $? "no acceptable C compiler found in \$PATH
++See \`config.log' for more details" "$LINENO" 5; }
+ 
+ # Provide some information about the compiler.
+ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+@@ -3539,9 +3555,8 @@
+ 
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ as_fn_set_status 77
+-as_fn_error "C compiler cannot create executables
+-See \`config.log' for more details." "$LINENO" 5; }; }
++as_fn_error 77 "C compiler cannot create executables
++See \`config.log' for more details" "$LINENO" 5; }
+ else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+@@ -3583,8 +3598,8 @@
+ else
+   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error "cannot compute suffix of executables: cannot compile and link
+-See \`config.log' for more details." "$LINENO" 5; }
++as_fn_error $? "cannot compute suffix of executables: cannot compile and link
++See \`config.log' for more details" "$LINENO" 5; }
+ fi
+ rm -f conftest conftest$ac_cv_exeext
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
+@@ -3641,9 +3656,9 @@
+     else
+ 	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error "cannot run C compiled programs.
++as_fn_error $? "cannot run C compiled programs.
+ If you meant to cross compile, use \`--host'.
+-See \`config.log' for more details." "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5; }
+     fi
+   fi
+ fi
+@@ -3654,7 +3669,7 @@
+ ac_clean_files=$ac_clean_files_save
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
+ $as_echo_n "checking for suffix of object files... " >&6; }
+-if test "${ac_cv_objext+set}" = set; then :
++if ${ac_cv_objext+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -3694,8 +3709,8 @@
+ 
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error "cannot compute suffix of object files: cannot compile
+-See \`config.log' for more details." "$LINENO" 5; }
++as_fn_error $? "cannot compute suffix of object files: cannot compile
++See \`config.log' for more details" "$LINENO" 5; }
+ fi
+ rm -f conftest.$ac_cv_objext conftest.$ac_ext
+ fi
+@@ -3705,7 +3720,7 @@
+ ac_objext=$OBJEXT
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
+ $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
+-if test "${ac_cv_c_compiler_gnu+set}" = set; then :
++if ${ac_cv_c_compiler_gnu+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -3742,7 +3757,7 @@
+ ac_save_CFLAGS=$CFLAGS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+ $as_echo_n "checking whether $CC accepts -g... " >&6; }
+-if test "${ac_cv_prog_cc_g+set}" = set; then :
++if ${ac_cv_prog_cc_g+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_save_c_werror_flag=$ac_c_werror_flag
+@@ -3820,7 +3835,7 @@
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
+ $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
+-if test "${ac_cv_prog_cc_c89+set}" = set; then :
++if ${ac_cv_prog_cc_c89+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_cv_prog_cc_c89=no
+@@ -3981,7 +3996,7 @@
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
+ $as_echo_n "checking dependency style of $depcc... " >&6; }
+-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
++if ${am_cv_CC_dependencies_compiler_type+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+@@ -4132,7 +4147,7 @@
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
+ $as_echo_n "checking for a sed that does not truncate output... " >&6; }
+-if test "${ac_cv_path_SED+set}" = set; then :
++if ${ac_cv_path_SED+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+             ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
+@@ -4187,7 +4202,7 @@
+   done
+ IFS=$as_save_IFS
+   if test -z "$ac_cv_path_SED"; then
+-    as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5
++    as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
+   fi
+ else
+   ac_cv_path_SED=$SED
+@@ -4214,7 +4229,7 @@
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
+ $as_echo_n "checking for grep that handles long lines and -e... " >&6; }
+-if test "${ac_cv_path_GREP+set}" = set; then :
++if ${ac_cv_path_GREP+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -z "$GREP"; then
+@@ -4263,7 +4278,7 @@
+   done
+ IFS=$as_save_IFS
+   if test -z "$ac_cv_path_GREP"; then
+-    as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
++    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+   fi
+ else
+   ac_cv_path_GREP=$GREP
+@@ -4277,7 +4292,7 @@
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
+ $as_echo_n "checking for egrep... " >&6; }
+-if test "${ac_cv_path_EGREP+set}" = set; then :
++if ${ac_cv_path_EGREP+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
+@@ -4329,7 +4344,7 @@
+   done
+ IFS=$as_save_IFS
+   if test -z "$ac_cv_path_EGREP"; then
+-    as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
++    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+   fi
+ else
+   ac_cv_path_EGREP=$EGREP
+@@ -4344,7 +4359,7 @@
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
+ $as_echo_n "checking for fgrep... " >&6; }
+-if test "${ac_cv_path_FGREP+set}" = set; then :
++if ${ac_cv_path_FGREP+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
+@@ -4396,7 +4411,7 @@
+   done
+ IFS=$as_save_IFS
+   if test -z "$ac_cv_path_FGREP"; then
+-    as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
++    as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+   fi
+ else
+   ac_cv_path_FGREP=$FGREP
+@@ -4475,7 +4490,7 @@
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
+ $as_echo_n "checking for non-GNU ld... " >&6; }
+ fi
+-if test "${lt_cv_path_LD+set}" = set; then :
++if ${lt_cv_path_LD+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -z "$LD"; then
+@@ -4512,10 +4527,10 @@
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+-test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
++test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
+ $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
+-if test "${lt_cv_prog_gnu_ld+set}" = set; then :
++if ${lt_cv_prog_gnu_ld+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   # I'd rather use --version here, but apparently some GNU lds only accept -v.
+@@ -4542,7 +4557,7 @@
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
+ $as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
+-if test "${lt_cv_path_NM+set}" = set; then :
++if ${lt_cv_path_NM+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$NM"; then
+@@ -4602,7 +4617,7 @@
+ set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_DUMPBIN+set}" = set; then :
++if ${ac_cv_prog_DUMPBIN+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$DUMPBIN"; then
+@@ -4646,7 +4661,7 @@
+ set dummy $ac_prog; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then :
++if ${ac_cv_prog_ac_ct_DUMPBIN+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$ac_ct_DUMPBIN"; then
+@@ -4709,18 +4724,18 @@
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
+ $as_echo_n "checking the name lister ($NM) interface... " >&6; }
+-if test "${lt_cv_nm_interface+set}" = set; then :
++if ${lt_cv_nm_interface+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   lt_cv_nm_interface="BSD nm"
+   echo "int some_variable = 0;" > conftest.$ac_ext
+-  (eval echo "\"\$as_me:4717: $ac_compile\"" >&5)
++  (eval echo "\"\$as_me:4732: $ac_compile\"" >&5)
+   (eval "$ac_compile" 2>conftest.err)
+   cat conftest.err >&5
+-  (eval echo "\"\$as_me:4720: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
++  (eval echo "\"\$as_me:4735: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
+   cat conftest.err >&5
+-  (eval echo "\"\$as_me:4723: output\"" >&5)
++  (eval echo "\"\$as_me:4738: output\"" >&5)
+   cat conftest.out >&5
+   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
+     lt_cv_nm_interface="MS dumpbin"
+@@ -4744,7 +4759,7 @@
+ # find the maximum length of command line arguments
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
+ $as_echo_n "checking the maximum length of command line arguments... " >&6; }
+-if test "${lt_cv_sys_max_cmd_len+set}" = set; then :
++if ${lt_cv_sys_max_cmd_len+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+     i=0
+@@ -4936,7 +4951,7 @@
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
+ $as_echo_n "checking for $LD option to reload object files... " >&6; }
+-if test "${lt_cv_ld_reload_flag+set}" = set; then :
++if ${lt_cv_ld_reload_flag+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   lt_cv_ld_reload_flag='-r'
+@@ -4972,7 +4987,7 @@
+ set dummy ${ac_tool_prefix}objdump; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_OBJDUMP+set}" = set; then :
++if ${ac_cv_prog_OBJDUMP+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$OBJDUMP"; then
+@@ -5012,7 +5027,7 @@
+ set dummy objdump; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then :
++if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$ac_ct_OBJDUMP"; then
+@@ -5071,7 +5086,7 @@
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
+ $as_echo_n "checking how to recognize dependent libraries... " >&6; }
+-if test "${lt_cv_deplibs_check_method+set}" = set; then :
++if ${lt_cv_deplibs_check_method+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   lt_cv_file_magic_cmd='$MAGIC_CMD'
+@@ -5287,7 +5302,7 @@
+ set dummy ${ac_tool_prefix}ar; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_AR+set}" = set; then :
++if ${ac_cv_prog_AR+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$AR"; then
+@@ -5327,7 +5342,7 @@
+ set dummy ar; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
++if ${ac_cv_prog_ac_ct_AR+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$ac_ct_AR"; then
+@@ -5392,7 +5407,7 @@
+ set dummy ${ac_tool_prefix}strip; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_STRIP+set}" = set; then :
++if ${ac_cv_prog_STRIP+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$STRIP"; then
+@@ -5432,7 +5447,7 @@
+ set dummy strip; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
++if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$ac_ct_STRIP"; then
+@@ -5491,7 +5506,7 @@
+ set dummy ${ac_tool_prefix}ranlib; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_RANLIB+set}" = set; then :
++if ${ac_cv_prog_RANLIB+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$RANLIB"; then
+@@ -5531,7 +5546,7 @@
+ set dummy ranlib; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
++if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$ac_ct_RANLIB"; then
+@@ -5648,7 +5663,7 @@
+ # Check for command to grab the raw symbol name followed by C symbol from nm.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
+ $as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
+-if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then :
++if ${lt_cv_sys_global_symbol_pipe+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -5926,7 +5941,7 @@
+   ;;
+ *-*-irix6*)
+   # Find out which ABI we are using.
+-  echo '#line 5929 "configure"' > conftest.$ac_ext
++  echo '#line 5944 "configure"' > conftest.$ac_ext
+   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+@@ -6020,7 +6035,7 @@
+   CFLAGS="$CFLAGS -belf"
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
+ $as_echo_n "checking whether the C compiler needs -belf... " >&6; }
+-if test "${lt_cv_cc_needs_belf+set}" = set; then :
++if ${lt_cv_cc_needs_belf+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_ext=c
+@@ -6096,7 +6111,7 @@
+ set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_DSYMUTIL+set}" = set; then :
++if ${ac_cv_prog_DSYMUTIL+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$DSYMUTIL"; then
+@@ -6136,7 +6151,7 @@
+ set dummy dsymutil; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then :
++if ${ac_cv_prog_ac_ct_DSYMUTIL+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$ac_ct_DSYMUTIL"; then
+@@ -6188,7 +6203,7 @@
+ set dummy ${ac_tool_prefix}nmedit; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_NMEDIT+set}" = set; then :
++if ${ac_cv_prog_NMEDIT+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$NMEDIT"; then
+@@ -6228,7 +6243,7 @@
+ set dummy nmedit; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then :
++if ${ac_cv_prog_ac_ct_NMEDIT+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$ac_ct_NMEDIT"; then
+@@ -6280,7 +6295,7 @@
+ set dummy ${ac_tool_prefix}lipo; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_LIPO+set}" = set; then :
++if ${ac_cv_prog_LIPO+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$LIPO"; then
+@@ -6320,7 +6335,7 @@
+ set dummy lipo; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then :
++if ${ac_cv_prog_ac_ct_LIPO+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$ac_ct_LIPO"; then
+@@ -6372,7 +6387,7 @@
+ set dummy ${ac_tool_prefix}otool; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_OTOOL+set}" = set; then :
++if ${ac_cv_prog_OTOOL+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$OTOOL"; then
+@@ -6412,7 +6427,7 @@
+ set dummy otool; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then :
++if ${ac_cv_prog_ac_ct_OTOOL+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$ac_ct_OTOOL"; then
+@@ -6464,7 +6479,7 @@
+ set dummy ${ac_tool_prefix}otool64; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_OTOOL64+set}" = set; then :
++if ${ac_cv_prog_OTOOL64+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$OTOOL64"; then
+@@ -6504,7 +6519,7 @@
+ set dummy otool64; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then :
++if ${ac_cv_prog_ac_ct_OTOOL64+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$ac_ct_OTOOL64"; then
+@@ -6579,7 +6594,7 @@
+ 
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
+ $as_echo_n "checking for -single_module linker flag... " >&6; }
+-if test "${lt_cv_apple_cc_single_mod+set}" = set; then :
++if ${lt_cv_apple_cc_single_mod+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   lt_cv_apple_cc_single_mod=no
+@@ -6608,7 +6623,7 @@
+ $as_echo "$lt_cv_apple_cc_single_mod" >&6; }
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
+ $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
+-if test "${lt_cv_ld_exported_symbols_list+set}" = set; then :
++if ${lt_cv_ld_exported_symbols_list+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   lt_cv_ld_exported_symbols_list=no
+@@ -6685,7 +6700,7 @@
+   CPP=
+ fi
+ if test -z "$CPP"; then
+-  if test "${ac_cv_prog_CPP+set}" = set; then :
++  if ${ac_cv_prog_CPP+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+       # Double quotes because CPP needs to be expanded
+@@ -6715,7 +6730,7 @@
+   # Broken: fails on valid input.
+ continue
+ fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
+ 
+   # OK, works on sane cases.  Now check whether nonexistent headers
+   # can be detected and how.
+@@ -6731,11 +6746,11 @@
+ ac_preproc_ok=:
+ break
+ fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
+ 
+ done
+ # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.i conftest.err conftest.$ac_ext
+ if $ac_preproc_ok; then :
+   break
+ fi
+@@ -6774,7 +6789,7 @@
+   # Broken: fails on valid input.
+ continue
+ fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
+ 
+   # OK, works on sane cases.  Now check whether nonexistent headers
+   # can be detected and how.
+@@ -6790,18 +6805,18 @@
+ ac_preproc_ok=:
+ break
+ fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
+ 
+ done
+ # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.i conftest.err conftest.$ac_ext
+ if $ac_preproc_ok; then :
+ 
+ else
+   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error "C preprocessor \"$CPP\" fails sanity check
+-See \`config.log' for more details." "$LINENO" 5; }
++as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
++See \`config.log' for more details" "$LINENO" 5; }
+ fi
+ 
+ ac_ext=c
+@@ -6813,7 +6828,7 @@
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
+ $as_echo_n "checking for ANSI C header files... " >&6; }
+-if test "${ac_cv_header_stdc+set}" = set; then :
++if ${ac_cv_header_stdc+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -6930,8 +6945,7 @@
+   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
+ "
+-eval as_val=\$$as_ac_Header
+-   if test "x$as_val" = x""yes; then :
++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+   cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+@@ -6945,7 +6959,7 @@
+ do :
+   ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
+ "
+-if test "x$ac_cv_header_dlfcn_h" = x""yes; then :
++if test "x$ac_cv_header_dlfcn_h" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_DLFCN_H 1
+ _ACEOF
+@@ -7129,7 +7143,7 @@
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
+ $as_echo_n "checking for objdir... " >&6; }
+-if test "${lt_cv_objdir+set}" = set; then :
++if ${lt_cv_objdir+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   rm -f .libs 2>/dev/null
+@@ -7237,7 +7251,7 @@
+   if test "$file_magic_cmd" = '$MAGIC_CMD'; then
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
+ $as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
+-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
++if ${lt_cv_path_MAGIC_CMD+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case $MAGIC_CMD in
+@@ -7303,7 +7317,7 @@
+   if test -n "$ac_tool_prefix"; then
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5
+ $as_echo_n "checking for file... " >&6; }
+-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
++if ${lt_cv_path_MAGIC_CMD+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case $MAGIC_CMD in
+@@ -7436,7 +7450,7 @@
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+ $as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
+-if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then :
++if ${lt_cv_prog_compiler_rtti_exceptions+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   lt_cv_prog_compiler_rtti_exceptions=no
+@@ -7452,11 +7466,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:7455: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:7469: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:7459: \$? = $ac_status" >&5
++   echo "$as_me:7473: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings other than the usual output.
+@@ -7775,7 +7789,7 @@
+ if test -n "$lt_prog_compiler_pic"; then
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
+ $as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
+-if test "${lt_cv_prog_compiler_pic_works+set}" = set; then :
++if ${lt_cv_prog_compiler_pic_works+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   lt_cv_prog_compiler_pic_works=no
+@@ -7791,11 +7805,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:7794: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:7808: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:7798: \$? = $ac_status" >&5
++   echo "$as_me:7812: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings other than the usual output.
+@@ -7834,7 +7848,7 @@
+ wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+ $as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
+-if test "${lt_cv_prog_compiler_static_works+set}" = set; then :
++if ${lt_cv_prog_compiler_static_works+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   lt_cv_prog_compiler_static_works=no
+@@ -7877,7 +7891,7 @@
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+ $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+-if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
++if ${lt_cv_prog_compiler_c_o+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   lt_cv_prog_compiler_c_o=no
+@@ -7896,11 +7910,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:7899: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:7913: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:7903: \$? = $ac_status" >&5
++   echo "$as_me:7917: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s out/conftest2.$ac_objext
+    then
+      # The compiler can only warn and ignore the option if not recognized
+@@ -7932,7 +7946,7 @@
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+ $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+-if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
++if ${lt_cv_prog_compiler_c_o+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   lt_cv_prog_compiler_c_o=no
+@@ -7951,11 +7965,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:7954: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:7968: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:7958: \$? = $ac_status" >&5
++   echo "$as_me:7972: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s out/conftest2.$ac_objext
+    then
+      # The compiler can only warn and ignore the option if not recognized
+@@ -10060,7 +10074,7 @@
+   # if libdl is installed we need to link against it
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+ $as_echo_n "checking for dlopen in -ldl... " >&6; }
+-if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
++if ${ac_cv_lib_dl_dlopen+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -10094,7 +10108,7 @@
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+ $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
++if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
+   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+ else
+ 
+@@ -10108,12 +10122,12 @@
+ 
+   *)
+     ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
+-if test "x$ac_cv_func_shl_load" = x""yes; then :
++if test "x$ac_cv_func_shl_load" = xyes; then :
+   lt_cv_dlopen="shl_load"
+ else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
+ $as_echo_n "checking for shl_load in -ldld... " >&6; }
+-if test "${ac_cv_lib_dld_shl_load+set}" = set; then :
++if ${ac_cv_lib_dld_shl_load+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -10147,16 +10161,16 @@
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
+ $as_echo "$ac_cv_lib_dld_shl_load" >&6; }
+-if test "x$ac_cv_lib_dld_shl_load" = x""yes; then :
++if test "x$ac_cv_lib_dld_shl_load" = xyes; then :
+   lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
+ else
+   ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
+-if test "x$ac_cv_func_dlopen" = x""yes; then :
++if test "x$ac_cv_func_dlopen" = xyes; then :
+   lt_cv_dlopen="dlopen"
+ else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+ $as_echo_n "checking for dlopen in -ldl... " >&6; }
+-if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
++if ${ac_cv_lib_dl_dlopen+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -10190,12 +10204,12 @@
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+ $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
++if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
+   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+ else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
+ $as_echo_n "checking for dlopen in -lsvld... " >&6; }
+-if test "${ac_cv_lib_svld_dlopen+set}" = set; then :
++if ${ac_cv_lib_svld_dlopen+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -10229,12 +10243,12 @@
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
+ $as_echo "$ac_cv_lib_svld_dlopen" >&6; }
+-if test "x$ac_cv_lib_svld_dlopen" = x""yes; then :
++if test "x$ac_cv_lib_svld_dlopen" = xyes; then :
+   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
+ else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
+ $as_echo_n "checking for dld_link in -ldld... " >&6; }
+-if test "${ac_cv_lib_dld_dld_link+set}" = set; then :
++if ${ac_cv_lib_dld_dld_link+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -10268,7 +10282,7 @@
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
+ $as_echo "$ac_cv_lib_dld_dld_link" >&6; }
+-if test "x$ac_cv_lib_dld_dld_link" = x""yes; then :
++if test "x$ac_cv_lib_dld_dld_link" = xyes; then :
+   lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
+ fi
+ 
+@@ -10309,7 +10323,7 @@
+ 
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
+ $as_echo_n "checking whether a program can dlopen itself... " >&6; }
+-if test "${lt_cv_dlopen_self+set}" = set; then :
++if ${lt_cv_dlopen_self+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   	  if test "$cross_compiling" = yes; then :
+@@ -10318,7 +10332,7 @@
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<_LT_EOF
+-#line 10321 "configure"
++#line 10335 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -10405,7 +10419,7 @@
+       wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
+ $as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
+-if test "${lt_cv_dlopen_self_static+set}" = set; then :
++if ${lt_cv_dlopen_self_static+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   	  if test "$cross_compiling" = yes; then :
+@@ -10414,7 +10428,7 @@
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<_LT_EOF
+-#line 10417 "configure"
++#line 10431 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -10649,7 +10663,7 @@
+ set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
++if ${ac_cv_path_PKG_CONFIG+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case $PKG_CONFIG in
+@@ -10692,7 +10706,7 @@
+ set dummy pkg-config; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
++if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case $ac_pt_PKG_CONFIG in
+@@ -10763,7 +10777,7 @@
+ set dummy $ac_prog; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_M4+set}" = set; then :
++if ${ac_cv_prog_M4+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$M4"; then
+@@ -10803,7 +10817,7 @@
+ set dummy perl; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_PERL+set}" = set; then :
++if ${ac_cv_prog_PERL+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$PERL"; then
+@@ -10846,7 +10860,7 @@
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5
+ $as_echo_n "checking for special C compiler options needed for large files... " >&6; }
+-if test "${ac_cv_sys_largefile_CC+set}" = set; then :
++if ${ac_cv_sys_largefile_CC+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_cv_sys_largefile_CC=no
+@@ -10897,7 +10911,7 @@
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+ $as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; }
+-if test "${ac_cv_sys_file_offset_bits+set}" = set; then :
++if ${ac_cv_sys_file_offset_bits+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   while :; do
+@@ -10966,7 +10980,7 @@
+   if test $ac_cv_sys_file_offset_bits = unknown; then
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5
+ $as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; }
+-if test "${ac_cv_sys_large_files+set}" = set; then :
++if ${ac_cv_sys_large_files+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   while :; do
+@@ -11043,7 +11057,7 @@
+ set dummy $ac_prog; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_MKNOD+set}" = set; then :
++if ${ac_cv_prog_MKNOD+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$MKNOD"; then
+@@ -11079,7 +11093,7 @@
+   test -n "$MKNOD" && break
+ done
+ 
+-	test -z "${MKNOD}" && as_fn_error "mknod required for creating devices" "$LINENO" 5
++	test -z "${MKNOD}" && as_fn_error $? "mknod required for creating devices" "$LINENO" 5
+ fi
+ 
+ case "${host}" in
+@@ -11157,7 +11171,7 @@
+ 			if test -z "${LIBPCI_LIBS}"; then
+ 				{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pci_init in -lpci" >&5
+ $as_echo_n "checking for pci_init in -lpci... " >&6; }
+-if test "${ac_cv_lib_pci_pci_init+set}" = set; then :
++if ${ac_cv_lib_pci_pci_init+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -11191,7 +11205,7 @@
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pci_pci_init" >&5
+ $as_echo "$ac_cv_lib_pci_pci_init" >&6; }
+-if test "x$ac_cv_lib_pci_pci_init" = x""yes; then :
++if test "x$ac_cv_lib_pci_pci_init" = xyes; then :
+   LIBPCI_LIBS="-lpci"
+ else
+ 
+@@ -11199,7 +11213,7 @@
+ 					unset ac_cv_lib_pci_pci_init
+ 					{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pci_init in -lpci" >&5
+ $as_echo_n "checking for pci_init in -lpci... " >&6; }
+-if test "${ac_cv_lib_pci_pci_init+set}" = set; then :
++if ${ac_cv_lib_pci_pci_init+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -11234,10 +11248,10 @@
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pci_pci_init" >&5
+ $as_echo "$ac_cv_lib_pci_pci_init" >&6; }
+-if test "x$ac_cv_lib_pci_pci_init" = x""yes; then :
++if test "x$ac_cv_lib_pci_pci_init" = xyes; then :
+   LIBPCI_LIBS="-lpci -lz"
+ else
+-  as_fn_error "Required pciutils >= 2.2.4 not found" "$LINENO" 5
++  as_fn_error $? "Required pciutils >= 2.2.4 not found" "$LINENO" 5
+ fi
+ 
+ 
+@@ -11251,7 +11265,7 @@
+ 			if test -z "${LIBPCI_LIBS}"; then
+ 				{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pci_init in -lpci" >&5
+ $as_echo_n "checking for pci_init in -lpci... " >&6; }
+-if test "${ac_cv_lib_pci_pci_init+set}" = set; then :
++if ${ac_cv_lib_pci_pci_init+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -11285,7 +11299,7 @@
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pci_pci_init" >&5
+ $as_echo "$ac_cv_lib_pci_pci_init" >&6; }
+-if test "x$ac_cv_lib_pci_pci_init" = x""yes; then :
++if test "x$ac_cv_lib_pci_pci_init" = xyes; then :
+   LIBPCI_LIBS="-lpci"
+ else
+ 
+@@ -11293,7 +11307,7 @@
+ 					unset ac_cv_lib_pci_pci_init
+ 					{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pci_init in -lpci" >&5
+ $as_echo_n "checking for pci_init in -lpci... " >&6; }
+-if test "${ac_cv_lib_pci_pci_init+set}" = set; then :
++if ${ac_cv_lib_pci_pci_init+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -11328,10 +11342,10 @@
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pci_pci_init" >&5
+ $as_echo "$ac_cv_lib_pci_pci_init" >&6; }
+-if test "x$ac_cv_lib_pci_pci_init" = x""yes; then :
++if test "x$ac_cv_lib_pci_pci_init" = xyes; then :
+   LIBPCI_LIBS="-lpci -lz"
+ else
+-  as_fn_error "Required pciutils >= 2.2.4 not found" "$LINENO" 5
++  as_fn_error $? "Required pciutils >= 2.2.4 not found" "$LINENO" 5
+ fi
+ 
+ 
+@@ -11353,7 +11367,7 @@
+ 
+ 		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LRMI_common_init in -lx86" >&5
+ $as_echo_n "checking for LRMI_common_init in -lx86... " >&6; }
+-if test "${ac_cv_lib_x86_LRMI_common_init+set}" = set; then :
++if ${ac_cv_lib_x86_LRMI_common_init+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -11387,10 +11401,10 @@
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_x86_LRMI_common_init" >&5
+ $as_echo "$ac_cv_lib_x86_LRMI_common_init" >&6; }
+-if test "x$ac_cv_lib_x86_LRMI_common_init" = x""yes; then :
++if test "x$ac_cv_lib_x86_LRMI_common_init" = xyes; then :
+   LIBX86_LIBS="-lx86"
+ else
+-  as_fn_error "Required libx86 was not found" "$LINENO" 5
++  as_fn_error $? "Required libx86 was not found" "$LINENO" 5
+ 
+ fi
+ 
+@@ -11400,7 +11414,7 @@
+ $as_echo "#define CONFIG_ARCH_PPC 1" >>confdefs.h
+ 
+ else
+-	as_fn_error "Unsupported architecture ${host}" "$LINENO" 5
++	as_fn_error $? "Unsupported architecture ${host}" "$LINENO" 5
+ fi
+ 
+ if test "${enable_compress}" = "yes"; then
+@@ -11413,7 +11427,7 @@
+ 
+ 		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for lzo1x_1_compress in -llzo2" >&5
+ $as_echo_n "checking for lzo1x_1_compress in -llzo2... " >&6; }
+-if test "${ac_cv_lib_lzo2_lzo1x_1_compress+set}" = set; then :
++if ${ac_cv_lib_lzo2_lzo1x_1_compress+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -11447,12 +11461,12 @@
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lzo2_lzo1x_1_compress" >&5
+ $as_echo "$ac_cv_lib_lzo2_lzo1x_1_compress" >&6; }
+-if test "x$ac_cv_lib_lzo2_lzo1x_1_compress" = x""yes; then :
++if test "x$ac_cv_lib_lzo2_lzo1x_1_compress" = xyes; then :
+   LZO_LIBS="-llzo2"
+ else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lzo1x_1_compress in -llzo" >&5
+ $as_echo_n "checking for lzo1x_1_compress in -llzo... " >&6; }
+-if test "${ac_cv_lib_lzo_lzo1x_1_compress+set}" = set; then :
++if ${ac_cv_lib_lzo_lzo1x_1_compress+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -11486,10 +11500,10 @@
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lzo_lzo1x_1_compress" >&5
+ $as_echo "$ac_cv_lib_lzo_lzo1x_1_compress" >&6; }
+-if test "x$ac_cv_lib_lzo_lzo1x_1_compress" = x""yes; then :
++if test "x$ac_cv_lib_lzo_lzo1x_1_compress" = xyes; then :
+   LZO_LIBS="-llzo"
+ else
+-  as_fn_error "Required lzo library not found" "$LINENO" 5
++  as_fn_error $? "Required lzo library not found" "$LINENO" 5
+ 
+ fi
+ 
+@@ -11508,7 +11522,7 @@
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libgcrypt" >&5
+ $as_echo_n "checking for libgcrypt... " >&6; }
+ 	if ! test -x "${with_libgcrypt_prefix}/bin/libgcrypt-config"; then
+-		as_fn_error "Cannot locate libgcrypt" "$LINENO" 5
++		as_fn_error $? "Cannot locate libgcrypt" "$LINENO" 5
+ 	else
+ 		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
+ $as_echo "found" >&6; }
+@@ -11526,7 +11540,7 @@
+ 	# Workaround a wierd splashy issue
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for strlen in -lgcc_s" >&5
+ $as_echo_n "checking for strlen in -lgcc_s... " >&6; }
+-if test "${ac_cv_lib_gcc_s_strlen+set}" = set; then :
++if ${ac_cv_lib_gcc_s_strlen+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -11560,7 +11574,7 @@
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gcc_s_strlen" >&5
+ $as_echo "$ac_cv_lib_gcc_s_strlen" >&6; }
+-if test "x$ac_cv_lib_gcc_s_strlen" = x""yes; then :
++if test "x$ac_cv_lib_gcc_s_strlen" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBGCC_S 1
+ _ACEOF
+@@ -11575,7 +11589,7 @@
+ 
+ 		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for splashy_init in -lsplashy" >&5
+ $as_echo_n "checking for splashy_init in -lsplashy... " >&6; }
+-if test "${ac_cv_lib_splashy_splashy_init+set}" = set; then :
++if ${ac_cv_lib_splashy_splashy_init+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -11609,10 +11623,10 @@
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_splashy_splashy_init" >&5
+ $as_echo "$ac_cv_lib_splashy_splashy_init" >&6; }
+-if test "x$ac_cv_lib_splashy_splashy_init" = x""yes; then :
++if test "x$ac_cv_lib_splashy_splashy_init" = xyes; then :
+   SPLASHY_LIBS="-lsplashy"
+ else
+-  as_fn_error "Required libsplashy was not found" "$LINENO" 5
++  as_fn_error $? "Required libsplashy was not found" "$LINENO" 5
+ 
+ fi
+ 
+@@ -11682,10 +11696,10 @@
+ 
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+-                as_fn_error "Required libfbsplashrender was not found" "$LINENO" 5
++                as_fn_error $? "Required libfbsplashrender was not found" "$LINENO" 5
+ 
+ elif test $pkg_failed = untried; then
+-	as_fn_error "Required libfbsplashrender was not found" "$LINENO" 5
++	as_fn_error $? "Required libfbsplashrender was not found" "$LINENO" 5
+ 
+ else
+ 	FBSPLASH_CFLAGS=$pkg_cv_FBSPLASH_CFLAGS
+@@ -11705,7 +11719,7 @@
+ 
+ 		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthread" >&5
+ $as_echo_n "checking for pthread_create in -lpthread... " >&6; }
+-if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then :
++if ${ac_cv_lib_pthread_pthread_create+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -11739,10 +11753,10 @@
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_create" >&5
+ $as_echo "$ac_cv_lib_pthread_pthread_create" >&6; }
+-if test "x$ac_cv_lib_pthread_pthread_create" = x""yes; then :
++if test "x$ac_cv_lib_pthread_pthread_create" = xyes; then :
+   PTHREAD_LIBS="-lpthread"
+ else
+-  as_fn_error "Required pthread library not found" "$LINENO" 5
++  as_fn_error $? "Required pthread library not found" "$LINENO" 5
+ 
+ fi
+ 
+@@ -11757,7 +11771,7 @@
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
+ $as_echo_n "checking for ANSI C header files... " >&6; }
+-if test "${ac_cv_header_stdc+set}" = set; then :
++if ${ac_cv_header_stdc+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -11874,8 +11888,7 @@
+ do :
+   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+-eval as_val=\$$as_ac_Header
+-   if test "x$as_val" = x""yes; then :
++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+   cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+@@ -12044,10 +12057,21 @@
+      :end' >>confcache
+ if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
+   if test -w "$cache_file"; then
+-    test "x$cache_file" != "x/dev/null" &&
++    if test "x$cache_file" != "x/dev/null"; then
+       { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
+ $as_echo "$as_me: updating cache $cache_file" >&6;}
+-    cat confcache >$cache_file
++      if test ! -f "$cache_file" || test -h "$cache_file"; then
++	cat confcache >"$cache_file"
++      else
++        case $cache_file in #(
++        */* | ?:*)
++	  mv -f confcache "$cache_file"$$ &&
++	  mv -f "$cache_file"$$ "$cache_file" ;; #(
++        *)
++	  mv -f confcache "$cache_file" ;;
++	esac
++      fi
++    fi
+   else
+     { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
+ $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+@@ -12063,6 +12087,7 @@
+ 
+ ac_libobjs=
+ ac_ltlibobjs=
++U=
+ for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
+   # 1. Remove the extension, and $U if already installed.
+   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
+@@ -12086,51 +12111,51 @@
+ fi
+ 
+ if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
+-  as_fn_error "conditional \"AMDEP\" was never defined.
++  as_fn_error $? "conditional \"AMDEP\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
+-  as_fn_error "conditional \"am__fastdepCC\" was never defined.
++  as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${ENABLE_DEBUG_TRUE}" && test -z "${ENABLE_DEBUG_FALSE}"; then
+-  as_fn_error "conditional \"ENABLE_DEBUG\" was never defined.
++  as_fn_error $? "conditional \"ENABLE_DEBUG\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${ENABLE_MINIMAL_TRUE}" && test -z "${ENABLE_MINIMAL_FALSE}"; then
+-  as_fn_error "conditional \"ENABLE_MINIMAL\" was never defined.
++  as_fn_error $? "conditional \"ENABLE_MINIMAL\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${ARCH_X86_TRUE}" && test -z "${ARCH_X86_FALSE}"; then
+-  as_fn_error "conditional \"ARCH_X86\" was never defined.
++  as_fn_error $? "conditional \"ARCH_X86\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${ARCH_PPC_TRUE}" && test -z "${ARCH_PPC_FALSE}"; then
+-  as_fn_error "conditional \"ARCH_PPC\" was never defined.
++  as_fn_error $? "conditional \"ARCH_PPC\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${ENABLE_ENCRYPT_TRUE}" && test -z "${ENABLE_ENCRYPT_FALSE}"; then
+-  as_fn_error "conditional \"ENABLE_ENCRYPT\" was never defined.
++  as_fn_error $? "conditional \"ENABLE_ENCRYPT\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${ENABLE_RESUME_STATIC_TRUE}" && test -z "${ENABLE_RESUME_STATIC_FALSE}"; then
+-  as_fn_error "conditional \"ENABLE_RESUME_STATIC\" was never defined.
++  as_fn_error $? "conditional \"ENABLE_RESUME_STATIC\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${ENABLE_CREATE_DEVICE_TRUE}" && test -z "${ENABLE_CREATE_DEVICE_FALSE}"; then
+-  as_fn_error "conditional \"ENABLE_CREATE_DEVICE\" was never defined.
++  as_fn_error $? "conditional \"ENABLE_CREATE_DEVICE\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${ENABLE_SPLASHY_TRUE}" && test -z "${ENABLE_SPLASHY_FALSE}"; then
+-  as_fn_error "conditional \"ENABLE_SPLASHY\" was never defined.
++  as_fn_error $? "conditional \"ENABLE_SPLASHY\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${ENABLE_FBSPLASH_TRUE}" && test -z "${ENABLE_FBSPLASH_FALSE}"; then
+-  as_fn_error "conditional \"ENABLE_FBSPLASH\" was never defined.
++  as_fn_error $? "conditional \"ENABLE_FBSPLASH\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ 
+-: ${CONFIG_STATUS=./config.status}
++: "${CONFIG_STATUS=./config.status}"
+ ac_write_fail=0
+ ac_clean_files_save=$ac_clean_files
+ ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+@@ -12231,6 +12256,7 @@
+ IFS=" ""	$as_nl"
+ 
+ # Find who we are.  Look in the path if we contain no directory separator.
++as_myself=
+ case $0 in #((
+   *[\\/]* ) as_myself=$0 ;;
+   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+@@ -12276,19 +12302,19 @@
+ (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+ 
+ 
+-# as_fn_error ERROR [LINENO LOG_FD]
+-# ---------------------------------
++# as_fn_error STATUS ERROR [LINENO LOG_FD]
++# ----------------------------------------
+ # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+ # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+-# script with status $?, using 1 if that was 0.
++# script with STATUS, using 1 if that was 0.
+ as_fn_error ()
+ {
+-  as_status=$?; test $as_status -eq 0 && as_status=1
+-  if test "$3"; then
+-    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
++  as_status=$1; test $as_status -eq 0 && as_status=1
++  if test "$4"; then
++    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
++    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+   fi
+-  $as_echo "$as_me: error: $1" >&2
++  $as_echo "$as_me: error: $2" >&2
+   as_fn_exit $as_status
+ } # as_fn_error
+ 
+@@ -12484,7 +12510,7 @@
+       test -d "$as_dir" && break
+     done
+     test -z "$as_dirs" || eval "mkdir $as_dirs"
+-  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
++  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+ 
+ 
+ } # as_fn_mkdir_p
+@@ -12538,7 +12564,7 @@
+ # values after options handling.
+ ac_log="
+ This file was extended by suspend-utils $as_me 1.0, which was
+-generated by GNU Autoconf 2.65.  Invocation command line was
++generated by GNU Autoconf 2.68.  Invocation command line was
+ 
+   CONFIG_FILES    = $CONFIG_FILES
+   CONFIG_HEADERS  = $CONFIG_HEADERS
+@@ -12604,10 +12630,10 @@
+ ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
+ ac_cs_version="\\
+ suspend-utils config.status 1.0
+-configured by $0, generated by GNU Autoconf 2.65,
++configured by $0, generated by GNU Autoconf 2.68,
+   with options \\"\$ac_cs_config\\"
+ 
+-Copyright (C) 2009 Free Software Foundation, Inc.
++Copyright (C) 2010 Free Software Foundation, Inc.
+ This config.status script is free software; the Free Software Foundation
+ gives unlimited permission to copy, distribute and modify it."
+ 
+@@ -12625,11 +12651,16 @@
+ while test $# != 0
+ do
+   case $1 in
+-  --*=*)
++  --*=?*)
+     ac_option=`expr "X$1" : 'X\([^=]*\)='`
+     ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
+     ac_shift=:
+     ;;
++  --*=)
++    ac_option=`expr "X$1" : 'X\([^=]*\)='`
++    ac_optarg=
++    ac_shift=:
++    ;;
+   *)
+     ac_option=$1
+     ac_optarg=$2
+@@ -12651,6 +12682,7 @@
+     $ac_shift
+     case $ac_optarg in
+     *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
++    '') as_fn_error $? "missing file argument" ;;
+     esac
+     as_fn_append CONFIG_FILES " '$ac_optarg'"
+     ac_need_defaults=false;;
+@@ -12663,7 +12695,7 @@
+     ac_need_defaults=false;;
+   --he | --h)
+     # Conflict between --help and --header
+-    as_fn_error "ambiguous option: \`$1'
++    as_fn_error $? "ambiguous option: \`$1'
+ Try \`$0 --help' for more information.";;
+   --help | --hel | -h )
+     $as_echo "$ac_cs_usage"; exit ;;
+@@ -12672,7 +12704,7 @@
+     ac_cs_silent=: ;;
+ 
+   # This is an error.
+-  -*) as_fn_error "unrecognized option: \`$1'
++  -*) as_fn_error $? "unrecognized option: \`$1'
+ Try \`$0 --help' for more information." ;;
+ 
+   *) as_fn_append ac_config_targets " $1"
+@@ -12989,7 +13021,7 @@
+     "scripts/Makefile") CONFIG_FILES="$CONFIG_FILES scripts/Makefile" ;;
+     "scripts/suse-10.1/Makefile") CONFIG_FILES="$CONFIG_FILES scripts/suse-10.1/Makefile" ;;
+ 
+-  *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
++  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
+   esac
+ done
+ 
+@@ -13012,9 +13044,10 @@
+ # after its creation but before its name has been assigned to `$tmp'.
+ $debug ||
+ {
+-  tmp=
++  tmp= ac_tmp=
+   trap 'exit_status=$?
+-  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
++  : "${ac_tmp:=$tmp}"
++  { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
+ ' 0
+   trap 'as_fn_exit 1' 1 2 13 15
+ }
+@@ -13022,12 +13055,13 @@
+ 
+ {
+   tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
+-  test -n "$tmp" && test -d "$tmp"
++  test -d "$tmp"
+ }  ||
+ {
+   tmp=./conf$$-$RANDOM
+   (umask 077 && mkdir "$tmp")
+-} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
++} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
++ac_tmp=$tmp
+ 
+ # Set up the scripts for CONFIG_FILES section.
+ # No need to generate them if there are no CONFIG_FILES.
+@@ -13044,12 +13078,12 @@
+ fi
+ ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
+ if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
+-  ac_cs_awk_cr='\r'
++  ac_cs_awk_cr='\\r'
+ else
+   ac_cs_awk_cr=$ac_cr
+ fi
+ 
+-echo 'BEGIN {' >"$tmp/subs1.awk" &&
++echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
+ _ACEOF
+ 
+ 
+@@ -13058,18 +13092,18 @@
+   echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
+   echo "_ACEOF"
+ } >conf$$subs.sh ||
+-  as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+-ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
++  as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
++ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
+ ac_delim='%!_!# '
+ for ac_last_try in false false false false false :; do
+   . ./conf$$subs.sh ||
+-    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
++    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+ 
+   ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
+   if test $ac_delim_n = $ac_delim_num; then
+     break
+   elif $ac_last_try; then
+-    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
++    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+   else
+     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+   fi
+@@ -13077,7 +13111,7 @@
+ rm -f conf$$subs.sh
+ 
+ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+-cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
++cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
+ _ACEOF
+ sed -n '
+ h
+@@ -13125,7 +13159,7 @@
+ rm -f conf$$subs.awk
+ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ _ACAWK
+-cat >>"\$tmp/subs1.awk" <<_ACAWK &&
++cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
+   for (key in S) S_is_set[key] = 1
+   FS = ""
+ 
+@@ -13157,21 +13191,29 @@
+   sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
+ else
+   cat
+-fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
+-  || as_fn_error "could not setup config files machinery" "$LINENO" 5
++fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
++  || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
+ _ACEOF
+ 
+-# VPATH may cause trouble with some makes, so we remove $(srcdir),
+-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
++# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
++# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
+ # trailing colons and then remove the whole line if VPATH becomes empty
+ # (actually we leave an empty line to preserve line numbers).
+ if test "x$srcdir" = x.; then
+-  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
+-s/:*\$(srcdir):*/:/
+-s/:*\${srcdir}:*/:/
+-s/:*@srcdir@:*/:/
+-s/^\([^=]*=[	 ]*\):*/\1/
++  ac_vpsub='/^[	 ]*VPATH[	 ]*=[	 ]*/{
++h
++s///
++s/^/:/
++s/[	 ]*$/:/
++s/:\$(srcdir):/:/g
++s/:\${srcdir}:/:/g
++s/:@srcdir@:/:/g
++s/^:*//
+ s/:*$//
++x
++s/\(=[	 ]*\).*/\1/
++G
++s/\n//
+ s/^[^=]*=[	 ]*$//
+ }'
+ fi
+@@ -13183,7 +13225,7 @@
+ # No need to generate them if there are no CONFIG_HEADERS.
+ # This happens for instance with `./config.status Makefile'.
+ if test -n "$CONFIG_HEADERS"; then
+-cat >"$tmp/defines.awk" <<\_ACAWK ||
++cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
+ BEGIN {
+ _ACEOF
+ 
+@@ -13195,11 +13237,11 @@
+ # handling of long lines.
+ ac_delim='%!_!# '
+ for ac_last_try in false false :; do
+-  ac_t=`sed -n "/$ac_delim/p" confdefs.h`
+-  if test -z "$ac_t"; then
++  ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
++  if test -z "$ac_tt"; then
+     break
+   elif $ac_last_try; then
+-    as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
++    as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
+   else
+     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+   fi
+@@ -13284,7 +13326,7 @@
+ _ACAWK
+ _ACEOF
+ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+-  as_fn_error "could not setup config headers machinery" "$LINENO" 5
++  as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
+ fi # test -n "$CONFIG_HEADERS"
+ 
+ 
+@@ -13297,7 +13339,7 @@
+   esac
+   case $ac_mode$ac_tag in
+   :[FHL]*:*);;
+-  :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
++  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
+   :[FH]-) ac_tag=-:-;;
+   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
+   esac
+@@ -13316,7 +13358,7 @@
+     for ac_f
+     do
+       case $ac_f in
+-      -) ac_f="$tmp/stdin";;
++      -) ac_f="$ac_tmp/stdin";;
+       *) # Look for the file first in the build tree, then in the source tree
+ 	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
+ 	 # because $ac_f cannot contain `:'.
+@@ -13325,7 +13367,7 @@
+ 	   [\\/$]*) false;;
+ 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
+ 	   esac ||
+-	   as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
++	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
+       esac
+       case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+       as_fn_append ac_file_inputs " '$ac_f'"
+@@ -13351,8 +13393,8 @@
+     esac
+ 
+     case $ac_tag in
+-    *:-:* | *:-) cat >"$tmp/stdin" \
+-      || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
++    *:-:* | *:-) cat >"$ac_tmp/stdin" \
++      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
+     esac
+     ;;
+   esac
+@@ -13488,23 +13530,24 @@
+ s&@MKDIR_P@&$ac_MKDIR_P&;t t
+ $ac_datarootdir_hack
+ "
+-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
+-  || as_fn_error "could not create $ac_file" "$LINENO" 5
++eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
++  >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+ 
+ test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
+-  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
+-  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
++  { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
++  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' \
++      "$ac_tmp/out"`; test -z "$ac_out"; } &&
+   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+-which seems to be undefined.  Please make sure it is defined." >&5
++which seems to be undefined.  Please make sure it is defined" >&5
+ $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+-which seems to be undefined.  Please make sure it is defined." >&2;}
++which seems to be undefined.  Please make sure it is defined" >&2;}
+ 
+-  rm -f "$tmp/stdin"
++  rm -f "$ac_tmp/stdin"
+   case $ac_file in
+-  -) cat "$tmp/out" && rm -f "$tmp/out";;
+-  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
++  -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
++  *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
+   esac \
+-  || as_fn_error "could not create $ac_file" "$LINENO" 5
++  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+  ;;
+   :H)
+   #
+@@ -13513,21 +13556,21 @@
+   if test x"$ac_file" != x-; then
+     {
+       $as_echo "/* $configure_input  */" \
+-      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
+-    } >"$tmp/config.h" \
+-      || as_fn_error "could not create $ac_file" "$LINENO" 5
+-    if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
++      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
++    } >"$ac_tmp/config.h" \
++      || as_fn_error $? "could not create $ac_file" "$LINENO" 5
++    if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
+       { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
+ $as_echo "$as_me: $ac_file is unchanged" >&6;}
+     else
+       rm -f "$ac_file"
+-      mv "$tmp/config.h" "$ac_file" \
+-	|| as_fn_error "could not create $ac_file" "$LINENO" 5
++      mv "$ac_tmp/config.h" "$ac_file" \
++	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
+     fi
+   else
+     $as_echo "/* $configure_input  */" \
+-      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
+-      || as_fn_error "could not create -" "$LINENO" 5
++      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
++      || as_fn_error $? "could not create -" "$LINENO" 5
+   fi
+ # Compute "$ac_file"'s index in $config_headers.
+ _am_arg="$ac_file"
+@@ -14311,7 +14354,7 @@
+ ac_clean_files=$ac_clean_files_save
+ 
+ test $ac_write_fail = 0 ||
+-  as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
++  as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
+ 
+ 
+ # configure is writing to config.log, and then calls config.status.
+@@ -14332,7 +14375,7 @@
+   exec 5>>config.log
+   # Use ||, not &&, to avoid exiting from the if with $? = 1, which
+   # would make configure fail if this is the last instruction.
+-  $ac_cs_success || as_fn_exit $?
++  $ac_cs_success || as_fn_exit 1
+ fi
+ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
+   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
diff -Nru uswsusp-1.0/debian/patches/series uswsusp-1.0+20110509/debian/patches/series
--- uswsusp-1.0/debian/patches/series	2011-03-11 23:53:37.000000000 +0100
+++ uswsusp-1.0+20110509/debian/patches/series	2011-09-25 19:05:36.000000000 +0200
@@ -1 +1,4 @@
-uswsusp_rename.patch
+01_uswsusp_rename.patch
+02_s2ram_no_vt_switch.patch
+03_s2ram_ppc_force.patch
+04_debian_paths.patch
diff -Nru uswsusp-1.0/debian/patches/uswsusp_rename.patch uswsusp-1.0+20110509/debian/patches/uswsusp_rename.patch
--- uswsusp-1.0/debian/patches/uswsusp_rename.patch	2011-03-11 23:53:37.000000000 +0100
+++ uswsusp-1.0+20110509/debian/patches/uswsusp_rename.patch	1970-01-01 01:00:00.000000000 +0100
@@ -1,87 +0,0 @@
-This patch changes the name of the /etc/suspend.{conf|key} files to /etc/uswsusp.{conf|key}
---- a/HOWTO
-+++ b/HOWTO
-@@ -147,7 +147,7 @@
- 
- (f) Optinally create initramfs image
- 
--- Edit conf/suspend.conf file to reflect the configuration
-+- Edit conf/uswsusp.conf file to reflect the configuration
- of your system (please refer to Section II of this document for details).
- 
- [There should be just one resume partition, for now. You'll need at most 1/2
-@@ -274,7 +274,7 @@
- in the directory where you have placed the sources.
- 
- 4) Create the configuration file for the s2disk tool.  Its default name
--is /etc/suspend.conf, but this can be customized by changing CONFIG_FILE
-+is /etc/uswsusp.conf, but this can be customized by changing CONFIG_FILE
- in config_parser.h.  It is also possible to specify the configuration file
- name from the command line, by using the -f option, eg.
- 
-@@ -369,7 +369,7 @@
- for it explicitly.
- 
- In order to create the configuration file for s2disk and/or resume, it is
--recommended to edit the file suspend.conf in the conf/ subdirectory of the
-+recommended to edit the file uswsusp.conf in the conf/ subdirectory of the
- package source.  Then this file will be automatically placed in /etc and
- in the resume initrd file by scripts provided in this package.
- 
-@@ -486,7 +486,7 @@
- (j) Put the configuration file for the resume tool in the etc directory on
- the initrd filesystem, eg.
- 
--# cp /etc/suspend.conf /mnt/etc/
-+# cp /etc/uswsusp.conf /mnt/etc/
- 
- (k) Unmount the initrd filesystem and move the file containing it to your /boot
- directory, eg.
-@@ -514,7 +514,7 @@
- 	TEMPLATE resume
- 	BEGIN
- 		FILE "/usr/local/sbin/resume"
--		FILE "/etc/suspend.conf"
-+		FILE "/etc/uswsusp.conf"
- 		SCRIPT "/init"
- 		BEGIN
- 			!if [ -z "$noresume" ]
-@@ -589,7 +589,7 @@
- 
- For this purpose you need to generate the RSA key pair using the
- suspend-keygen tool provided along with the s2disk and resume tools.  The
--output file of suspend-keygen should be saved as /etc/suspend.key (or
-+output file of suspend-keygen should be saved as /etc/uswsusp.key (or
- something else pointed to by the "RSA key file =" configuration  parameter of
- s2disk).  This file contains the public modulus (n), public exponent (e), the
- AES-encrypted private exponent (d), the AES-encrypted primes (p), (q) and
---- a/config_parser.h
-+++ b/config_parser.h
-@@ -27,4 +27,4 @@
- void usage(char *my_name, struct option options[], const char *short_options);
- void version(char *my_name, char *extra_version);
- 
--#define CONFIG_FILE	"/etc/suspend.conf"
-+#define CONFIG_FILE	"/etc/uswsusp.conf"
---- a/encrypt.h
-+++ b/encrypt.h
-@@ -59,7 +59,7 @@
- void encrypt_init(unsigned char *, unsigned char *, char *);
- void get_random_salt(unsigned char *salt, size_t size);
- 
--#define SUSPEND_KEY_FILE_PATH	"/etc/suspend.key"
-+#define SUSPEND_KEY_FILE_PATH	"/etc/uswsusp.key"
- #define ENCRYPT_BUF_PAGES	256
- 
- extern gcry_cipher_hd_t cipher_handle;
---- a/keygen.c
-+++ b/keygen.c
-@@ -27,7 +27,7 @@
- #define MAX_KEY_BITS	4096
- #define MAX_OUT_SIZE	(sizeof(struct RSA_data))
- #define MAX_STR_LEN	256
--#define DEFAULT_FILE	"suspend.key"
-+#define DEFAULT_FILE	"uswsusp.key"
- 
- static char in_buffer[MAX_STR_LEN];
- static char pass_buf[MAX_STR_LEN];
diff -Nru uswsusp-1.0/debian/po/cs.po uswsusp-1.0+20110509/debian/po/cs.po
--- uswsusp-1.0/debian/po/cs.po	2011-03-11 23:53:37.000000000 +0100
+++ uswsusp-1.0+20110509/debian/po/cs.po	2011-09-25 18:18:38.000000000 +0200
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: uswsusp\n"
 "Report-Msgid-Bugs-To: uswsusp@packages.debian.org\n"
-"POT-Creation-Date: 2008-07-26 09:54+0200\n"
+"POT-Creation-Date: 2011-09-25 18:18+0200\n"
 "PO-Revision-Date: 2008-08-09 08:26+0200\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
diff -Nru uswsusp-1.0/debian/po/da.po uswsusp-1.0+20110509/debian/po/da.po
--- uswsusp-1.0/debian/po/da.po	1970-01-01 01:00:00.000000000 +0100
+++ uswsusp-1.0+20110509/debian/po/da.po	2011-07-09 07:58:15.000000000 +0200
@@ -0,0 +1,431 @@
+# Danish translation uswsusp.
+# Copyright (C) 2011 uswsusp & nedenstående oversættere.
+# This file is distributed under the same license as the uswsusp package.
+# Joe Hansen <joedalton2@yahoo.dk>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: uswsusp\n"
+"Report-Msgid-Bugs-To: uswsusp@packages.debian.org\n"
+"POT-Creation-Date: 2008-07-26 09:54+0200\n"
+"PO-Revision-Date: 2011-04-30 17:30+01:00\n"
+"Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
+"Language-Team: Danish <debian-l10n-danish@lists.debian.org>\n"
+"Language: da\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: select
+#. Description
+#: ../uswsusp.templates:2001
+msgid "Swap space to resume from:"
+msgstr "Swaprum at genoptage fra:"
+
+#. Type: select
+#. Description
+#: ../uswsusp.templates:2001
+msgid ""
+"To be able to suspend the system, uswsusp needs a swap partition or file to "
+"store a system snapshot. Please choose the device to use, from the list of "
+"suitable swap spaces, sorted by size (largest first)."
+msgstr ""
+"For at kunne sætte systemet i dvale har uswsusp behov for en swappartition "
+"eller fil til at gemme et systemøjebliksbillede. Vælg venligst enheden at "
+"bruge, fra listen af egnede swaprum, sorteret efter størrelse (største "
+"først)."
+
+#. Type: error
+#. Description
+#: ../uswsusp.templates:4001
+msgid "No suitable swap space for software suspend"
+msgstr "Ingen egnede swaprum for programdvale"
+
+#. Type: error
+#. Description
+#: ../uswsusp.templates:4001
+msgid ""
+"To be able to suspend the system, uswsusp needs a swap partition or file to "
+"write a system snapshot to. No such space seems to be available for this."
+msgstr ""
+"For at kunne sætte systemet i dvale har uswsusp behov for en swappartition "
+"eller fil til at gemme et systemøjebliksbillede. Et sådant sted ser ikke ud "
+"til at være til rådighed."
+
+#. Type: error
+#. Description
+#: ../uswsusp.templates:4001
+msgid ""
+"You should create a swap partition or file, preferably twice the size of the "
+"system's physical RAM."
+msgstr ""
+"Du bør oprette en swappartition eller fil, cirka dobbelt så stor som "
+"størrelsen på systemets fysiske RAM."
+
+#. Type: error
+#. Description
+#: ../uswsusp.templates:4001
+msgid ""
+"Then, run 'dpkg-reconfigure uswsusp' or edit the configuration file manually."
+msgstr ""
+"Kør så »dpkg-reconfigure uswsusp« eller rediger konfigurationsfilen manuelt."
+
+#. Type: error
+#. Description
+#: ../uswsusp.templates:5001
+msgid "No userspace software suspend support in the kernel"
+msgstr "Ingen understøttelse af programdvale for brugerrum i kernen"
+
+#. Type: error
+#. Description
+#: ../uswsusp.templates:5001
+msgid ""
+"The current kernel doesn't support userspace software suspend. Please "
+"recompile the kernel with the 'CONFIG_HIBERNATION=y' option."
+msgstr ""
+"Den aktuelle kerne understøtter ikke programdvale for brugerrum. Rekompiler "
+"venligst kernen med tilvalget CONFIG_HIBERNATION=y."
+
+#. Type: boolean
+#. Description
+#: ../uswsusp.templates:6001
+msgid "Continue without a valid swap space?"
+msgstr "Fortsæt uden et gyldigt swaprum?"
+
+#. Type: boolean
+#. Description
+#: ../uswsusp.templates:6001
+msgid ""
+"The swap file or partition that was found in uswsusp's configuration file is "
+"not active."
+msgstr ""
+"Swapfilen eller -partitionen som blev fundet i uswsusps konfigurationsfil er "
+"ikke aktiv."
+
+#. Type: boolean
+#. Description
+#: ../uswsusp.templates:6001
+msgid ""
+"In most cases this means userspace software suspend will not work as "
+"expected. You should choose another swap space."
+msgstr ""
+"I det fleste tilfælde vil dette betyde, at programdvale for brugerrum ikke "
+"vil virke som forventet. Du bør vælge et andet swaprum."
+
+#. Type: boolean
+#. Description
+#: ../uswsusp.templates:6001
+msgid "However, in some rare cases, this configuration may be intentional."
+msgstr "I nogle sjældne tilfælde kan denne konfiguration dog være bevidst."
+
+#. Type: string
+#. Description
+#: ../uswsusp.templates:7001
+msgid "The device node through which uswsusp can talk to the kernel:"
+msgstr "Enhedsknuden som uswsusp kan snakke med kernen via:"
+
+#. Type: string
+#. Description
+#: ../uswsusp.templates:7001
+msgid ""
+"If this is empty, the hardcoded default, /dev/snapshot, is used. This should "
+"be OK in almost all cases. Don't change this unless there is a good reason "
+"to do so."
+msgstr ""
+"Hvis den er tom, vil den hårdkodede standard /dev/snapshot blive brugt. "
+"Dette bør være okay i næsten alle tilfælde. Ændr ikke dette med mindre der "
+"er en god årsag til at gøre dette."
+
+#. Type: string
+#. Description
+#: ../uswsusp.templates:8001
+msgid "Preferred maximum image size:"
+msgstr "Foretrukken maksimal billedstørrelse:"
+
+#. Type: string
+#. Description
+#: ../uswsusp.templates:8001
+msgid "Please specify a maximum system snapshot image size (in bytes)."
+msgstr ""
+"Angiv venligst en maksimal billedstørrelse (i byte) for "
+"systemøjebliksbilledet."
+
+#. Type: string
+#. Description
+#: ../uswsusp.templates:8001
+msgid ""
+"This limit is not strict; the uswsusp does its best to respect it, but will "
+"exceed the specified limit if suspend needs a bigger image."
+msgstr ""
+"Begrænsningen er ikke absolut; uswsusp gør sit bedste for at respektere "
+"grænsen, men vil bruge ekstra hvis dvale kræver et større aftryk."
+
+#. Type: string
+#. Description
+#: ../uswsusp.templates:8001
+#, no-c-format
+msgid ""
+"Using 0 here will enforce the use of the smallest possible snapshot image. "
+"An empty value will use the hard coded default, which is 500MB. The default "
+"value is 45% of the system's memory: this is not the maximal size, but some "
+"additional free memory speeds up the suspend and resume process."
+msgstr ""
+"Brug af 0 her vil fremtvinge brugen af den mindst mulige størrelse på "
+"øjebliksbilledet. En tom værdi vil bruge den hårdkodede standard, som er 500 "
+"MB. Standardværdien er 45 % af systemets hukommelse: Dette er ikke den "
+"maksimale størrelse, men lidt ekstra fri hukommelse øger hastigheden på "
+"dvale- og genoptagprocessen."
+
+#. Type: string
+#. Description
+#: ../uswsusp.templates:9001
+msgid "Log level for software suspend:"
+msgstr "Logniveau for programdvale:"
+
+#. Type: string
+#. Description
+#: ../uswsusp.templates:9001
+msgid ""
+"Please specify the kernel console log level which the s2disk/s2both and "
+"resume utilities will use to report the progress of suspend and resume.  On "
+"a stock kernel, messages with levels higher than 7 are usually not shown."
+msgstr ""
+"Angiv venligst logniveau for kernekonsollen som redskaberne s2disk/s2both og "
+"genoptag (resume) vil bruge til at rapportere fremgangen i dvale og "
+"genoptag. På en stockkerne bliver beskeder med niveauer større end 7 normalt "
+"ikke vist."
+
+#. Type: string
+#. Description
+#: ../uswsusp.templates:10001
+msgid "Maximal log level:"
+msgstr "Maksimal logniveau:"
+
+#. Type: string
+#. Description
+#: ../uswsusp.templates:10001
+msgid ""
+"Please specify the kernel console log level which the resume utility will "
+"use if the resume fails."
+msgstr ""
+"Angiv venligst logniveau for kernekonsollen som redskabet genoptag (resume) "
+"vil bruge hvis genoptagelse fejler."
+
+#. Type: boolean
+#. Description
+#: ../uswsusp.templates:11001
+msgid "Perform checksum on image?"
+msgstr "Udfør kontrolsum på aftryk?"
+
+#. Type: boolean
+#. Description
+#: ../uswsusp.templates:11001
+msgid ""
+"Performing a checksum using the MD5 algorithm to verify the image integrity "
+"is slightly safer, but also takes more time."
+msgstr ""
+"Udførelse af en kontrolsum der bruger MD5-algoritmen til at verificere "
+"aftrykkets integritet er en smule sikre, men tager også længere tid."
+
+#. Type: boolean
+#. Description
+#: ../uswsusp.templates:12001
+msgid "Compress image?"
+msgstr "Komprimer aftryk?"
+
+#. Type: boolean
+#. Description
+#: ../uswsusp.templates:12001
+msgid ""
+"Compressing the image with the LZF compression algorithm will result in a "
+"smaller image, which makes it possible to suspend with a smaller swap "
+"partition. Generally, it will also make reading and writing the image faster "
+"because there is less to read and write."
+msgstr ""
+"Komprimering af aftrykket med LZF-komprimeringsalgoritmen vil resultere i et "
+"mindre aftryk, som gør det muligt at gå i dvale med en mindre swappartition. "
+"Generelt vil det også gøre læsning og skrivning af aftrykket hurtigere, da "
+"der er mindre at læse og skrive."
+
+#. Type: boolean
+#. Description
+#: ../uswsusp.templates:13001
+msgid "Perform early write out?"
+msgstr "Udfør tidlig udskrivning?"
+
+#. Type: boolean
+#. Description
+#: ../uswsusp.templates:13001
+msgid ""
+"The synchronization of the resume device can start early in the process of "
+"writing the image to it. This has been reported to speed up suspend on some "
+"systems and eliminate the 'fast progress meter and long fsync wait' effect."
+msgstr ""
+"Synkroniseringen af genoptageenheden kan starte tidlig i processen med "
+"skrivning af aftrykket til det. Dette har medført, at dvale (suspend) er "
+"gået hurtigere på nogle systemer og eliminerer effekten med »hurtig "
+"statusbjælke og lang fsync-ventning«."
+
+#. Type: boolean
+#. Description
+#: ../uswsusp.templates:14001
+msgid "Show splash screen?"
+msgstr "Vis opstartsbillede?"
+
+#. Type: boolean
+#. Description
+#: ../uswsusp.templates:14001
+msgid ""
+"Instead of informative output, a splash screen with progress bar can be "
+"shown during the suspend and resume process. This requires the splashy "
+"package to be installed."
+msgstr ""
+"I stedet for informativ tekst kan et opstartsbillede med en statusbjælke "
+"vises under processen med dvale og genoptag. Dette kræver, at pakken splashy "
+"er installeret."
+
+#. Type: boolean
+#. Description
+#: ../uswsusp.templates:15001
+msgid "Encrypt snapshot?"
+msgstr "Krypter øjebliksbillede?"
+
+#. Type: boolean
+#. Description
+#: ../uswsusp.templates:15001
+msgid ""
+"For increased security, it is possible to encrypt the snapshot that is "
+"written to disk during suspend. On resume (and suspend if you don't use an "
+"RSA key), you will be prompted for a passphrase. Encryption adds a "
+"significant time to the suspend and resume processes."
+msgstr ""
+"For øget sikkerhed, er det muligt at kryptere øjebliksbilledet som skrives "
+"til disken under dvale. Ved genoptag (og dvale hvis du ikke bruger en RSA-"
+"nøgle), vil du blive spurgt om en adgangsfrase. Kryptering øger væsentlig "
+"tiden for processerne dvale og genoptag."
+
+#. Type: string
+#. Description
+#: ../uswsusp.templates:16001
+msgid "Path to RSA key file:"
+msgstr "Sti til RSA-nøglefil:"
+
+#. Type: string
+#. Description
+#: ../uswsusp.templates:16001
+msgid ""
+"To avoid the need for a passphrase prompt during each suspend, an RSA key "
+"can be used to encrypt the image."
+msgstr ""
+"For at undgå behovet for at blive spurgt om en adgangsfrase under hver dvale "
+"kan en RSA-nøgle blive brugt til at kryptere aftrykket."
+
+#. Type: string
+#. Description
+#: ../uswsusp.templates:16001
+msgid ""
+"Please specify the path to that file. Leave this field empty to not use an "
+"RSA key."
+msgstr ""
+"Angiv venligst stien til den fil. Efterlad dette felt tomt for ikke at bruge "
+"en RSA-nøgle."
+
+#. Type: boolean
+#. Description
+#: ../uswsusp.templates:17001
+msgid "Create an RSA key?"
+msgstr "Opret en RSA-nøgle?"
+
+#. Type: boolean
+#. Description
+#: ../uswsusp.templates:17001
+msgid ""
+"The key necessary for using the RSA encryption scheme can be generated now. "
+"You will be prompted for a passphrase."
+msgstr ""
+"Nøglen som er nødvendig for at bruge RSA-krypteringsskemaet kan oprettes nu. "
+"Du vil blive spurgt om en adgangsfrase."
+
+#. Type: string
+#. Description
+#: ../uswsusp.templates:18001
+msgid "RSA key size:"
+msgstr "RSA-nøglestørrelse:"
+
+#. Type: string
+#. Description
+#: ../uswsusp.templates:18001
+msgid ""
+"Please specify the size of the RSA key (number of bits between 1024 and "
+"4096). A bigger key increases the encryption strength but slows down the "
+"encryption process."
+msgstr ""
+"Angiv venligst størrelsen på RSA-nøglen (antal bit mellem 1024 og 4096). En "
+"større nøgle øger krypteringsstyrken men gør krypteringsprocessen "
+"langsommere."
+
+#. Type: password
+#. Description
+#: ../uswsusp.templates:19001
+msgid "RSA passphrase:"
+msgstr "RSA-adgangsfrase:"
+
+#. Type: password
+#. Description
+#: ../uswsusp.templates:19001
+msgid ""
+"Please choose the passphrase to use on every resume to decrypt the image."
+msgstr ""
+"Vælg venligst adgangsfrasen der skal bruges ved hver genoptag for at "
+"dekryptere aftrykket."
+
+#. Type: password
+#. Description
+#: ../uswsusp.templates:20001
+msgid "RSA passphrase confirmation:"
+msgstr "RSA-adgangsfrasebekræftelse:"
+
+#. Type: select
+#. Choices
+#: ../uswsusp.templates:21001
+msgid "reboot"
+msgstr "genstart"
+
+#. Type: select
+#. Choices
+#: ../uswsusp.templates:21001
+msgid "platform"
+msgstr "platform"
+
+#. Type: select
+#. Choices
+#: ../uswsusp.templates:21001
+msgid "shutdown"
+msgstr "nedlukning"
+
+#. Type: select
+#. Description
+#: ../uswsusp.templates:21002
+msgid "Shutdown method:"
+msgstr "Nedlukningsmetode:"
+
+#. Type: select
+#. Description
+#: ../uswsusp.templates:21002
+msgid ""
+"If this parameter is set to 'reboot', the s2disk utility will reboot the "
+"machine rather than powering down. This can be useful for testing purposes."
+msgstr ""
+"Hvis denne parameter er angivet til »genstart«, vil s2disk-redskabet "
+"genstarte maskinen i stedet for at slukke for den. Dette kan være brugbart "
+"under test."
+
+#. Type: select
+#. Description
+#: ../uswsusp.templates:21002
+msgid ""
+"If it is set to 'platform', hardware-specific optimization is used if "
+"available."
+msgstr ""
+"Hvis den er sat til »platform« bruges hardwarespecifik optimering; hvis den "
+"er tilgængelig."
diff -Nru uswsusp-1.0/debian/po/de.po uswsusp-1.0+20110509/debian/po/de.po
--- uswsusp-1.0/debian/po/de.po	2011-03-11 23:53:37.000000000 +0100
+++ uswsusp-1.0+20110509/debian/po/de.po	2011-09-25 18:18:38.000000000 +0200
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: uswsusp 0.8-1\n"
 "Report-Msgid-Bugs-To: uswsusp@packages.debian.org\n"
-"POT-Creation-Date: 2008-07-26 09:54+0200\n"
+"POT-Creation-Date: 2011-09-25 18:18+0200\n"
 "PO-Revision-Date: 2008-08-04 18:42+0200\n"
 "Last-Translator: Helge Kreutzmann <debian@helgefjell.de>\n"
 "Language-Team: de <debian-l10n-german@lists.debian.org>\n"
diff -Nru uswsusp-1.0/debian/po/es.po uswsusp-1.0+20110509/debian/po/es.po
--- uswsusp-1.0/debian/po/es.po	2011-03-11 23:53:37.000000000 +0100
+++ uswsusp-1.0+20110509/debian/po/es.po	2011-09-25 18:18:38.000000000 +0200
@@ -34,7 +34,7 @@
 msgstr ""
 "Project-Id-Version: uswsusp 0.5-1\n"
 "Report-Msgid-Bugs-To: uswsusp@packages.debian.org\n"
-"POT-Creation-Date: 2008-07-26 09:54+0200\n"
+"POT-Creation-Date: 2011-09-25 18:18+0200\n"
 "PO-Revision-Date: 2008-08-18 03:29+0100\n"
 "Last-Translator: Steve Ataucuri cruz <stonescenter@gmail.com>\n"
 "Language-Team: Spanish <debian-l10n-spanish@lists.debian.org>\n"
diff -Nru uswsusp-1.0/debian/po/eu.po uswsusp-1.0+20110509/debian/po/eu.po
--- uswsusp-1.0/debian/po/eu.po	2011-03-11 23:53:37.000000000 +0100
+++ uswsusp-1.0+20110509/debian/po/eu.po	2011-09-25 18:18:38.000000000 +0200
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: uswsusp-eu\n"
 "Report-Msgid-Bugs-To: uswsusp@packages.debian.org\n"
-"POT-Creation-Date: 2008-07-26 09:54+0200\n"
+"POT-Creation-Date: 2011-09-25 18:18+0200\n"
 "PO-Revision-Date: 2008-08-08 09:53+0200\n"
 "Last-Translator: Piarres Beobide <pi@beobide.net>\n"
 "Language-Team: Euskara <debian-l10n-basque@lists.debian.org>\n"
diff -Nru uswsusp-1.0/debian/po/fi.po uswsusp-1.0+20110509/debian/po/fi.po
--- uswsusp-1.0/debian/po/fi.po	2011-03-11 23:53:37.000000000 +0100
+++ uswsusp-1.0+20110509/debian/po/fi.po	2011-09-25 18:18:38.000000000 +0200
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: uswsusp\n"
 "Report-Msgid-Bugs-To: uswsusp@packages.debian.org\n"
-"POT-Creation-Date: 2008-07-26 09:54+0200\n"
+"POT-Creation-Date: 2011-09-25 18:18+0200\n"
 "PO-Revision-Date: 2008-08-07 09:53+0200\n"
 "Last-Translator: Esko Arajärvi <edu@iki.fi>\n"
 "Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
diff -Nru uswsusp-1.0/debian/po/fr.po uswsusp-1.0+20110509/debian/po/fr.po
--- uswsusp-1.0/debian/po/fr.po	2011-03-11 23:53:37.000000000 +0100
+++ uswsusp-1.0+20110509/debian/po/fr.po	2011-09-25 18:18:38.000000000 +0200
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: uswsusp@packages.debian.org\n"
-"POT-Creation-Date: 2008-07-26 09:54+0200\n"
+"POT-Creation-Date: 2011-09-25 18:18+0200\n"
 "PO-Revision-Date: 2008-08-04 21:34+0200\n"
 "Last-Translator: Christian Perrier <bubulle@debian.org>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
diff -Nru uswsusp-1.0/debian/po/gl.po uswsusp-1.0+20110509/debian/po/gl.po
--- uswsusp-1.0/debian/po/gl.po	2011-03-11 23:53:37.000000000 +0100
+++ uswsusp-1.0+20110509/debian/po/gl.po	2011-09-25 18:18:38.000000000 +0200
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: uswsusp\n"
 "Report-Msgid-Bugs-To: uswsusp@packages.debian.org\n"
-"POT-Creation-Date: 2008-07-26 09:54+0200\n"
+"POT-Creation-Date: 2011-09-25 18:18+0200\n"
 "PO-Revision-Date: 2008-08-06 23:49+0100\n"
 "Last-Translator: Jacobo Tarrio <jtarrio@debian.org>\n"
 "Language-Team: Galician <proxecto@trasno.net>\n"
diff -Nru uswsusp-1.0/debian/po/it.po uswsusp-1.0+20110509/debian/po/it.po
--- uswsusp-1.0/debian/po/it.po	2011-03-11 23:53:37.000000000 +0100
+++ uswsusp-1.0+20110509/debian/po/it.po	2011-09-25 18:18:38.000000000 +0200
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: uswsusp 0.8 italian debconf templates\n"
 "Report-Msgid-Bugs-To: uswsusp@packages.debian.org\n"
-"POT-Creation-Date: 2008-07-26 09:54+0200\n"
+"POT-Creation-Date: 2011-09-25 18:18+0200\n"
 "PO-Revision-Date: 2008-08-07 10:34+0200\n"
 "Last-Translator: Luca Monducci <luca.mo@tiscali.it>\n"
 "Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n"
diff -Nru uswsusp-1.0/debian/po/ja.po uswsusp-1.0+20110509/debian/po/ja.po
--- uswsusp-1.0/debian/po/ja.po	2011-03-11 23:53:37.000000000 +0100
+++ uswsusp-1.0+20110509/debian/po/ja.po	2011-09-25 18:18:38.000000000 +0200
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: uswsusp 0.8-1\n"
 "Report-Msgid-Bugs-To: uswsusp@packages.debian.org\n"
-"POT-Creation-Date: 2008-07-26 09:54+0200\n"
+"POT-Creation-Date: 2011-09-25 18:18+0200\n"
 "PO-Revision-Date: 2008-08-03 21:04+0900\n"
 "Last-Translator: Hideki Yamane (Debian-JP) <henrich@debian.or.jp>\n"
 "Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
diff -Nru uswsusp-1.0/debian/po/nl.po uswsusp-1.0+20110509/debian/po/nl.po
--- uswsusp-1.0/debian/po/nl.po	2011-03-11 23:53:37.000000000 +0100
+++ uswsusp-1.0+20110509/debian/po/nl.po	2011-07-09 07:58:12.000000000 +0200
@@ -5,11 +5,11 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: uswsusp 0.7-1\n"
+"Project-Id-Version: uswsusp 1.0-1\n"
 "Report-Msgid-Bugs-To: uswsusp@packages.debian.org\n"
 "POT-Creation-Date: 2008-07-26 09:54+0200\n"
-"PO-Revision-Date: 2008-03-03 23:22+0000\n"
-"Last-Translator: Vincent Zweije <zweije@xs4all.nl>\n"
+"PO-Revision-Date: 2011-04-14 17:10+0100\n"
+"Last-Translator: willem kuyn <willemkuyn@gmail.com>\n"
 "Language-Team: Debian-Dutch <debian-l10n-dutch@lists.debian.org>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
@@ -39,7 +39,7 @@
 #. Description
 #: ../uswsusp.templates:4001
 msgid "No suitable swap space for software suspend"
-msgstr "Geen geschikte swaplocatie voor software-suspend gevonden."
+msgstr "Geen geschikte swaplocatie voor het in slaapstand zetten gevonden."
 
 #. Type: error
 #. Description
@@ -75,7 +75,7 @@
 #. Description
 #: ../uswsusp.templates:5001
 msgid "No userspace software suspend support in the kernel"
-msgstr "De kernel ondersteunt geen software-suspend."
+msgstr "De kernel ondersteunt het in de slaapstand zetten niet."
 
 #. Type: error
 #. Description
@@ -84,8 +84,9 @@
 "The current kernel doesn't support userspace software suspend. Please "
 "recompile the kernel with the 'CONFIG_HIBERNATION=y' option."
 msgstr ""
-"De huidige kernel ondersteunt geen userspace-software-suspend. Gelieve de "
-"kernel opnieuw te compileren met de optie 'CONFIG_HIBERNATION=y'."
+"De huidige kernel ondersteunt in de slaapstand zetten door de gebruiker "
+"niet. Gelieve de kernel opnieuw te compileren met de optie "
+"'CONFIG_HIBERNATION=y'."
 
 #. Type: boolean
 #. Description
@@ -110,8 +111,8 @@
 "In most cases this means userspace software suspend will not work as "
 "expected. You should choose another swap space."
 msgstr ""
-"Meestal betekent dit dat userspace-software-suspend niet naar verwachting "
-"zal werken. U dient een andere swaplocatie te kiezen."
+"Meestal betekent dit dat het in de slaapstand zetten door de gebruiker niet "
+"naar verwachting zal werken. U dient een andere swaplocatie te kiezen."
 
 #. Type: boolean
 #. Description
@@ -141,13 +142,13 @@
 #. Description
 #: ../uswsusp.templates:8001
 msgid "Preferred maximum image size:"
-msgstr "Gewenste maximale afbeeldingsgrootte:"
+msgstr "Gewenste maximale grootte van de opslag (image):"
 
 #. Type: string
 #. Description
 #: ../uswsusp.templates:8001
 msgid "Please specify a maximum system snapshot image size (in bytes)."
-msgstr "Wat is de maximale afbeeldingsgrootte in bytes?"
+msgstr "Wat is de maximale grootte van de opslag (image) in bytes?"
 
 #. Type: string
 #. Description
@@ -157,7 +158,8 @@
 "exceed the specified limit if suspend needs a bigger image."
 msgstr ""
 "Deze grens is niet strikt: uswsusp tracht zich aan deze grens te houden, "
-"maar zal er overheen gaan indien suspend een grotere afbeelding nodig heeft."
+"maar zal er overheen gaan indien het in de slaapstand zetten een grotere "
+"opslag nodig heeft."
 
 #. Type: string
 #. Description
@@ -169,16 +171,16 @@
 "value is 45% of the system's memory: this is not the maximal size, but some "
 "additional free memory speeds up the suspend and resume process."
 msgstr ""
-"0 betekent de kleinst mogelijke afbeelding. Een lege waarde komt neer op de "
-"standaard waarde van 500MB. De voorgegeven waarde is 45% van het "
+"0 betekent de kleinst mogelijke opslag (image). Een lege waarde komt neer op "
+"de standaardwaarde van 500MB. De programmawaarde is 45% van het "
 "systeemgeheugen; dit is niet de maximale grootte, maar enig extra vrij "
-"geheugen versnelt het in de slaapstand zetten en uit de slaapstand komen."
+"geheugen versnelt het in en uit de slaapstand zetten."
 
 #. Type: string
 #. Description
 #: ../uswsusp.templates:9001
 msgid "Log level for software suspend:"
-msgstr "Wat is het logniveau voor software-suspend?"
+msgstr "Logniveau voor in de slaapstand zetten:"
 
 #. Type: string
 #. Description
@@ -188,9 +190,10 @@
 "resume utilities will use to report the progress of suspend and resume.  On "
 "a stock kernel, messages with levels higher than 7 are usually not shown."
 msgstr ""
-"Gelieve het kernel-console-niveau op te geven dat s2disk/s2both en resume "
-"gebruiken om voortgang te rapporteren. Op een standaardkernel zullen "
-"berichten met een niveau hoger dan 7 gewoonlijk niet worden getoond."
+"Gelieve het kernel-console-niveau op te geven dat s2disk/s2both en uit de "
+"slaapstand komen gebruiken om voortgang te rapporteren. Met een "
+"standaardkernel zullen berichten met een niveau hoger dan 7 gewoonlijk niet "
+"worden getoond."
 
 #. Type: string
 #. Description
@@ -205,14 +208,14 @@
 "Please specify the kernel console log level which the resume utility will "
 "use if the resume fails."
 msgstr ""
-"Gelieve het kernel-console-logniveau aan te geven dat het resume-programma "
-"gebruikt als het uit de slaapstand komen mislukt."
+"Gelieve het kernel-console-logniveau aan te geven dat het programma gebruikt "
+"als het uit de slaapstand komen mislukt."
 
 #. Type: boolean
 #. Description
 #: ../uswsusp.templates:11001
 msgid "Perform checksum on image?"
-msgstr "Integriteitscontrole op afbeelding uitvoeren?"
+msgstr "Integriteitscontrole op opslag (image) uitvoeren?"
 
 #. Type: boolean
 #. Description
@@ -228,7 +231,7 @@
 #. Description
 #: ../uswsusp.templates:12001
 msgid "Compress image?"
-msgstr "Afbeelding comprimeren?"
+msgstr "Opslag (image) comprimeren?"
 
 #. Type: boolean
 #. Description
@@ -239,16 +242,16 @@
 "partition. Generally, it will also make reading and writing the image faster "
 "because there is less to read and write."
 msgstr ""
-"Compressie van de afbeelding met het LZF algoritme zal resulteren in een "
-"kleinere afbeelding, waardoor een kleinere swappartitie nodig is. In het "
-"algemeen zal dit het lezen en schrijven van de afbeelding ook sneller maken, "
+"Compressie van de opslag (image) met het LZF algoritme zal resulteren in een "
+"kleinere opslag, waardoor een kleinere swappartitie nodig is. In het "
+"algemeen zal dit het lezen en schrijven van de opslag ook sneller maken, "
 "omdat er minder te lezen en schrijven valt."
 
 #. Type: boolean
 #. Description
 #: ../uswsusp.templates:13001
 msgid "Perform early write out?"
-msgstr "Afbeelding vroeg weg schrijven?"
+msgstr "Opslag (image) vroeg weg schrijven?"
 
 #. Type: boolean
 #. Description
@@ -258,10 +261,10 @@
 "writing the image to it. This has been reported to speed up suspend on some "
 "systems and eliminate the 'fast progress meter and long fsync wait' effect."
 msgstr ""
-"De synchronisatie van het apparaat waarop de afbeelding wordt bewaard kan "
-"vroeg starten, reeds tijdens het bewaren van de afbeelding. Op sommige "
-"systemen maakt dit het in de slaapstand zetten sneller en elimineert dit het "
-"\"snelle voortgangsmeter en lang wachten op fsync\"-effect."
+"De synchronisatie van het apparaat waarop de opslag (image) wordt bewaard "
+"kan bij het wegschrijven vroeg starten. Op sommige systemen maakt dit het in "
+"de slaapstand zetten sneller en elimineert dit het \"snelle voortgangsmeter "
+"en lang wachten op fsync\"-effect."
 
 #. Type: boolean
 #. Description
@@ -285,7 +288,7 @@
 #. Description
 #: ../uswsusp.templates:15001
 msgid "Encrypt snapshot?"
-msgstr "Afbeelding versleutelen?"
+msgstr "Opslag (image) versleutelen?"
 
 #. Type: boolean
 #. Description
@@ -296,9 +299,9 @@
 "RSA key), you will be prompted for a passphrase. Encryption adds a "
 "significant time to the suspend and resume processes."
 msgstr ""
-"Voor betere beveiliging kan de afbeelding worden versleuteld. Tijdens het "
-"uit de slaapstand komen (en het in de slaapstand zetten, als u geen RSA-"
-"sleutel gebruikt) zal u om een wachtzin worden gevraagd. Versleuteling "
+"Voor betere beveiliging kan de opslag (image) worden versleuteld. Tijdens "
+"het uit de slaapstand komen (en het in de slaapstand zetten, als u geen RSA-"
+"sleutel gebruikt) zal om een wachtzin worden gevraagd. Versleuteling "
 "vergroot de tijd voor het in de slaapstand zetten en uit de slaapstand komen "
 "aanmerkelijk."
 
@@ -342,7 +345,7 @@
 "You will be prompted for a passphrase."
 msgstr ""
 "De sleutel die nodig is voor het RSA-versleutelschema kan nu worden "
-"gegenereerd. U zal om een wachtzin worden gevraagd."
+"gegenereerd. Er zal om een wachtzin worden gevraagd."
 
 #. Type: string
 #. Description
@@ -374,8 +377,8 @@
 msgid ""
 "Please choose the passphrase to use on every resume to decrypt the image."
 msgstr ""
-"Wat is de wachtzin voor het ontsleutelen van de afbeelding, telkens wannneer "
-"het systeem uit de slaapstand gaat?"
+"Wat is de wachtzin voor het ontsleutelen van de opslag (image), telkens "
+"wannneer het systeem uit de slaapstand gaat?"
 
 #. Type: password
 #. Description
@@ -399,7 +402,7 @@
 #. Choices
 #: ../uswsusp.templates:21001
 msgid "shutdown"
-msgstr ""
+msgstr "afsluiten"
 
 #. Type: select
 #. Description
@@ -426,6 +429,3 @@
 msgstr ""
 "Als het op 'platform' staat zal eventueel beschikbare hardware-specifieke "
 "optimalisatie worden gebruikt."
-
-#~ msgid "poweroff"
-#~ msgstr "uitschakelen"
diff -Nru uswsusp-1.0/debian/po/pt_BR.po uswsusp-1.0+20110509/debian/po/pt_BR.po
--- uswsusp-1.0/debian/po/pt_BR.po	2011-03-11 23:53:37.000000000 +0100
+++ uswsusp-1.0+20110509/debian/po/pt_BR.po	2011-09-25 18:18:38.000000000 +0200
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: uswsusp\n"
 "Report-Msgid-Bugs-To: uswsusp@packages.debian.org\n"
-"POT-Creation-Date: 2008-07-26 09:54+0200\n"
+"POT-Creation-Date: 2011-09-25 18:18+0200\n"
 "PO-Revision-Date: 2008-03-05 11:53-0300\n"
 "Last-Translator: Lucas Amorim <lucastronomia@yahoo.com.br>\n"
 "Language-Team: l10n portuguese <debian-l10n-portuguese@lists.debian.org>\n"
diff -Nru uswsusp-1.0/debian/po/pt.po uswsusp-1.0+20110509/debian/po/pt.po
--- uswsusp-1.0/debian/po/pt.po	2011-03-11 23:53:37.000000000 +0100
+++ uswsusp-1.0+20110509/debian/po/pt.po	2011-09-25 18:18:38.000000000 +0200
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: uswsusp 0.8-1.1\n"
 "Report-Msgid-Bugs-To: uswsusp@packages.debian.org\n"
-"POT-Creation-Date: 2008-07-26 09:54+0200\n"
+"POT-Creation-Date: 2011-09-25 18:18+0200\n"
 "PO-Revision-Date: 2008-08-14 00:09+0100\n"
 "Last-Translator: Pedro Ribeiro <p.m42.ribeiro@gmail.com>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
diff -Nru uswsusp-1.0/debian/po/ro.po uswsusp-1.0+20110509/debian/po/ro.po
--- uswsusp-1.0/debian/po/ro.po	2011-03-11 23:53:37.000000000 +0100
+++ uswsusp-1.0+20110509/debian/po/ro.po	2011-09-25 18:18:38.000000000 +0200
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: ro\n"
 "Report-Msgid-Bugs-To: uswsusp@packages.debian.org\n"
-"POT-Creation-Date: 2008-07-26 09:54+0200\n"
+"POT-Creation-Date: 2011-09-25 18:18+0200\n"
 "PO-Revision-Date: 2008-08-04 23:01+0300\n"
 "Last-Translator: Eddy Petrișor <eddy.petrisor@gmail.com>\n"
 "Language-Team: debian-l10-romanian <debian-l10n-romanian@lists.debian.org>\n"
diff -Nru uswsusp-1.0/debian/po/ru.po uswsusp-1.0+20110509/debian/po/ru.po
--- uswsusp-1.0/debian/po/ru.po	2011-03-11 23:53:37.000000000 +0100
+++ uswsusp-1.0+20110509/debian/po/ru.po	2011-09-25 18:18:38.000000000 +0200
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: ru\n"
 "Report-Msgid-Bugs-To: uswsusp@packages.debian.org\n"
-"POT-Creation-Date: 2008-07-26 09:54+0200\n"
+"POT-Creation-Date: 2011-09-25 18:18+0200\n"
 "PO-Revision-Date: 2008-08-17 10:25+0400\n"
 "Last-Translator: Yuri Kozlov <kozlov.y@gmail.com>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
diff -Nru uswsusp-1.0/debian/po/sk.po uswsusp-1.0+20110509/debian/po/sk.po
--- uswsusp-1.0/debian/po/sk.po	2011-03-11 23:53:37.000000000 +0100
+++ uswsusp-1.0+20110509/debian/po/sk.po	2011-09-25 18:18:38.000000000 +0200
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: uswsusp\n"
 "Report-Msgid-Bugs-To: uswsusp@packages.debian.org\n"
-"POT-Creation-Date: 2008-07-26 09:54+0200\n"
+"POT-Creation-Date: 2011-09-25 18:18+0200\n"
 "PO-Revision-Date: 2008-08-18 10:47+0100\n"
 "Last-Translator: Ivan Masár <helix84@centrum.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
diff -Nru uswsusp-1.0/debian/po/sv.po uswsusp-1.0+20110509/debian/po/sv.po
--- uswsusp-1.0/debian/po/sv.po	2011-03-11 23:53:37.000000000 +0100
+++ uswsusp-1.0+20110509/debian/po/sv.po	2011-09-25 18:18:38.000000000 +0200
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: uswsusp\n"
 "Report-Msgid-Bugs-To: uswsusp@packages.debian.org\n"
-"POT-Creation-Date: 2008-07-26 09:54+0200\n"
+"POT-Creation-Date: 2011-09-25 18:18+0200\n"
 "PO-Revision-Date: 2008-08-09 10:56+0100\n"
 "Last-Translator: Martin Bagge <brother@bsnet.se>\n"
 "Language-Team: Swedish <debian-l10n-swedish@lists.debian.org>\n"
diff -Nru uswsusp-1.0/debian/po/templates.pot uswsusp-1.0+20110509/debian/po/templates.pot
--- uswsusp-1.0/debian/po/templates.pot	2011-03-11 23:53:37.000000000 +0100
+++ uswsusp-1.0+20110509/debian/po/templates.pot	2011-09-25 18:18:38.000000000 +0200
@@ -8,10 +8,11 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: uswsusp@packages.debian.org\n"
-"POT-Creation-Date: 2008-07-26 09:54+0200\n"
+"POT-Creation-Date: 2011-09-25 18:18+0200\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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
diff -Nru uswsusp-1.0/debian/po/vi.po uswsusp-1.0+20110509/debian/po/vi.po
--- uswsusp-1.0/debian/po/vi.po	2011-03-11 23:53:37.000000000 +0100
+++ uswsusp-1.0+20110509/debian/po/vi.po	2011-09-25 18:18:38.000000000 +0200
@@ -1,13 +1,13 @@
 # Vietnamese translation for uswsusp.
-# Copyright © 2007 Free Software Foundation, Inc.
-# Clytie Siddall <clytie@riverland.net.au>, 2006-2007.
+# Copyright © 2010 Free Software Foundation, Inc.
+# Clytie Siddall <clytie@riverland.net.au>, 2006-2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: uswsusp 0.6~cvs20070618-2\n"
+"Project-Id-Version: uswsusp 0.8-1.2\n"
 "Report-Msgid-Bugs-To: uswsusp@packages.debian.org\n"
-"POT-Creation-Date: 2008-07-26 09:54+0200\n"
-"PO-Revision-Date: 2007-10-17 18:44+0930\n"
+"POT-Creation-Date: 2011-09-25 18:18+0200\n"
+"PO-Revision-Date: 2010-10-27 21:32+1030\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
 "Language: vi\n"
@@ -15,7 +15,7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: LocFactoryEditor 1.7b1\n"
+"X-Generator: LocFactoryEditor 1.8\n"
 
 #. Type: select
 #. Description
@@ -31,16 +31,16 @@
 "store a system snapshot. Please choose the device to use, from the list of "
 "suitable swap spaces, sorted by size (largest first)."
 msgstr ""
-"Để ngưng hệ thống, uswsusp cần thiết một tập tin hay phân vùng trao đổi "
-"(swap) vào đó cần ghi ảnh chụp hệ thống. Hãy chọn thiết bị cần dùng, trong "
-"danh sách các vùng trao đổi thích hợp được sắp xếp theo kích cỡ (lớn nhất "
-"trước)."
+"Để ngưng hệ thống, uswsusp yêu cầu một phân vùng trao đổi hoặc tập tin trao "
+"đổi vào đó có thể lưu hiện trạng của hệ thống. Hãy chọn thiết bị cần sử "
+"dụng, trong danh sách các vùng trao đổi thích hợp được sắp xếp theo kích cỡ "
+"(từ lớn xuống nhỏ)."
 
 #. Type: error
 #. Description
 #: ../uswsusp.templates:4001
 msgid "No suitable swap space for software suspend"
-msgstr "Không tìm thấy vùng trao đổi thích hợp để ngưng phần mềm"
+msgstr "Không có vùng trao đổi thích với với ngưng phần mềm"
 
 #. Type: error
 #. Description
@@ -49,9 +49,9 @@
 "To be able to suspend the system, uswsusp needs a swap partition or file to "
 "write a system snapshot to. No such space seems to be available for this."
 msgstr ""
-"Để ngưng hệ thống, uswsusp cần thiết một tập tin hay phân vùng trao đổi "
-"(swap) vào đó để ghi ảnh chụp hệ thống. Có vẻ là không có sẵn vùng trao đổi "
-"như vậy."
+"Để ngưng hệ thống, uswsusp yêu cầu một phân vùng trao đổi hoặc tập tin trao "
+"đổi vào đó có thể lưu hiện trạng của hệ thống. Có vẻ là không có sẵn sàng "
+"sức chứa thích hợp."
 
 #. Type: error
 #. Description
@@ -60,8 +60,8 @@
 "You should create a swap partition or file, preferably twice the size of the "
 "system's physical RAM."
 msgstr ""
-"Khuyên bạn tạo một tập tin hay phân vùng trao đổi có kích cỡ gấp đôi bộ nhớ "
-"RAM của hệ thống."
+"Bạn nên tạo một phân vùng trao đổi hoặc tập tin trao đổi có kích cỡ hai lần "
+"vùng nhớ RAM vật lý của hệ thống."
 
 #. Type: error
 #. Description
@@ -69,14 +69,14 @@
 msgid ""
 "Then, run 'dpkg-reconfigure uswsusp' or edit the configuration file manually."
 msgstr ""
-"Sau đó, chạy lệnh cấu hình lại gói « dpkg-reconfigure uswsusp », hoặc tự "
-"chỉnh sửa tập tin cấu hình."
+"Sau đó thì chạy câu lệnh cấu hình lại gói « dpkg-reconfigure uswsusp », hoặc "
+"chỉnh sửa bằng tay tập tin cấu hình."
 
 #. Type: error
 #. Description
 #: ../uswsusp.templates:5001
 msgid "No userspace software suspend support in the kernel"
-msgstr "Hạt nhân không hỗ trợ chức năng ngưng phần mềm vùng người dùng"
+msgstr "Hạt nhân này không hỗ trợ chức năng ngưng phần mềm vùng người dùng"
 
 #. Type: error
 #. Description
@@ -85,14 +85,14 @@
 "The current kernel doesn't support userspace software suspend. Please "
 "recompile the kernel with the 'CONFIG_HIBERNATION=y' option."
 msgstr ""
-"Hạt nhân hiện thời không hỗ trợ khả năng ngưng phần mềm kiểu vùng người "
+"Hạt nhân hiện thời không hỗ trợ chức năng ngưng phần mềm kiểu vùng người "
 "dùng. Hãy biên dịch lại hạt nhân với tùy chọn « CONFIG_HIBERNATION=y »."
 
 #. Type: boolean
 #. Description
 #: ../uswsusp.templates:6001
 msgid "Continue without a valid swap space?"
-msgstr "Tiếp tục mà không có vùng trao đổi hợp lệ không?"
+msgstr "Tiếp tục mà không có vùng trao đổi hợp lệ ?"
 
 #. Type: boolean
 #. Description
@@ -101,8 +101,8 @@
 "The swap file or partition that was found in uswsusp's configuration file is "
 "not active."
 msgstr ""
-"Tập tin cấu hình của uswsusp chứa tập tin hay phân vùng trao đổi không hoạt "
-"động."
+"Tập tin cấu hình của uswsusp chứa một tập tin trao đổi hoặc phân vùng trao "
+"đổi mà không hoạt động."
 
 #. Type: boolean
 #. Description
@@ -111,8 +111,9 @@
 "In most cases this means userspace software suspend will not work as "
 "expected. You should choose another swap space."
 msgstr ""
-"Trong phần lớn trường hợp có nghĩa là chức năng ngưng phần mềm vùng người "
-"dùng sẽ không chạy được. Khuyên bạn chọn vùng trao đổi khác."
+"Trong phần lớn các trường hợp có nghĩa là chức năng ngưng phần mềm vùng "
+"người dùng sẽ không chạy như mong đợi. Khuyên bạn chọn một vùng trao đổi "
+"khác."
 
 #. Type: boolean
 #. Description
@@ -135,8 +136,9 @@
 "be OK in almost all cases. Don't change this unless there is a good reason "
 "to do so."
 msgstr ""
-"Bỏ rỗng thì dùng giá trị mặc định cài cứng, «  /dev/snapshot ». Nó nên thích "
-"hợp trong gần mọi trường hợp. Đừng thay đổi nó nếu bạn không có lý do tốt."
+"Bỏ trống trường này thì dùng giá trị mặc định cài cứng, «  /dev/snapshot ». "
+"Nó nên thích hợp trong gần mọi trường hợp. Đừng thay đổi nó nếu không có một "
+"lý do tốt."
 
 #. Type: string
 #. Description
@@ -148,7 +150,7 @@
 #. Description
 #: ../uswsusp.templates:8001
 msgid "Please specify a maximum system snapshot image size (in bytes)."
-msgstr "Hãy ghi rõ kích cỡ ảnh chụp hệ thống tối đa (theo byte)."
+msgstr "Hãy ghi rõ kích cỡ ảnh hiện trạng hệ thống tối đa (theo byte)."
 
 #. Type: string
 #. Description
@@ -157,8 +159,8 @@
 "This limit is not strict; the uswsusp does its best to respect it, but will "
 "exceed the specified limit if suspend needs a bigger image."
 msgstr ""
-"Hạn chế không chặt chẽ: uswsusp thử tùy theo, chỉ vượt quá nếu ảnh lớn hơn "
-"cần thiết."
+"Hạn chế này không chặt chẽ: uswsusp thử tùy theo, chỉ vượt quá nếu ảnh lớn "
+"hơn cần thiết."
 
 #. Type: string
 #. Description
@@ -170,10 +172,10 @@
 "value is 45% of the system's memory: this is not the maximal size, but some "
 "additional free memory speeds up the suspend and resume process."
 msgstr ""
-"Đặt giá trị 0 thì ép buộc tạo ảnh chụp nhỏ nhất có thể. Bỏ rỗng thì đặt giá "
-"trị mặc định cài cứng (500 MB). Giá trị mặc định là 45% bộ nhớ của hệ thống: "
-"không phải kích cỡ tối đa, nhưng một phần bộ nhớ còn rảnh sẽ tăng tốc độ "
-"chạy tiến trình ngưng và tiếp tục lại."
+"Lập giá trị 0 thì ép buộc tạo ảnh hiện trạng nhỏ nhất có thể. Bỏ trống "
+"trường này thì lập giá trị mặc định cài cứng (500 MB). Giá trị mặc định là "
+"45% vùng nhớ của hệ thống: không phải kích cỡ tối đa, nhưng một phần vùng "
+"nhớ còn rảnh cũng tăng tốc độ chạy tiến trình ngưng và tiếp tục lại."
 
 #. Type: string
 #. Description
@@ -191,7 +193,8 @@
 msgstr ""
 "Hãy ghi rõ cấp ghi lưu ra bàn giao tiếp hạt nhân cho tiện ích s2disk/s2both "
 "và resume sử dụng để thông báo tiến hành của chức năng ngưng và tiếp tục "
-"lại. Khi chạy hạt nhân chuẩn, thường không hiển thị thông điệp ở cấp lên 7."
+"lại. Khi chạy một hạt nhân tiêu chuẩn, bình thường không hiển thị thông điệp "
+"ở cấp lên 7."
 
 #. Type: string
 #. Description
@@ -213,7 +216,7 @@
 #. Description
 #: ../uswsusp.templates:11001
 msgid "Perform checksum on image?"
-msgstr "Kiểm tổng ảnh không?"
+msgstr "Kiểm tổng về ảnh ?"
 
 #. Type: boolean
 #. Description
@@ -223,13 +226,13 @@
 "is slightly safer, but also takes more time."
 msgstr ""
 "Việc kiểm tra tổng số (checksum) dùng thuật toán MD5 để thẩm tra tính nguyên "
-"vẹn của ảnh là an toàn hơn một ít, còn cũng chiếm thời gian thêm."
+"vẹn của ảnh thì hơi an toàn hơn, còn cũng chiếm thêm thời gian."
 
 #. Type: boolean
 #. Description
 #: ../uswsusp.templates:12001
 msgid "Compress image?"
-msgstr "Nén ảnh không?"
+msgstr "Nén ảnh ?"
 
 #. Type: boolean
 #. Description
@@ -240,15 +243,15 @@
 "partition. Generally, it will also make reading and writing the image faster "
 "because there is less to read and write."
 msgstr ""
-"Việc nén ảnh bằng thuật toán nén LZF sẽ gây ra ảnh nhỏ hơn, mà cho khả năng "
-"ngưng với phân vùng trao đổi nhỏ hơn. Thường cũng cho khả năng đọc và ghi "
-"ảnh một cách nhanh hơn, vì kém kích cỡ hơn cần đọc và ghi."
+"Việc nén ảnh bằng thuật toán nén LZF gây ra một ảnh nhỏ hơn thì làm cho có "
+"thể ngưng với một phân vùng trao đổi nhỏ hơn. Nói chung nó cũng làm cho "
+"nhanh hơn đọc/ghi ảnh vì có ít dữ liệu hơn cần đọc và ghi nhớ."
 
 #. Type: boolean
 #. Description
 #: ../uswsusp.templates:13001
 msgid "Perform early write out?"
-msgstr "Ghi ra sớm không?"
+msgstr "Ghi ra sớm ?"
 
 #. Type: boolean
 #. Description
@@ -259,15 +262,15 @@
 "systems and eliminate the 'fast progress meter and long fsync wait' effect."
 msgstr ""
 "Chức năng đồng bộ hoá thiết bị tiếp tục lại có thể bắt đầu sớm trong tiến "
-"trình ghi ảnh vào nó. Người dùng đã thông báo tùy chọn này tăng tốc độ ngưng "
-"trên một số hệ thống riêng, cũng ngăn cản hiệu ứng « cái đo tiến hành chạy "
-"nhanh còn đợi lâu fsync »."
+"trình ghi ảnh vào nó. Người dùng đã thông báo rằng tùy chọn này tăng tốc độ "
+"ngưng trên một số hệ thống nào đó, cũng tránh có hiệu ứng « cái đo tiến hành "
+"chạy nhanh còn đợi lâu fsync »."
 
 #. Type: boolean
 #. Description
 #: ../uswsusp.templates:14001
 msgid "Show splash screen?"
-msgstr "Hiện màn hình giật gân không?"
+msgstr "Hiện màn hình giật gân ?"
 
 #. Type: boolean
 #. Description
@@ -277,15 +280,15 @@
 "shown during the suspend and resume process. This requires the splashy "
 "package to be installed."
 msgstr ""
-"Thay cho kết xuất thông tin, phần mềm này có thể hiển thị màn hình giật gân "
-"đẹp với thanh tiến hành trong tiến trình ngưng và tiếp tục lại. Nó cần thiết "
-"bạn cài đặt gói « splashy »."
+"Thay cho kết xuất đầy thông tin, phần mềm này có thể hiển thị một màn hình "
+"giật gân đẹp với thanh tiến hành trong tiến trình ngưng và tiếp tục lại. Nó "
+"cũng yêu cầu cài đặt gói « splashy »."
 
 #. Type: boolean
 #. Description
 #: ../uswsusp.templates:15001
 msgid "Encrypt snapshot?"
-msgstr "Mật mã hoá ảnh chụp không?"
+msgstr "Mật mã hoá hiện trạng ?"
 
 #. Type: boolean
 #. Description
@@ -296,10 +299,10 @@
 "RSA key), you will be prompted for a passphrase. Encryption adds a "
 "significant time to the suspend and resume processes."
 msgstr ""
-"Để bảo mật hơn, cũng có thể mật mã hoá ảnh chụp hệ thống được ghi vào đĩa "
-"trong khi ngưng. Khi tiếp tục lại (và khi ngưng, nếu bạn không sử dụng khoá "
-"RSA), bạn sẽ được nhắc gõ cụm từ mật khẩu. Chức năng mật mã hoá sẽ thêm thời "
-"gian đáng kể vào tiến trình ngưng và tiếp tục lại."
+"Để bảo mật hơn, cũng có thể mật mã hoá ảnh hiện trạng hệ thống được ghi vào "
+"đĩa trong khi ngưng. Vào lúc tiếp tục lại (và vào lúc ngưng, nếu bạn không "
+"sử dụng khoá RSA), bạn sẽ được nhắc gõ cụm từ mật khẩu. Chức năng mật mã hoá "
+"cũng thêm thời gian đáng kể vào tiến trình ngưng và tiếp tục lại."
 
 #. Type: string
 #. Description
@@ -314,8 +317,8 @@
 "To avoid the need for a passphrase prompt during each suspend, an RSA key "
 "can be used to encrypt the image."
 msgstr ""
-"Để tránh trường hợp cần phải gõ cụm từ mật khẩu mỗi lần ngưng, cũng có thể "
-"sử dụng khoá RSA để mật mã hoá ảnh."
+"Để tránh yêu cầu gõ cụm từ mật khẩu mỗi lần ngưng, cũng có thể sử dụng một "
+"khoá RSA để mật mã hoá ảnh."
 
 #. Type: string
 #. Description
@@ -323,13 +326,15 @@
 msgid ""
 "Please specify the path to that file. Leave this field empty to not use an "
 "RSA key."
-msgstr "Hãy ghi rõ đường dẫn đến tập tin đó. Bỏ rỗng thì không dùng khoá RSA."
+msgstr ""
+"Hãy ghi rõ đường dẫn đến tập tin đó. Bỏ trống trường này thì không dùng khoá "
+"RSA."
 
 #. Type: boolean
 #. Description
 #: ../uswsusp.templates:17001
 msgid "Create an RSA key?"
-msgstr "Tạo khoá RSA không?"
+msgstr "Tạo khoá RSA ?"
 
 #. Type: boolean
 #. Description
@@ -355,8 +360,8 @@
 "4096). A bigger key increases the encryption strength but slows down the "
 "encryption process."
 msgstr ""
-"Hãy ghi rõ kích cỡ của khoá RSA (số bit từ 1024 đến 4096). Khoá lớn hơn thì "
-"bảo mật hơn, còn giảm tốc độ chạy tiến trình mật mã."
+"Hãy ghi rõ kích cỡ của khoá RSA (số các bit từ 1024 đến 4096). Khoá lớn hơn "
+"thì bảo mật hơn còn giảm tốc độ chạy tiến trình mật mã."
 
 #. Type: password
 #. Description
@@ -394,7 +399,7 @@
 #. Choices
 #: ../uswsusp.templates:21001
 msgid "shutdown"
-msgstr ""
+msgstr "tắt máy"
 
 #. Type: select
 #. Description
@@ -409,8 +414,8 @@
 "If this parameter is set to 'reboot', the s2disk utility will reboot the "
 "machine rather than powering down. This can be useful for testing purposes."
 msgstr ""
-"Đặt tham số này thành « khởi động lại » (reboot) thì tiện ích s2disk sẽ khởi "
-"động lại máy, thay vào tắt máy. Có ích khi thử."
+"Lập tham số này thành « khởi động lại » (reboot) thì tiện ích s2disk khởi "
+"động lại máy thay vào tắt máy. Có ích khi thử."
 
 #. Type: select
 #. Description
@@ -419,8 +424,5 @@
 "If it is set to 'platform', hardware-specific optimization is used if "
 "available."
 msgstr ""
-"Đặt thành « nền tảng » (platform) thì dùng chức năng tối ưu hoá đặc trưng "
+"Lập thành « nền tảng » (platform) thì dùng chức năng tối ưu hoá đặc trưng "
 "cho phần cứng (nếu có sẵn)."
-
-#~ msgid "poweroff"
-#~ msgstr "tắt máy"
diff -Nru uswsusp-1.0/debian/README.Debian uswsusp-1.0+20110509/debian/README.Debian
--- uswsusp-1.0/debian/README.Debian	2011-03-11 23:53:37.000000000 +0100
+++ uswsusp-1.0+20110509/debian/README.Debian	2011-05-06 00:09:22.000000000 +0200
@@ -5,12 +5,12 @@
 above. Proper support for s2both on powerpc appeared in version 2.6.22. You 
 will also need a swap partition or file. For swap file support you need kernel 
 version 2.6.20 or above, swapfile in a LVM partition has a bug and is currently
-not working. Finally, you need and an initramfs to start the resume process. If
+not working. Finally, you need an initramfs to start the resume process. If
 you are using initramfs-tools to generate your initramfs you're in luck; this 
 package provides the necessary hooks and scripts to make it happen. 
 
-During install a suitable configuration will be written to /etc/uswsusp.conf
-If your not happy with it you can choose to alter it by hand or by running
+During install a suitable configuration will be written to /etc/uswsusp.conf;
+if you're not happy with it you can choose to alter it by hand or by running
     dpkg-reconfigure uswsusp
 If you change it by hand you should run
     update-initramfs -u 
@@ -21,7 +21,7 @@
 you boot an older kernel. You can set update_initramfs=all in 
 /etc/initramfs-tools/update-initramfs.conf to let it update all initramfses.
 
-NOTE2, if you have both update-initramfs and yaird installed there is a 
+NOTE 2, if you have both update-initramfs and yaird installed there is a 
 possibility that running dpkg-reconfigure won't create an initrd for you.
 You should run update-initramfs by hand (possibly with -t).
 
@@ -34,13 +34,13 @@
 s2both will try to suspend to ram (S3) after making the snapshot. 
 This is a bit more tricky. Usually there are some issues with the graphics
 card, which most of the time can be worked around.
-It will only try suspend to ram if a work around for your system is known 
+It will only try suspend to ram if a workaround for your system is known 
 (or known not to be necessary). You can check if your system is known by
 running 
     s2ram -n
 If it is, you can use s2both. If not you can try and experiment with
 s2ram to find a workaround for your system. Read README.s2ram-whitelist
-for instructions. If you find a work around, please send a report to either
+for instructions. If you find a workaround, please send a report to either
 the debian BTS or directly to the upstream authors.
 
 The uswsusp system supports encrypting the image written to disk. The
@@ -52,13 +52,13 @@
 should be typed as if one has a non-us keymap. This will hopefully be
 fixed soon.
 
-It also supports two splash systems. The one from bootsplash.org and
+It also supports two splash systems, the one from bootsplash.org and
 splashy. The latter is an userspace implementation. For it to work
 you need to install splashy and a splashy theme. Be carefull not to use
 splashy-from-initramfs (not the default) and uswsusp's splash support
 at the same time.
 
-Userspace suspend is designed to be very flexible; If the custom set up 
+Userspace suspend is designed to be very flexible; if the custom setup 
 doesn't suit you it can be extended to your needs. 
 This sofware is very much in its alpha stages and can cause severe 
 data corruption when used wrongly. Please read the README and HOWTO
diff -Nru uswsusp-1.0/debian/rules uswsusp-1.0+20110509/debian/rules
--- uswsusp-1.0/debian/rules	2011-04-30 12:15:23.000000000 +0200
+++ uswsusp-1.0+20110509/debian/rules	2011-11-18 20:14:01.000000000 +0100
@@ -1,21 +1,13 @@
 #!/usr/bin/make -f
 #
 # Copyright 2006 Tim Dijstra <tim@famdijkstra.org>
-#
-# Based on output from dh_make
+# Upgraded by Rodolfo García Peñas (kix) <kix@kix.es>
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-include /usr/share/quilt/quilt.make
-
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-MANPAGES=s2disk.8 s2ram.8 swap-offset.8 uswsusp.conf.5 suspend-keygen.8
-
+DEB_HOST_GNU_TYPE	?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE	?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 CFLAGS = -Wall -g
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -27,25 +19,23 @@
 #CFLAGS += `pkg-config --cflags glib-2.0`
 #SPLASHY_LIBS = -L/lib -lsplashy -lgcc_s
 SPLASHY_LIBS = -L/lib -lgcc_s
+DB2MAN=/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl
+XP=xsltproc -''-nonet
 
-%.5: debian/%.xml
-	docbook2x-man $<
+%:
+	dh $@
 
-%.8: debian/%.xml
-	docbook2x-man $<
-
-config.status:
+override_dh_auto_configure:
 	dh_testdir
-	# Add here commands to configure the package.
 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
-	#./autogen.sh
-	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
-		--prefix=/usr \
+	dh_auto_configure -- --host=$(DEB_HOST_GNU_TYPE) \
+		--build=$(DEB_BUILD_GNU_TYPE) \
+		-prefix=/usr \
 		--sysconfdir=/etc \
 		--localstatedir=/var \
 		--mandir=\$${prefix}/share/man \
@@ -58,71 +48,59 @@
 		--enable-encrypt \
 		CFLAGS="$(CFLAGS)"
 
-build: build-stamp
-
-build-stamp: patch config.status $(MANPAGES)
-	dh_testdir
-
-	# Add here commands to compile the package.
-	$(MAKE)
-
-	chmod 755 debian/initramfs-tools/scripts/local-premount/* \
-			debian/initramfs-tools/hooks/*
-	
-	touch $@
-
-clean: clean-source unpatch
-clean-source:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp
-
-	# Add here commands to clean up after the build process.
-	[ ! -f Makefile ] || $(MAKE) distclean
-	rm -f $(MANPAGES)
-	rm -f config.guess config.sub
-
-	#debconf-updatepo
-
-	dh_clean 
+override_dh_clean:
+	dh_clean
+	rm -f config.sub config.guess
 
-install: build
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_installdirs
-
-	# Add here commands to install the package into debian/uswsusp.
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/uswsusp
+#build-stamp: patch config.status
+#	dh_testdir
+#
+#	# Add here commands to compile the package.
+#	$(MAKE)
+#
+#	chmod 755 debian/initramfs-tools/scripts/local-premount/* \
+#			debian/initramfs-tools/hooks/*
+#	
+#	touch $@
+#
+#clean-source:
+#	dh_testdir
+#	dh_testroot
+#	rm -f build-stamp
+#
+#	# Add here commands to clean up after the build process.
+#	[ ! -f Makefile ] || $(MAKE) distclean
+#
+#	debconf-updatepo
+#
+#	dh_clean 
 
-	# We don't want upstreams config file. 
-	# Remove it here so I don't forget to patch the Makefile
+override_dh_install:
+	dh_install
+#install: build
+#	dh_testdir
+#	dh_testroot
+#	dh_prep
+#	dh_installdirs
+#
+#	# Add here commands to install the package into debian/uswsusp.
+#	$(MAKE) install DESTDIR=$(CURDIR)/debian/uswsusp
+#
+#	# We don't want upstreams config file. 
+#	# Remove it here so I don't forget to patch the Makefile
 	rm -f $(CURDIR)/debian/uswsusp/etc/suspend.conf
 	rm -f $(CURDIR)/debian/uswsusp/usr/share/doc/uswsusp/COPYING*
 	rm -rf $(CURDIR)/debian/uswsusp/dev
 
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
 
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs
-	dh_installdocs
-	dh_install
-	dh_installdebconf
-	dh_installman
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb -- -Zbzip2 -z9
+override_dh_auto_build:
+	$(XP) -o debian/ \
+	--param make.year.ranges 1 \
+	--param make.single.year.ranges 1 \
+	--param man.charmap.use.subset 0 \
+	$(DB2MAN) \
+	debian/s2disk.8.xml debian/s2ram.8.xml \
+	debian/swap-offset.8.xml debian/suspend-keygen.8.xml \
+	debian/uswsusp.conf.5.xml
+	dh_auto_build
 
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install 
diff -Nru uswsusp-1.0/debian/s2disk.8 uswsusp-1.0+20110509/debian/s2disk.8
--- uswsusp-1.0/debian/s2disk.8	1970-01-01 01:00:00.000000000 +0100
+++ uswsusp-1.0+20110509/debian/s2disk.8	2011-09-25 23:37:44.000000000 +0200
@@ -0,0 +1,129 @@
+'\" t
+.\"     Title: s2disk
+.\"    Author: TimTim DijkstraDijkstra <tim@famdijkstra.org>
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
+.\"      Date: juni 24, 2006
+.\"    Manual: s2disk
+.\"    Source: uswsusp
+.\"  Language: English
+.\"
+.TH "S2DISK" "8" "juni 24, 2006" "uswsusp" "s2disk"
+.\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
+.\" * set default formatting
+.\" -----------------------------------------------------------------
+.\" disable hyphenation
+.nh
+.\" disable justification (adjust text to left margin only)
+.ad l
+.\" -----------------------------------------------------------------
+.\" * MAIN CONTENT STARTS HERE *
+.\" -----------------------------------------------------------------
+.SH "NAME"
+s2disk \- program to suspend to disk (hibernate)
+.SH "SYNOPSIS"
+.HP \w'\fBs2disk\fR\ 'u
+\fBs2disk\fR [\-h,\ \-\-help] [\-V,\ \-\-version] [\-f,\ \-\-config\ \fIconfig_file\fR] [\-r,\ \-\-resume_device\ \fIdevice\fR] [\-o,\ \-\-resume_offset\ \fIoffset\fR] [\-s,\ \-\-image_size\ \fIsize\fR] [\-P,\ \-\-parameter\ \fIparameter\fR]
+.HP \w'\fBresume\fR\ 'u
+\fBresume\fR
+.SH "DESCRIPTION"
+.PP
+This manual page documents briefly the
+\fBs2disk\fR,
+\fBs2both\fR
+and
+\fBresume\fR
+commands\&.
+.PP
+This manual page was written for the
+Debian(TM)
+distribution because the original program does not have a manual page\&.
+.PP
+\fBs2disk\fR
+is a program that will save the state of the whole system to disk and power off your system\&. After restarting your system it will be put back in the exact system state you left it (this is sometimes called hibernation)\&.
+.PP
+\fBs2both\fR
+will do precisly the same as
+\fBs2disk\fR
+except that it will not power off the system, but will suspend it to ram (put the system in S3 mode)\&. This has the advantage that resume will be faster, with the disadvantage that you still use batteries\&. If they batteries do deplete, you still have the system state saved to disk and can resume without data loss\&. The
+\fBs2both\fR
+command also inherits all command line arguments from
+\fBs2ram\fR\&.
+.PP
+You will need to set up an initramfs which calls the
+\fBresume\fR
+program for this to work\&. If you use an
+Debian(TM)
+kernel package which was made with the \-\-initrd option and you use mkinitramfs\-tools, this package should include the necessary parts on your initramfs\&.
+.PP
+The uswsusp system supports encrypting the image written to disk and features a splash system, see uswsusp\&.conf(8) for more information
+.SH "OPTIONS"
+.PP
+\fB\-f, \-\-config [file]\fR
+.RS 4
+Specify alternate configuration file\&.
+.RE
+.PP
+\fB\-h, \-\-help\fR
+.RS 4
+Display help\&.
+.RE
+.PP
+\fB\-r, \-\-resume_device [device]\fR
+.RS 4
+Device that contains swap area\&.
+.RE
+.PP
+\fB\-o, \-\-resume_offset [offset]\fR
+.RS 4
+Offset of swap file in resume device\&.
+.RE
+.PP
+\fB\-s, \-\-image_size [size]\fR
+.RS 4
+Desired size of the image\&.
+.RE
+.PP
+\fB\-P, \-\-parameter [key=value]\fR
+.RS 4
+Override any config file parameter (see uswsusp\&.conf(8))\&.
+.RE
+.PP
+For the meaning and use of the resume_size, resume_offset and image_size options see uswsusp\&.conf(8)\&.
+.SH "SEE ALSO"
+.PP
+uswsusp\&.conf(8), suspend\-keygen(8), s2ram(8)
+.PP
+For more information see the
+HOWTO
+and the
+README
+.SH "AUTHOR"
+.PP
+This manual page was written by Tim Dijkstra
+tim@famdijkstra\&.org
+for the
+Debian(TM)
+system (but may be used by others)\&. Permission is granted to copy, distribute and/or modify this document under the terms of the
+GNU
+General Public License, Version 2 any later version published by the Free Software Foundation\&.
+.PP
+On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL\&.
+.SH "AUTHOR"
+.PP
+\fBTimTim DijkstraDijkstra\fR <\&tim@famdijkstra\&.org\&> <\&tim@famdijkstra\&.org\&>
+.RS 4
+Wrote this manpage for the Debian system\&.
+.RE
+.SH "COPYRIGHT"
+.br
+Copyright \(co 2006 Tim Dijkstra
+.br
diff -Nru uswsusp-1.0/debian/s2disk.8.xml uswsusp-1.0+20110509/debian/s2disk.8.xml
--- uswsusp-1.0/debian/s2disk.8.xml	1970-01-01 01:00:00.000000000 +0100
+++ uswsusp-1.0+20110509/debian/s2disk.8.xml	2011-09-25 18:58:27.000000000 +0200
@@ -0,0 +1,218 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+
+<!--
+
+Process this file with an XSLT processor: `xsltproc \
+-''-nonet /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/\
+manpages/docbook.xsl manpage.dbk'.  A manual page
+<package>.<section> will be generated.  You may view the
+manual page with: nroff -man <package>.<section> | less'.  A
+typical entry in a Makefile or Makefile.am is:
+
+DB2MAN=/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/\
+manpages/docbook.xsl
+XP=xsltproc -''-nonet
+
+manpage.1: manpage.dbk
+        $(XP) $(DB2MAN) $<
+    
+The xsltproc binary is found in the xsltproc package.  The
+XSL files are in docbook-xsl.  Please remember that if you
+create the nroff version in one of the debian/rules file
+targets (such as build), you will need to include xsltproc
+and docbook-xsl in your Build-Depends control field.
+
+-->
+
+  <!-- Fill in your name for FIRSTNAME and SURNAME. -->
+  <!ENTITY dhfirstname  "<firstname>Tim</firstname>">
+  <!ENTITY dhsurname    "<surname>Dijkstra</surname>">
+  <!-- Please adjust the date whenever revising the manpage. -->
+  <!ENTITY dhdate       "<date>juni 24, 2006</date>">
+  <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
+       allowed: see man(7), man(1). -->
+  <!ENTITY dhsection    "<manvolnum>8</manvolnum>">
+  <!ENTITY dhemail      "<email>tim@famdijkstra.org</email>">
+  <!ENTITY dhusername   "Tim Dijkstra">
+  <!ENTITY dhucpackage  "<refentrytitle>s2disk</refentrytitle>">
+  <!ENTITY dhpackage    "uswsusp">
+  <!ENTITY dhprogram    "s2disk">
+  <!ENTITY dhtitle      "s2disk">
+  <!ENTITY dhsuspend    "s2disk">
+  <!ENTITY dhs2both	"s2both">
+  <!ENTITY dhs2ram	"s2ram">
+  <!ENTITY dhresume     "resume">
+  <!ENTITY dhconfig	"uswsusp.conf">
+  <!ENTITY dhkeygen	"suspend-keygen">
+  <!ENTITY dhswapoffset "swap-offset">
+
+  <!ENTITY debian      "<productname>Debian</productname>">
+  <!ENTITY gnu         "<acronym>GNU</acronym>">
+  <!ENTITY gpl         "&gnu; <acronym>GPL</acronym>">
+]>
+
+<refentry>
+  <refentryinfo>
+    <title>&dhtitle;</title>
+    <productname>&dhpackage;</productname>
+    <authorgroup>
+      <author>
+       <firstname>&dhfirstname;</firstname>
+        <surname>&dhsurname;</surname>
+        <contrib>Wrote this manpage for the Debian system.</contrib>
+        <address>
+          <email>&dhemail;</email>
+        </address>
+      </author>
+    </authorgroup>
+    <copyright>
+      <year>2006</year>
+      <holder>&dhusername;</holder>
+    </copyright>
+    &dhdate;
+  </refentryinfo>
+  <refmeta>
+    &dhucpackage;
+
+    &dhsection;
+  </refmeta>
+  <refnamediv>
+    <refname>&dhprogram;</refname>
+
+    <refpurpose>program to suspend to disk (hibernate)</refpurpose>
+  </refnamediv>
+  <refsynopsisdiv>
+    <cmdsynopsis>
+	<command>&dhsuspend;</command>
+
+	<arg>-h, --help</arg>
+	<arg>-V, --version</arg>
+	<arg>-f, --config <replaceable>config_file</replaceable></arg>
+	<arg>-r, --resume_device <replaceable>device</replaceable></arg>
+	<arg>-o, --resume_offset <replaceable>offset</replaceable></arg>
+	<arg>-s, --image_size <replaceable>size</replaceable></arg>
+	<arg>-P, --parameter <replaceable>parameter</replaceable></arg>     
+
+    </cmdsynopsis>
+    <cmdsynopsis>
+      <command>&dhresume;</command>
+    </cmdsynopsis>
+
+  </refsynopsisdiv>
+  <refsect1>
+    <title>DESCRIPTION</title>
+
+    <para>This manual page documents briefly the
+      <command>&dhsuspend;</command>, <command>&dhs2both;</command> and <command>&dhresume;</command>
+      commands.</para>
+
+    <para>This manual page was written for the &debian; distribution
+      because the original program does not have a manual page.</para>
+
+    <para><command>&dhsuspend;</command> is a program that will save 
+    the state of the whole system to disk and power off your system.
+    After restarting your system it will be put back in the exact system state
+    you left it (this is sometimes called hibernation).
+    </para>
+    <para><command>&dhs2both;</command> will do precisly the same as 
+    <command>&dhsuspend;</command> except that it will not power off the 
+    system, but will suspend it to ram (put the system in S3 mode). This
+    has the advantage that resume will be faster, with the disadvantage
+    that you still use batteries. If they batteries do deplete, you still
+    have the system state saved to disk and can resume without data loss.
+    The <command>&dhs2both;</command> command also inherits all command line
+    arguments from <command>&dhs2ram;</command>.
+    </para>
+    <para>
+    You will need to set up an initramfs which calls the 
+    <command>&dhresume;</command> program for this to work. If you use an 
+    &debian; kernel package which was made with the --initrd option and you use 
+    mkinitramfs-tools, this package should include the necessary parts on your 
+    initramfs.
+    </para>
+    <para>
+    The uswsusp system supports encrypting the image written to disk
+    and features a splash system, see &dhconfig;(8) for more information
+    </para>
+
+  </refsect1>
+  <refsect1>
+    <title>OPTIONS</title>
+
+    <variablelist>
+      <varlistentry>
+        <term><option>-f, --config [file]</option>
+        </term>
+        <listitem>
+          <para>Specify alternate configuration file.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>-h, --help</option>
+        </term>
+        <listitem>
+          <para>Display help.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>-r, --resume_device [device]</option>
+        </term>
+        <listitem>
+          <para>Device that contains swap area.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>-o, --resume_offset [offset]</option>
+        </term>
+        <listitem>
+          <para>Offset of swap file in resume device.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>-s, --image_size [size]</option>
+        </term>
+        <listitem>
+          <para>Desired size of the image.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>-P, --parameter [key=value]</option>
+        </term>
+        <listitem>
+          <para>Override any config file parameter (see &dhconfig;(8)).</para>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+    <para>
+	For the meaning and use of the resume_size, resume_offset and
+	image_size options see &dhconfig;(8).
+    </para>
+  </refsect1>
+  <refsect1>
+    <title>SEE ALSO</title>
+
+    <para>&dhconfig;(8), &dhkeygen;(8), &dhs2ram;(8)</para>
+
+    <para>For more information see the <citetitle>HOWTO</citetitle> and
+    the <citetitle>README</citetitle></para>
+  </refsect1>
+  <refsect1>
+    <title>AUTHOR</title>
+
+    <para>This manual page was written by &dhusername; &dhemail; for
+      the &debian; system (but may be used by others).  Permission is
+      granted to copy, distribute and/or modify this document under
+      the terms of the &gnu; General Public License, Version 2 any 
+	  later version published by the Free Software Foundation.
+    </para>
+	<para>
+	  On Debian systems, the complete text of the GNU General Public
+	  License can be found in /usr/share/common-licenses/GPL.
+	</para>
+
+  </refsect1>
+</refentry>
+
diff -Nru uswsusp-1.0/debian/s2disk.xml uswsusp-1.0+20110509/debian/s2disk.xml
--- uswsusp-1.0/debian/s2disk.xml	2011-03-11 23:53:36.000000000 +0100
+++ uswsusp-1.0+20110509/debian/s2disk.xml	1970-01-01 01:00:00.000000000 +0100
@@ -1,213 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-
-<!--
-
-Process this file with an XSLT processor: `xsltproc \
--''-nonet /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/\
-manpages/docbook.xsl manpage.dbk'.  A manual page
-<package>.<section> will be generated.  You may view the
-manual page with: nroff -man <package>.<section> | less'.  A
-typical entry in a Makefile or Makefile.am is:
-
-DB2MAN=/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/\
-manpages/docbook.xsl
-XP=xsltproc -''-nonet
-
-manpage.1: manpage.dbk
-        $(XP) $(DB2MAN) $<
-    
-The xsltproc binary is found in the xsltproc package.  The
-XSL files are in docbook-xsl.  Please remember that if you
-create the nroff version in one of the debian/rules file
-targets (such as build), you will need to include xsltproc
-and docbook-xsl in your Build-Depends control field.
-
--->
-
-  <!-- Fill in your name for FIRSTNAME and SURNAME. -->
-  <!ENTITY dhfirstname "<firstname>Tim</firstname>">
-  <!ENTITY dhsurname   "<surname>Dijkstra</surname>">
-  <!-- Please adjust the date whenever revising the manpage. -->
-  <!ENTITY dhdate      "<date>juni 24, 2006</date>">
-  <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
-       allowed: see man(7), man(1). -->
-  <!ENTITY dhsection   "<manvolnum>8</manvolnum>">
-  <!ENTITY dhemail     "<email>tim@famdijkstra.org</email>">
-  <!ENTITY dhusername  "Tim Dijkstra">
-  <!ENTITY dhucpackage "<refentrytitle>s2disk</refentrytitle>">
-  <!ENTITY dhpackage   "uswsusp">
-  <!ENTITY dhprogram   "s2disk">
-  <!ENTITY dhsuspend   "s2disk">
-  <!ENTITY dhs2both	"s2both">
-  <!ENTITY dhs2ram	"s2ram">
-  <!ENTITY dhresume    "resume">
-  <!ENTITY dhconfig	"uswsusp.conf">
-  <!ENTITY dhkeygen	"suspend-keygen">
-
-
-
-  <!ENTITY debian      "<productname>Debian</productname>">
-  <!ENTITY gnu         "<acronym>GNU</acronym>">
-  <!ENTITY gpl         "&gnu; <acronym>GPL</acronym>">
-]>
-
-<refentry>
-  <refentryinfo>
-    <address>
-      &dhemail;
-    </address>
-    <author>
-      &dhfirstname;
-      &dhsurname;
-    </author>
-    <copyright>
-      <year>2006</year>
-      <holder>&dhusername;</holder>
-    </copyright>
-    &dhdate;
-  </refentryinfo>
-  <refmeta>
-    &dhucpackage;
-
-    &dhsection;
-  </refmeta>
-  <refnamediv>
-    <refname>&dhprogram;</refname>
-
-    <refpurpose>program to suspend to disk (hibernate)</refpurpose>
-  </refnamediv>
-  <refsynopsisdiv>
-    <cmdsynopsis>
-	<command>&dhsuspend;</command>
-
-	<arg>-h, --help</arg>
-	<arg>-V, --version</arg>
-	<arg>-f, --config <replaceable>config_file</replaceable></arg>
-	<arg>-r, --resume_device <replaceable>device</replaceable></arg>
-	<arg>-o, --resume_offset <replaceable>offset</replaceable></arg>
-	<arg>-s, --image_size <replaceable>size</replaceable></arg>
-	<arg>-P, --parameter <replaceable>parameter</replaceable></arg>     
-
-    </cmdsynopsis>
-    <cmdsynopsis>
-      <command>&dhresume;</command>
-    </cmdsynopsis>
-
-  </refsynopsisdiv>
-  <refsect1>
-    <title>DESCRIPTION</title>
-
-    <para>This manual page documents briefly the
-      <command>&dhsuspend;</command>, <command>&dhs2both;</command> and <command>&dhresume;</command>
-      commands.</para>
-
-    <para>This manual page was written for the &debian; distribution
-      because the original program does not have a manual page.</para>
-
-    <para><command>&dhsuspend;</command> is a program that will save 
-    the state of the whole system to disk and power off your system.
-    After restarting your system it will be put back in the exact system state
-    you left it (this is sometimes called hibernation).
-    </para>
-    <para><command>&dhs2both;</command> will do precisly the same as 
-    <command>&dhsuspend;</command> except that it will not power off the 
-    system, but will suspend it to ram (put the system in S3 mode). This
-    has the advantage that resume will be faster, with the disadvantage
-    that you still use batteries. If they batteries do deplete, you still
-    have the system state saved to disk and can resume without data loss.
-    The <command>&dhs2both;</command> command also inherits all command line
-    arguments from <command>&dhs2ram;</command>.
-    </para>
-    <para>
-    You will need to set up an initramfs which calls the 
-    <command>&dhresume;</command> program for this to work. If you use an 
-    &debian; kernel package which was made with the --initrd option and you use 
-    mkinitramfs-tools, this package should include the necessary parts on your 
-    initramfs.
-    </para>
-    <para>
-    The uswsusp system supports encrypting the image written to disk
-    and features a splash system, see &dhconfig;(8) for more information
-    </para>
-
-  </refsect1>
-  <refsect1>
-    <title>OPTIONS</title>
-
-    <variablelist>
-      <varlistentry>
-        <term><option>-f, --config [file]</option>
-        </term>
-        <listitem>
-          <para>Specify alternate configuration file.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>-h, --help</option>
-        </term>
-        <listitem>
-          <para>Display help.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>-r, --resume_device [device]</option>
-        </term>
-        <listitem>
-          <para>Device that contains swap area.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>-o, --resume_offset [offset]</option>
-        </term>
-        <listitem>
-          <para>Offset of swap file in resume device.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>-s, --image_size [size]</option>
-        </term>
-        <listitem>
-          <para>Desired size of the image.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>-P, --parameter [key=value]</option>
-        </term>
-        <listitem>
-          <para>Override any config file parameter (see &dhconfig;(8)).</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-    <para>
-	For the meaning and use of the resume_size, resume_offset and
-	image_size options see &dhconfig;(8).
-    </para>
-  </refsect1>
-  <refsect1>
-    <title>SEE ALSO</title>
-
-    <para>&dhconfig;(8), &dhkeygen;(8), &dhs2ram;(8)</para>
-
-    <para>For more information see the <citetitle>HOWTO</citetitle> and
-    the <citetitle>README</citetitle></para>
-  </refsect1>
-  <refsect1>
-    <title>AUTHOR</title>
-
-    <para>This manual page was written by &dhusername; &dhemail; for
-      the &debian; system (but may be used by others).  Permission is
-      granted to copy, distribute and/or modify this document under
-      the terms of the &gnu; General Public License, Version 2 any 
-	  later version published by the Free Software Foundation.
-    </para>
-	<para>
-	  On Debian systems, the complete text of the GNU General Public
-	  License can be found in /usr/share/common-licenses/GPL.
-	</para>
-
-  </refsect1>
-</refentry>
-
diff -Nru uswsusp-1.0/debian/s2ram.8 uswsusp-1.0+20110509/debian/s2ram.8
--- uswsusp-1.0/debian/s2ram.8	1970-01-01 01:00:00.000000000 +0100
+++ uswsusp-1.0+20110509/debian/s2ram.8	2011-09-25 23:37:46.000000000 +0200
@@ -0,0 +1,139 @@
+'\" t
+.\"     Title: s2ram
+.\"    Author: TimTim DijkstraDijkstra <tim@famdijkstra.org>
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
+.\"      Date: juni 24, 2006
+.\"    Manual: s2ram
+.\"    Source: uswsusp
+.\"  Language: English
+.\"
+.TH "S2RAM" "8" "juni 24, 2006" "uswsusp" "s2ram"
+.\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
+.\" * set default formatting
+.\" -----------------------------------------------------------------
+.\" disable hyphenation
+.nh
+.\" disable justification (adjust text to left margin only)
+.ad l
+.\" -----------------------------------------------------------------
+.\" * MAIN CONTENT STARTS HERE *
+.\" -----------------------------------------------------------------
+.SH "NAME"
+s2ram \- program to suspend to ram (suspend)
+.SH "SYNOPSIS"
+.HP \w'\fBs2ram\fR\ 'u
+\fBs2ram\fR [\-h,\ \-\-help] [\-V,\ \-\-vesion] [\-n,\ \-\-test] [\-i,\ \-\-identify] [\-\-nofbsuspend] [\-\-force] [\-\-vbe_save] [\-\-vbe_mode] [\-\-radeontool] [\-\-acpi_sleep\ \fInr\fR] [\-\-pci_save]
+.SH "DESCRIPTION"
+.PP
+This manual page documents briefly the
+\fBs2ram\fR
+command\&.
+.PP
+This manual page was written for the
+Debian(TM)
+distribution because the original program does not have a manual page\&.
+.PP
+\fBs2ram\fR
+is a program that will suspend your system to ram (put it in S3 mode)\&. Which means that the system is in a lower power mode\&. It asked to do so it will wake up farely quickly\&. However, if the system will run out of energy entirely you will lose data\&. That is why it is recommended to use
+\fBs2both\fR(8)
+\fBs2ram\fR
+is only provided to find out any work around needed to make suspend to both work\&. See README\&.s2ram\-whitelist and README\&.Debian for more information\&.
+.SH "OPTIONS"
+.PP
+\fB\-h, \-\-help\fR
+.RS 4
+Short help text\&.
+.RE
+.PP
+\fB\-V, \-\-version\fR
+.RS 4
+Version information\&.
+.RE
+.PP
+\fB\-n, \-\-test\fR
+.RS 4
+test if the machine is in the database\&. returns 0 if known and supported
+.RE
+.PP
+\fB\-i, \-\-identify\fR
+.RS 4
+prints a string that identifies the machine\&.
+.RE
+.PP
+\fB\-\-nofbsuspend\fR
+.RS 4
+do not suspend the framebuffer (for debugging purposes)\&.
+.RE
+.PP
+\fB\-\-force\fR
+.RS 4
+force suspending, even on unknown machines\&. the following options are only available with \-\-force\&.
+.RE
+.PP
+\fB\-\-vbe_save\fR
+.RS 4
+save VBE state before suspending and restore after resume\&.
+.RE
+.PP
+\fB\-\-vbe_post\fR
+.RS 4
+VBE POST the graphics card after resume\&.
+.RE
+.PP
+\fB\-\-vbe_mode\fR
+.RS 4
+get VBE mode before suspend and set it after resume\&.
+.RE
+.PP
+\fB\-\-radeontool\fR
+.RS 4
+turn off the backlight on radeons before suspending\&.
+.RE
+.PP
+\fB\-v, \-\-pci_save\fR
+.RS 4
+Save the PCI config space of the VGA card before suspend and restore it after resume\&.
+.RE
+.PP
+\fB\-\-acpi_sleep \fR\fB\fInr\fR\fR
+.RS 4
+set the acpi_sleep parameter before suspend\&. 1=s3_bios, 2=s3_mode, 3=both
+.RE
+.SH "SEE ALSO"
+.PP
+s2both (8)\&.
+.PP
+For more information see the
+/usr/share/doc/uswsusp/README\&.s2ram\-whitelist
+and the
+/usr/share/doc/uswsusp/README\&.Debian
+.SH "AUTHOR"
+.PP
+This manual page was written by Tim Dijkstra
+tim@famdijkstra\&.org
+for the
+Debian(TM)
+system (but may be used by others)\&. Permission is granted to copy, distribute and/or modify this document under the terms of the
+GNU
+General Public License, Version 2 any later version published by the Free Software Foundation\&.
+.PP
+On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL\&.
+.SH "AUTHOR"
+.PP
+\fBTimTim DijkstraDijkstra\fR <\&tim@famdijkstra\&.org\&> <\&tim@famdijkstra\&.org\&>
+.RS 4
+Wrote this manpage for the Debian system\&.
+.RE
+.SH "COPYRIGHT"
+.br
+Copyright \(co 2006 Tim Dijkstra
+.br
diff -Nru uswsusp-1.0/debian/s2ram.8.xml uswsusp-1.0+20110509/debian/s2ram.8.xml
--- uswsusp-1.0/debian/s2ram.8.xml	1970-01-01 01:00:00.000000000 +0100
+++ uswsusp-1.0+20110509/debian/s2ram.8.xml	2011-09-25 19:00:34.000000000 +0200
@@ -0,0 +1,292 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+
+<!--
+
+Process this file with an XSLT processor: `xsltproc \
+-''-nonet /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/\
+manpages/docbook.xsl manpage.dbk'.  A manual page
+<package>.<section> will be generated.  You may view the
+manual page with: nroff -man <package>.<section> | less'.  A
+typical entry in a Makefile or Makefile.am is:
+
+DB2MAN=/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/\
+manpages/docbook.xsl
+XP=xsltproc -''-nonet
+
+manpage.1: manpage.dbk
+        $(XP) $(DB2MAN) $<
+    
+The xsltproc binary is found in the xsltproc package.  The
+XSL files are in docbook-xsl.  Please remember that if you
+create the nroff version in one of the debian/rules file
+targets (such as build), you will need to include xsltproc
+and docbook-xsl in your Build-Depends control field.
+
+-->
+
+  <!-- Fill in your name for FIRSTNAME and SURNAME. -->
+  <!ENTITY dhfirstname  "<firstname>Tim</firstname>">
+  <!ENTITY dhsurname    "<surname>Dijkstra</surname>">
+  <!-- Please adjust the date whenever revising the manpage. -->
+  <!ENTITY dhdate       "<date>juni 24, 2006</date>">
+  <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
+       allowed: see man(7), man(1). -->
+  <!ENTITY dhsection    "<manvolnum>8</manvolnum>">
+  <!ENTITY dhemail      "<email>tim@famdijkstra.org</email>">
+  <!ENTITY dhusername   "Tim Dijkstra">
+  <!ENTITY dhucpackage  "<refentrytitle>s2ram</refentrytitle>">
+  <!ENTITY dhpackage    "uswsusp">
+  <!ENTITY dhprogram    "s2ram">
+  <!ENTITY dhtitle      "s2ram">
+  <!ENTITY dhs2ram      "s2ram">
+  <!ENTITY dhsuspend    "s2disk">
+  <!ENTITY dhs2both     "s2both">
+  <!ENTITY dhresume     "resume">
+  <!ENTITY dhswapoffset "swap-offset">
+
+  <!ENTITY debian      "<productname>Debian</productname>">
+  <!ENTITY gnu         "<acronym>GNU</acronym>">
+  <!ENTITY gpl         "&gnu; <acronym>GPL</acronym>">
+]>
+
+<refentry>
+  <refentryinfo>
+    <title>&dhtitle;</title>
+    <productname>&dhpackage;</productname>
+    <authorgroup>
+      <author>
+       <firstname>&dhfirstname;</firstname>
+        <surname>&dhsurname;</surname>
+        <contrib>Wrote this manpage for the Debian system.</contrib>
+        <address>
+          <email>&dhemail;</email>
+        </address>
+      </author>
+    </authorgroup>
+    <copyright>
+      <year>2006</year>
+      <holder>&dhusername;</holder>
+    </copyright>
+    &dhdate;
+  </refentryinfo>
+  <refmeta>
+    &dhucpackage;
+
+    &dhsection;
+  </refmeta>
+  <refnamediv>
+    <refname>&dhprogram;</refname>
+
+    <refpurpose>program to suspend to ram (suspend)</refpurpose>
+  </refnamediv>
+  
+  <refsynopsisdiv>
+    <cmdsynopsis>
+      <command>&dhs2ram;</command>
+
+      <arg>-h, --help</arg>
+      <arg>-V, --vesion</arg>
+      <arg>-n, --test</arg>
+      <arg>-i, --identify</arg>
+      <arg>--nofbsuspend</arg>
+      <arg>--force</arg>
+
+      <arg>--vbe_save</arg>
+      <arg>--vbe_mode</arg>
+      <arg>--radeontool</arg>
+      <arg>--acpi_sleep <replaceable>nr</replaceable></arg>
+      <arg>--pci_save</arg>
+
+    </cmdsynopsis>
+
+  </refsynopsisdiv>
+  <refsect1>
+    <title>DESCRIPTION</title>
+
+    <para>This manual page documents briefly the
+      <command>&dhs2ram;</command>      command.</para>
+
+    <para>This manual page was written for the &debian; distribution
+      because the original program does not have a manual page.</para>
+
+    <para><command>&dhs2ram;</command> is a program that will 
+     suspend your system to ram (put it in S3 mode). Which 
+    means that the system is in a lower power mode. It asked to do so
+    it will wake up farely quickly.
+    However, if the system will run out of energy entirely you will lose
+    data. That is why it is recommended to use <command>&dhs2both;</command>(8)
+    <command>&dhs2ram;</command> is only provided to find out any work around 
+    needed to make suspend to both work. See README.s2ram-whitelist and
+    README.Debian for more information.
+    </para>
+
+  </refsect1>
+  <refsect1>
+    <title>OPTIONS</title>
+
+    <variablelist>
+      <varlistentry>
+        <term><option>-h, --help</option>
+        </term>
+        <listitem>
+          <para>Short help text.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+
+    <variablelist>
+      <varlistentry>
+        <term><option>-V, --version</option>
+        </term>
+        <listitem>
+          <para>Version information.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+
+
+    <variablelist>
+      <varlistentry>
+        <term><option>-n, --test</option>
+        </term>
+        <listitem>
+          <para>test if the machine is in the database. returns 0 if known and supported
+</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+
+
+     <variablelist>
+      <varlistentry>
+        <term><option>-i, --identify</option>
+        </term>
+        <listitem>
+          <para>prints a string that identifies the machine.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+
+     <variablelist>
+      <varlistentry>
+        <term><option>--nofbsuspend</option>
+        </term>
+        <listitem>
+          <para>do not suspend the framebuffer (for debugging purposes).</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+
+
+        <variablelist>
+      <varlistentry>
+        <term><option>--force</option>
+        </term>
+        <listitem>
+          <para>force suspending, even on unknown machines.
+	the following options are only available with --force.  
+	  </para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+
+
+
+        <variablelist>
+      <varlistentry>
+        <term><option>--vbe_save</option>
+        </term>
+        <listitem>
+          <para>save VBE state before suspending and restore after resume.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+
+        <variablelist>
+      <varlistentry>
+        <term><option>--vbe_post</option>
+        </term>
+        <listitem>
+          <para> VBE POST the graphics card after resume.</para>
+        </listitem>
+      </varlistentry>
+  </variablelist>
+
+        <variablelist>
+      <varlistentry>
+        <term><option>--vbe_mode</option>
+        </term>
+        <listitem>
+          <para> get VBE mode before suspend and set it after resume.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+
+        <variablelist>
+      <varlistentry>
+        <term><option>--radeontool</option>
+        </term>
+        <listitem>
+          <para>turn off the backlight on radeons before suspending.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+
+       <varlistentry>
+        <term><option>-v, --pci_save</option>
+        </term>
+        <listitem>
+	    <para>
+		Save the PCI config space of the VGA card before suspend 
+		and restore it after resume.
+	  </para>
+        </listitem>
+      </varlistentry>
+
+
+        <variablelist>
+      <varlistentry>
+        <term><option>--acpi_sleep <replaceable>nr</replaceable></option>
+        </term>
+        <listitem>
+          <para>set the acpi_sleep parameter before suspend.
+	                        1=s3_bios, 2=s3_mode, 3=both
+
+	  </para>
+        </listitem>
+    </varlistentry>
+
+
+       </variablelist>
+
+
+
+   
+  </refsect1>
+  <refsect1>
+    <title>SEE ALSO</title>
+
+    <para>&dhs2both; (8).</para>
+
+    <para>For more information see the <citetitle>/usr/share/doc/&dhpackage;/README.s2ram-whitelist</citetitle> and
+    the <citetitle>/usr/share/doc/&dhpackage;/README.Debian</citetitle></para>
+  </refsect1>
+  <refsect1>
+    <title>AUTHOR</title>
+
+    <para>This manual page was written by &dhusername; &dhemail; for
+      the &debian; system (but may be used by others).  Permission is
+      granted to copy, distribute and/or modify this document under
+      the terms of the &gnu; General Public License, Version 2 any 
+	  later version published by the Free Software Foundation.
+    </para>
+	<para>
+	  On Debian systems, the complete text of the GNU General Public
+	  License can be found in /usr/share/common-licenses/GPL.
+	</para>
+
+  </refsect1>
+</refentry>
+
diff -Nru uswsusp-1.0/debian/s2ram.xml uswsusp-1.0+20110509/debian/s2ram.xml
--- uswsusp-1.0/debian/s2ram.xml	2011-03-11 23:53:37.000000000 +0100
+++ uswsusp-1.0+20110509/debian/s2ram.xml	1970-01-01 01:00:00.000000000 +0100
@@ -1,286 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-
-<!--
-
-Process this file with an XSLT processor: `xsltproc \
--''-nonet /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/\
-manpages/docbook.xsl manpage.dbk'.  A manual page
-<package>.<section> will be generated.  You may view the
-manual page with: nroff -man <package>.<section> | less'.  A
-typical entry in a Makefile or Makefile.am is:
-
-DB2MAN=/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/\
-manpages/docbook.xsl
-XP=xsltproc -''-nonet
-
-manpage.1: manpage.dbk
-        $(XP) $(DB2MAN) $<
-    
-The xsltproc binary is found in the xsltproc package.  The
-XSL files are in docbook-xsl.  Please remember that if you
-create the nroff version in one of the debian/rules file
-targets (such as build), you will need to include xsltproc
-and docbook-xsl in your Build-Depends control field.
-
--->
-
-  <!-- Fill in your name for FIRSTNAME and SURNAME. -->
-  <!ENTITY dhfirstname "<firstname>Tim</firstname>">
-  <!ENTITY dhsurname   "<surname>Dijkstra</surname>">
-  <!-- Please adjust the date whenever revising the manpage. -->
-  <!ENTITY dhdate      "<date>juni 24, 2006</date>">
-  <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
-       allowed: see man(7), man(1). -->
-  <!ENTITY dhsection   "<manvolnum>8</manvolnum>">
-  <!ENTITY dhemail     "<email>tim@famdijkstra.org</email>">
-  <!ENTITY dhusername  "Tim Dijkstra">
-  <!ENTITY dhucpackage "<refentrytitle>s2ram</refentrytitle>">
-  <!ENTITY dhpackage   "uswsusp">
-  <!ENTITY dhprogram   "s2ram">
-  <!ENTITY dhs2ram     "s2ram">
-  <!ENTITY dhsuspend   "s2disk">
-  <!ENTITY dhs2both    "s2both">
-  <!ENTITY dhresume    "resume">
-
-
-  <!ENTITY debian      "<productname>Debian</productname>">
-  <!ENTITY gnu         "<acronym>GNU</acronym>">
-  <!ENTITY gpl         "&gnu; <acronym>GPL</acronym>">
-]>
-
-<refentry>
-  <refentryinfo>
-    <address>
-      &dhemail;
-    </address>
-    <author>
-      &dhfirstname;
-      &dhsurname;
-    </author>
-    <copyright>
-      <year>2006</year>
-      <holder>&dhusername;</holder>
-    </copyright>
-    &dhdate;
-  </refentryinfo>
-  <refmeta>
-    &dhucpackage;
-
-    &dhsection;
-  </refmeta>
-  <refnamediv>
-    <refname>&dhprogram;</refname>
-
-    <refpurpose>program to suspend to ram (suspend)</refpurpose>
-  </refnamediv>
-  
-  <refsynopsisdiv>
-    <cmdsynopsis>
-      <command>&dhs2ram;</command>
-
-      <arg>-h, --help</arg>
-      <arg>-V, --vesion</arg>
-      <arg>-n, --test</arg>
-      <arg>-i, --identify</arg>
-      <arg>--nofbsuspend</arg>
-      <arg>--force</arg>
-
-      <arg>--vbe_save</arg>
-      <arg>--vbe_mode</arg>
-      <arg>--radeontool</arg>
-      <arg>--acpi_sleep <replaceable>nr</replaceable></arg>
-      <arg>--pci_save</arg>
-
-    </cmdsynopsis>
-
-  </refsynopsisdiv>
-  <refsect1>
-    <title>DESCRIPTION</title>
-
-    <para>This manual page documents briefly the
-      <command>&dhs2ram;</command>      command.</para>
-
-    <para>This manual page was written for the &debian; distribution
-      because the original program does not have a manual page.</para>
-
-    <para><command>&dhs2ram;</command> is a program that will 
-     suspend your system to ram (put it in S3 mode). Which 
-    means that the system is in a lower power mode. It asked to do so
-    it will wake up farely quickly.
-    However, if the system will run out of energy entirely you will lose
-    data. That is why it is recommended to use <command>&dhs2both;</command>(8)
-    <command>&dhs2ram;</command> is only provided to find out any work around 
-    needed to make suspend to both work. See README.s2ram-whitelist and
-    README.Debian for more information.
-    </para>
-
-  </refsect1>
-  <refsect1>
-    <title>OPTIONS</title>
-
-    <variablelist>
-      <varlistentry>
-        <term><option>-h, --help</option>
-        </term>
-        <listitem>
-          <para>Short help text.</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-    <variablelist>
-      <varlistentry>
-        <term><option>-V, --version</option>
-        </term>
-        <listitem>
-          <para>Version information.</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-
-    <variablelist>
-      <varlistentry>
-        <term><option>-n, --test</option>
-        </term>
-        <listitem>
-          <para>test if the machine is in the database. returns 0 if known and supported
-</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-
-     <variablelist>
-      <varlistentry>
-        <term><option>-i, --identify</option>
-        </term>
-        <listitem>
-          <para>prints a string that identifies the machine.</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-     <variablelist>
-      <varlistentry>
-        <term><option>--nofbsuspend</option>
-        </term>
-        <listitem>
-          <para>do not suspend the framebuffer (for debugging purposes).</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-
-        <variablelist>
-      <varlistentry>
-        <term><option>--force</option>
-        </term>
-        <listitem>
-          <para>force suspending, even on unknown machines.
-	the following options are only available with --force.  
-	  </para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-
-
-        <variablelist>
-      <varlistentry>
-        <term><option>--vbe_save</option>
-        </term>
-        <listitem>
-          <para>save VBE state before suspending and restore after resume.</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-        <variablelist>
-      <varlistentry>
-        <term><option>--vbe_post</option>
-        </term>
-        <listitem>
-          <para> VBE POST the graphics card after resume.</para>
-        </listitem>
-      </varlistentry>
-  </variablelist>
-
-        <variablelist>
-      <varlistentry>
-        <term><option>--vbe_mode</option>
-        </term>
-        <listitem>
-          <para> get VBE mode before suspend and set it after resume.</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-        <variablelist>
-      <varlistentry>
-        <term><option>--radeontool</option>
-        </term>
-        <listitem>
-          <para>turn off the backlight on radeons before suspending.</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-       <varlistentry>
-        <term><option>-v, --pci_save</option>
-        </term>
-        <listitem>
-	    <para>
-		Save the PCI config space of the VGA card before suspend 
-		and restore it after resume.
-	  </para>
-        </listitem>
-      </varlistentry>
-
-
-        <variablelist>
-      <varlistentry>
-        <term><option>--acpi_sleep <replaceable>nr</replaceable></option>
-        </term>
-        <listitem>
-          <para>set the acpi_sleep parameter before suspend.
-	                        1=s3_bios, 2=s3_mode, 3=both
-
-	  </para>
-        </listitem>
-    </varlistentry>
-
-
-       </variablelist>
-
-
-
-   
-  </refsect1>
-  <refsect1>
-    <title>SEE ALSO</title>
-
-    <para>&dhs2both; (8).</para>
-
-    <para>For more information see the <citetitle>/usr/share/doc/&dhpackage;/README.s2ram-whitelist</citetitle> and
-    the <citetitle>/usr/share/doc/&dhpackage;/README.Debian</citetitle></para>
-  </refsect1>
-  <refsect1>
-    <title>AUTHOR</title>
-
-    <para>This manual page was written by &dhusername; &dhemail; for
-      the &debian; system (but may be used by others).  Permission is
-      granted to copy, distribute and/or modify this document under
-      the terms of the &gnu; General Public License, Version 2 any 
-	  later version published by the Free Software Foundation.
-    </para>
-	<para>
-	  On Debian systems, the complete text of the GNU General Public
-	  License can be found in /usr/share/common-licenses/GPL.
-	</para>
-
-  </refsect1>
-</refentry>
-
diff -Nru uswsusp-1.0/debian/suspend-keygen.8 uswsusp-1.0+20110509/debian/suspend-keygen.8
--- uswsusp-1.0/debian/suspend-keygen.8	1970-01-01 01:00:00.000000000 +0100
+++ uswsusp-1.0+20110509/debian/suspend-keygen.8	2011-09-25 23:37:50.000000000 +0200
@@ -0,0 +1,79 @@
+'\" t
+.\"     Title: suspend-keygen
+.\"    Author: TimTim DijkstraDijkstra <tim@famdijkstra.org>
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
+.\"      Date: juni 24, 2006
+.\"    Manual: suspend-keygen
+.\"    Source: uswsusp
+.\"  Language: English
+.\"
+.TH "SUSPEND\-KEYGEN" "8" "juni 24, 2006" "uswsusp" "suspend-keygen"
+.\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
+.\" * set default formatting
+.\" -----------------------------------------------------------------
+.\" disable hyphenation
+.nh
+.\" disable justification (adjust text to left margin only)
+.ad l
+.\" -----------------------------------------------------------------
+.\" * MAIN CONTENT STARTS HERE *
+.\" -----------------------------------------------------------------
+.SH "NAME"
+suspend-keygen \- program to generate a RSA key to be used by s2disk
+.SH "SYNOPSIS"
+.HP \w'\fBsuspend\-keygen\fR\ 'u
+\fBsuspend\-keygen\fR
+.SH "DESCRIPTION"
+.PP
+This manual page documents briefly the
+\fBsuspend\-keygen\fR
+command\&.
+.PP
+This manual page was written for the
+Debian(TM)
+distribution because the original program does not have a manual page\&.
+.PP
+\fBsuspend\-keygen\fR
+is a program that will generate a RSA key which can be used by the
+\fBs2disk\fR
+to encrypt the image written to disk\&. The program does not take any options, but will ask to give the size of the key in bits and to supply a passphrase\&. You will have to enter this passphrase on
+\fBresume\fR
+to decrypt the image\&.
+.PP
+To start using encryption, you will have to point the "RSA key file" option in uswsusp\&.conf(8) to the file suspend\-keygen generated\&.
+.SH "SEE ALSO"
+.PP
+s2disk (8)\&., uswsusp\&.conf (8)\&.
+.PP
+For more information see
+/usr/share/doc/uswsusp/README\&.Debian
+.SH "AUTHOR"
+.PP
+This manual page was written by Tim Dijkstra
+tim@famdijkstra\&.org
+for the
+Debian(TM)
+system (but may be used by others)\&. Permission is granted to copy, distribute and/or modify this document under the terms of the
+GNU
+General Public License, Version 2 any later version published by the Free Software Foundation\&.
+.PP
+On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL\&.
+.SH "AUTHOR"
+.PP
+\fBTimTim DijkstraDijkstra\fR <\&tim@famdijkstra\&.org\&> <\&tim@famdijkstra\&.org\&>
+.RS 4
+Wrote this manpage for the Debian system\&.
+.RE
+.SH "COPYRIGHT"
+.br
+Copyright \(co 2006 Tim Dijkstra
+.br
diff -Nru uswsusp-1.0/debian/suspend-keygen.8.xml uswsusp-1.0+20110509/debian/suspend-keygen.8.xml
--- uswsusp-1.0/debian/suspend-keygen.8.xml	1970-01-01 01:00:00.000000000 +0100
+++ uswsusp-1.0+20110509/debian/suspend-keygen.8.xml	2011-09-25 19:01:10.000000000 +0200
@@ -0,0 +1,142 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+
+<!--
+
+Process this file with an XSLT processor: `xsltproc \
+-''-nonet /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/\
+manpages/docbook.xsl manpage.dbk'.  A manual page
+<package>.<section> will be generated.  You may view the
+manual page with: nroff -man <package>.<section> | less'.  A
+typical entry in a Makefile or Makefile.am is:
+
+DB2MAN=/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/\
+manpages/docbook.xsl
+XP=xsltproc -''-nonet
+
+manpage.1: manpage.dbk
+        $(XP) $(DB2MAN) $<
+    
+The xsltproc binary is found in the xsltproc package.  The
+XSL files are in docbook-xsl.  Please remember that if you
+create the nroff version in one of the debian/rules file
+targets (such as build), you will need to include xsltproc
+and docbook-xsl in your Build-Depends control field.
+
+-->
+
+  <!-- Fill in your name for FIRSTNAME and SURNAME. -->
+  <!ENTITY dhfirstname  "<firstname>Tim</firstname>">
+  <!ENTITY dhsurname    "<surname>Dijkstra</surname>">
+  <!-- Please adjust the date whenever revising the manpage. -->
+  <!ENTITY dhdate       "<date>juni 24, 2006</date>">
+  <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
+       allowed: see man(7), man(1). -->
+  <!ENTITY dhsection    "<manvolnum>8</manvolnum>">
+  <!ENTITY dhemail      "<email>tim@famdijkstra.org</email>">
+  <!ENTITY dhusername   "Tim Dijkstra">
+  <!ENTITY dhucpackage  "<refentrytitle>suspend-keygen</refentrytitle>">
+  <!ENTITY dhpackage    "uswsusp">
+  <!ENTITY dhprogram    "suspend-keygen">
+  <!ENTITY dhtitle      "suspend-keygen">
+  <!ENTITY dhs2ram      "s2ram">
+  <!ENTITY dhsuspend    "s2disk">
+  <!ENTITY dhs2both     "s2both">
+  <!ENTITY dhresume     "resume">
+  <!ENTITY dhconfig     "uswsusp.conf">
+  <!ENTITY dhswapoffset "swap-offset">
+
+  <!ENTITY debian      "<productname>Debian</productname>">
+  <!ENTITY gnu         "<acronym>GNU</acronym>">
+  <!ENTITY gpl         "&gnu; <acronym>GPL</acronym>">
+]>
+
+<refentry>
+  <refentryinfo>
+    <title>&dhtitle;</title>
+    <productname>&dhpackage;</productname>
+    <authorgroup>
+      <author>
+       <firstname>&dhfirstname;</firstname>
+        <surname>&dhsurname;</surname>
+        <contrib>Wrote this manpage for the Debian system.</contrib>
+        <address>
+          <email>&dhemail;</email>
+        </address>
+      </author>
+    </authorgroup>
+    <copyright>
+      <year>2006</year>
+      <holder>&dhusername;</holder>
+    </copyright>
+    &dhdate;
+  </refentryinfo>
+  <refmeta>
+    &dhucpackage;
+
+    &dhsection;
+  </refmeta>
+  <refnamediv>
+    <refname>&dhprogram;</refname>
+
+    <refpurpose>program to generate a RSA key to be used by &dhsuspend;</refpurpose>
+  </refnamediv>
+  
+  <refsynopsisdiv>
+    <cmdsynopsis>
+      <command>&dhprogram;</command>
+
+    </cmdsynopsis>
+
+  </refsynopsisdiv>
+  <refsect1>
+    <title>DESCRIPTION</title>
+
+    <para>This manual page documents briefly the
+      <command>&dhprogram;</command>      command.</para>
+
+    <para>This manual page was written for the &debian; distribution
+      because the original program does not have a manual page.</para>
+
+    <para><command>&dhprogram;</command> is a program that will 
+    generate a RSA key which can be used by the <command>&dhsuspend;</command> 
+    to encrypt the image written to disk.
+    The program does not take any options, but will ask to give the size
+    of the key in bits and to supply a passphrase. You will
+    have to enter this passphrase on <command>&dhresume;</command> 
+    to decrypt the image.
+    </para>
+
+    <para>To start using encryption, you will have to point
+    the "RSA key file" option in &dhconfig;(8) to the file &dhprogram;
+    generated.
+    </para>
+
+  </refsect1>
+  <refsect1>
+    <title>SEE ALSO</title>
+
+    <para>&dhsuspend; (8)., &dhconfig; (8).</para>
+
+    <para>
+    For more information see 
+    <citetitle>/usr/share/doc/&dhpackage;/README.Debian</citetitle></para>
+  </refsect1>
+  <refsect1>
+    <title>AUTHOR</title>
+
+    <para>This manual page was written by &dhusername; &dhemail; for
+      the &debian; system (but may be used by others).  Permission is
+      granted to copy, distribute and/or modify this document under
+      the terms of the &gnu; General Public License, Version 2 any 
+	  later version published by the Free Software Foundation.
+    </para>
+	<para>
+	  On Debian systems, the complete text of the GNU General Public
+	  License can be found in /usr/share/common-licenses/GPL.
+	</para>
+
+  </refsect1>
+</refentry>
+
diff -Nru uswsusp-1.0/debian/suspend-keygen.xml uswsusp-1.0+20110509/debian/suspend-keygen.xml
--- uswsusp-1.0/debian/suspend-keygen.xml	2011-03-11 23:53:37.000000000 +0100
+++ uswsusp-1.0+20110509/debian/suspend-keygen.xml	1970-01-01 01:00:00.000000000 +0100
@@ -1,136 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-
-<!--
-
-Process this file with an XSLT processor: `xsltproc \
--''-nonet /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/\
-manpages/docbook.xsl manpage.dbk'.  A manual page
-<package>.<section> will be generated.  You may view the
-manual page with: nroff -man <package>.<section> | less'.  A
-typical entry in a Makefile or Makefile.am is:
-
-DB2MAN=/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/\
-manpages/docbook.xsl
-XP=xsltproc -''-nonet
-
-manpage.1: manpage.dbk
-        $(XP) $(DB2MAN) $<
-    
-The xsltproc binary is found in the xsltproc package.  The
-XSL files are in docbook-xsl.  Please remember that if you
-create the nroff version in one of the debian/rules file
-targets (such as build), you will need to include xsltproc
-and docbook-xsl in your Build-Depends control field.
-
--->
-
-  <!-- Fill in your name for FIRSTNAME and SURNAME. -->
-  <!ENTITY dhfirstname "<firstname>Tim</firstname>">
-  <!ENTITY dhsurname   "<surname>Dijkstra</surname>">
-  <!-- Please adjust the date whenever revising the manpage. -->
-  <!ENTITY dhdate      "<date>juni 24, 2006</date>">
-  <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
-       allowed: see man(7), man(1). -->
-  <!ENTITY dhsection   "<manvolnum>8</manvolnum>">
-  <!ENTITY dhemail     "<email>tim@famdijkstra.org</email>">
-  <!ENTITY dhusername  "Tim Dijkstra">
-  <!ENTITY dhucpackage "<refentrytitle>suspend-keygen</refentrytitle>">
-  <!ENTITY dhpackage   "uswsusp">
-  <!ENTITY dhprogram   "suspend-keygen">
-  <!ENTITY dhs2ram     "s2ram">
-  <!ENTITY dhsuspend   "s2disk">
-  <!ENTITY dhs2both    "s2both">
-  <!ENTITY dhresume    "resume">
-  <!ENTITY dhconfig    "uswsusp.conf">
-
-
-  <!ENTITY debian      "<productname>Debian</productname>">
-  <!ENTITY gnu         "<acronym>GNU</acronym>">
-  <!ENTITY gpl         "&gnu; <acronym>GPL</acronym>">
-]>
-
-<refentry>
-  <refentryinfo>
-    <address>
-      &dhemail;
-    </address>
-    <author>
-      &dhfirstname;
-      &dhsurname;
-    </author>
-    <copyright>
-      <year>2006</year>
-      <holder>&dhusername;</holder>
-    </copyright>
-    &dhdate;
-  </refentryinfo>
-  <refmeta>
-    &dhucpackage;
-
-    &dhsection;
-  </refmeta>
-  <refnamediv>
-    <refname>&dhprogram;</refname>
-
-    <refpurpose>program to generate a RSA key to be used by &dhsuspend;</refpurpose>
-  </refnamediv>
-  
-  <refsynopsisdiv>
-    <cmdsynopsis>
-      <command>&dhprogram;</command>
-
-    </cmdsynopsis>
-
-  </refsynopsisdiv>
-  <refsect1>
-    <title>DESCRIPTION</title>
-
-    <para>This manual page documents briefly the
-      <command>&dhprogram;</command>      command.</para>
-
-    <para>This manual page was written for the &debian; distribution
-      because the original program does not have a manual page.</para>
-
-    <para><command>&dhprogram;</command> is a program that will 
-    generate a RSA key which can be used by the <command>&dhsuspend;</command> 
-    to encrypt the image written to disk.
-    The program does not take any options, but will ask to give the size
-    of the key in bits and to supply a passphrase. You will
-    have to enter this passphrase on <command>&dhresume;</command> 
-    to decrypt the image.
-    </para>
-
-    <para>To start using encryption, you will have to point
-    the "RSA key file" option in &dhconfig;(8) to the file &dhprogram;
-    generated.
-    </para>
-
-  </refsect1>
-  <refsect1>
-    <title>SEE ALSO</title>
-
-    <para>&dhsuspend; (8)., &dhconfig; (8).</para>
-
-    <para>
-    For more information see 
-    <citetitle>/usr/share/doc/&dhpackage;/README.Debian</citetitle></para>
-  </refsect1>
-  <refsect1>
-    <title>AUTHOR</title>
-
-    <para>This manual page was written by &dhusername; &dhemail; for
-      the &debian; system (but may be used by others).  Permission is
-      granted to copy, distribute and/or modify this document under
-      the terms of the &gnu; General Public License, Version 2 any 
-	  later version published by the Free Software Foundation.
-    </para>
-	<para>
-	  On Debian systems, the complete text of the GNU General Public
-	  License can be found in /usr/share/common-licenses/GPL.
-	</para>
-
-  </refsect1>
-</refentry>
-
diff -Nru uswsusp-1.0/debian/swap-offset.8 uswsusp-1.0+20110509/debian/swap-offset.8
--- uswsusp-1.0/debian/swap-offset.8	1970-01-01 01:00:00.000000000 +0100
+++ uswsusp-1.0+20110509/debian/swap-offset.8	2011-09-25 23:37:48.000000000 +0200
@@ -0,0 +1,81 @@
+'\" t
+.\"     Title: swap-offset
+.\"    Author: TimTim DijkstraDijkstra <tim@famdijkstra.org>
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
+.\"      Date: juni 24, 2006
+.\"    Manual: swap-offset
+.\"    Source: uswsusp
+.\"  Language: English
+.\"
+.TH "SWAP\-OFFSET" "8" "juni 24, 2006" "uswsusp" "swap-offset"
+.\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
+.\" * set default formatting
+.\" -----------------------------------------------------------------
+.\" disable hyphenation
+.nh
+.\" disable justification (adjust text to left margin only)
+.ad l
+.\" -----------------------------------------------------------------
+.\" * MAIN CONTENT STARTS HERE *
+.\" -----------------------------------------------------------------
+.SH "NAME"
+swap-offset \- program to calculate the offset of a swap file in a partition
+.SH "SYNOPSIS"
+.HP \w'\fBswap\-offset\fR\ 'u
+\fBswap\-offset\fR [<swap_file>]
+.SH "DESCRIPTION"
+.PP
+This manual page documents briefly the
+\fBswap\-offset\fR\&.
+.PP
+This manual page was written for the
+Debian(TM)
+distribution because the original program does not have a manual page\&.
+.PP
+The programs
+\fBs2disk\fR
+and
+\fBs2both\fR
+can be used to save the state of the whole system to a swap partition or file and power off or suspend your system\&. After restarting your system it will be put back in the exact system state you left it (this is sometimes called hibernation)\&.
+.PP
+In the case of using a swap file you will have to specify the location of the swap file\*(Aqs header as the offset from the beginning of the partition that contains the swap file\&. The
+\fBswap\-offset\fR
+utility can be used to determine this value\&.
+.SH "SEE ALSO"
+.PP
+uswsusp\&.conf(8), s2disk(8)
+.PP
+For more information see the
+HOWTO
+and the
+README
+.SH "AUTHOR"
+.PP
+This manual page was written by Tim Dijkstra
+tim@famdijkstra\&.org
+for the
+Debian(TM)
+system (but may be used by others)\&. Permission is granted to copy, distribute and/or modify this document under the terms of the
+GNU
+General Public License, Version 2 any later version published by the Free Software Foundation\&.
+.PP
+On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL\&.
+.SH "AUTHOR"
+.PP
+\fBTimTim DijkstraDijkstra\fR <\&tim@famdijkstra\&.org\&> <\&tim@famdijkstra\&.org\&>
+.RS 4
+Wrote this manpage for the Debian system\&.
+.RE
+.SH "COPYRIGHT"
+.br
+Copyright \(co 2006 Tim Dijkstra
+.br
diff -Nru uswsusp-1.0/debian/swap-offset.8.xml uswsusp-1.0+20110509/debian/swap-offset.8.xml
--- uswsusp-1.0/debian/swap-offset.8.xml	1970-01-01 01:00:00.000000000 +0100
+++ uswsusp-1.0+20110509/debian/swap-offset.8.xml	2011-09-25 19:01:34.000000000 +0200
@@ -0,0 +1,143 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+
+<!--
+
+Process this file with an XSLT processor: `xsltproc \
+-''-nonet /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/\
+manpages/docbook.xsl manpage.dbk'.  A manual page
+<package>.<section> will be generated.  You may view the
+manual page with: nroff -man <package>.<section> | less'.  A
+typical entry in a Makefile or Makefile.am is:
+
+DB2MAN=/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/\
+manpages/docbook.xsl
+XP=xsltproc -''-nonet
+
+manpage.1: manpage.dbk
+        $(XP) $(DB2MAN) $<
+    
+The xsltproc binary is found in the xsltproc package.  The
+XSL files are in docbook-xsl.  Please remember that if you
+create the nroff version in one of the debian/rules file
+targets (such as build), you will need to include xsltproc
+and docbook-xsl in your Build-Depends control field.
+
+-->
+
+  <!-- Fill in your name for FIRSTNAME and SURNAME. -->
+  <!ENTITY dhfirstname  "<firstname>Tim</firstname>">
+  <!ENTITY dhsurname    "<surname>Dijkstra</surname>">
+  <!-- Please adjust the date whenever revising the manpage. -->
+  <!ENTITY dhdate       "<date>juni 24, 2006</date>">
+  <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
+       allowed: see man(7), man(1). -->
+  <!ENTITY dhsection    "<manvolnum>8</manvolnum>">
+  <!ENTITY dhemail      "<email>tim@famdijkstra.org</email>">
+  <!ENTITY dhusername   "Tim Dijkstra">
+  <!ENTITY dhucpackage  "<refentrytitle>swap-offset</refentrytitle>">
+  <!ENTITY dhpackage    "uswsusp">
+  <!ENTITY dhprogram    "swap-offset">
+  <!ENTITY dhtitle      "swap-offset">
+  <!ENTITY dhsuspend    "s2disk">
+  <!ENTITY dhs2both	"s2both">
+  <!ENTITY dhs2ram	"s2ram">
+  <!ENTITY dhresume     "resume">
+  <!ENTITY dhconfig	"uswsusp.conf">
+  <!ENTITY dhkeygen	"suspend-keygen">
+  <!ENTITY dhswapoffset "swap-offset">
+
+  <!ENTITY debian      "<productname>Debian</productname>">
+  <!ENTITY gnu         "<acronym>GNU</acronym>">
+  <!ENTITY gpl         "&gnu; <acronym>GPL</acronym>">
+]>
+
+<refentry>
+  <refentryinfo>
+    <title>&dhtitle;</title>
+    <productname>&dhpackage;</productname>
+    <authorgroup>
+      <author>
+       <firstname>&dhfirstname;</firstname>
+        <surname>&dhsurname;</surname>
+        <contrib>Wrote this manpage for the Debian system.</contrib>
+        <address>
+          <email>&dhemail;</email>
+        </address>
+      </author>
+    </authorgroup>
+    <copyright>
+      <year>2006</year>
+      <holder>&dhusername;</holder>
+    </copyright>
+    &dhdate;
+  </refentryinfo>
+  <refmeta>
+    &dhucpackage;
+
+    &dhsection;
+  </refmeta>
+  <refnamediv>
+    <refname>&dhprogram;</refname>
+
+    <refpurpose>program to calculate the offset of a swap file in a partition</refpurpose>
+  </refnamediv>
+  <refsynopsisdiv>
+    <cmdsynopsis>
+      <command>&dhswapoffset;</command>
+
+      <arg>&lt;swap_file&gt;</arg>
+
+    </cmdsynopsis>
+
+  </refsynopsisdiv>
+  <refsect1>
+    <title>DESCRIPTION</title>
+
+    <para>This manual page documents briefly the <command>&dhswapoffset;</command>.</para>
+
+    <para>This manual page was written for the &debian; distribution
+      because the original program does not have a manual page.</para>
+
+    <para>
+	The programs <command>&dhsuspend;</command> and <command>&dhs2both;</command>
+	can be used to save the state of the whole system to a swap partition or file 
+	and power off or suspend your system.
+	After restarting your system it will be put back in the exact system state
+	you left it (this is sometimes called hibernation).
+    </para>
+    <para>
+	In the case of using a swap file you will have to specify the 
+	location of the swap file's header as the offset from the beginning 
+	of the partition that contains the swap file.
+	The <command>&dhswapoffset;</command> utility can be used to
+	determine this value.
+    </para>
+
+  </refsect1>
+  <refsect1>
+    <title>SEE ALSO</title>
+
+    <para>&dhconfig;(8), &dhsuspend;(8)</para>
+
+    <para>For more information see the <citetitle>HOWTO</citetitle> and
+    the <citetitle>README</citetitle></para>
+  </refsect1>
+  <refsect1>
+    <title>AUTHOR</title>
+
+    <para>This manual page was written by &dhusername; &dhemail; for
+      the &debian; system (but may be used by others).  Permission is
+      granted to copy, distribute and/or modify this document under
+      the terms of the &gnu; General Public License, Version 2 any 
+	  later version published by the Free Software Foundation.
+    </para>
+	<para>
+	  On Debian systems, the complete text of the GNU General Public
+	  License can be found in /usr/share/common-licenses/GPL.
+	</para>
+
+  </refsect1>
+</refentry>
+
diff -Nru uswsusp-1.0/debian/swap-offset.xml uswsusp-1.0+20110509/debian/swap-offset.xml
--- uswsusp-1.0/debian/swap-offset.xml	2011-03-11 23:53:36.000000000 +0100
+++ uswsusp-1.0+20110509/debian/swap-offset.xml	1970-01-01 01:00:00.000000000 +0100
@@ -1,139 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-
-<!--
-
-Process this file with an XSLT processor: `xsltproc \
--''-nonet /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/\
-manpages/docbook.xsl manpage.dbk'.  A manual page
-<package>.<section> will be generated.  You may view the
-manual page with: nroff -man <package>.<section> | less'.  A
-typical entry in a Makefile or Makefile.am is:
-
-DB2MAN=/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/\
-manpages/docbook.xsl
-XP=xsltproc -''-nonet
-
-manpage.1: manpage.dbk
-        $(XP) $(DB2MAN) $<
-    
-The xsltproc binary is found in the xsltproc package.  The
-XSL files are in docbook-xsl.  Please remember that if you
-create the nroff version in one of the debian/rules file
-targets (such as build), you will need to include xsltproc
-and docbook-xsl in your Build-Depends control field.
-
--->
-
-  <!-- Fill in your name for FIRSTNAME and SURNAME. -->
-  <!ENTITY dhfirstname "<firstname>Tim</firstname>">
-  <!ENTITY dhsurname   "<surname>Dijkstra</surname>">
-  <!-- Please adjust the date whenever revising the manpage. -->
-  <!ENTITY dhdate      "<date>juni 24, 2006</date>">
-  <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
-       allowed: see man(7), man(1). -->
-  <!ENTITY dhsection   "<manvolnum>8</manvolnum>">
-  <!ENTITY dhemail     "<email>tim@famdijkstra.org</email>">
-  <!ENTITY dhusername  "Tim Dijkstra">
-  <!ENTITY dhucpackage "<refentrytitle>swap-offset</refentrytitle>">
-  <!ENTITY dhpackage   "uswsusp">
-  <!ENTITY dhprogram   "s2disk">
-  <!ENTITY dhsuspend   "s2disk">
-  <!ENTITY dhs2both	"s2both">
-  <!ENTITY dhs2ram	"s2ram">
-  <!ENTITY dhresume    "resume">
-  <!ENTITY dhconfig	"uswsusp.conf">
-  <!ENTITY dhkeygen	"suspend-keygen">
-  <!ENTITY dhswapoffset "swap-offset">
-
-
-
-  <!ENTITY debian      "<productname>Debian</productname>">
-  <!ENTITY gnu         "<acronym>GNU</acronym>">
-  <!ENTITY gpl         "&gnu; <acronym>GPL</acronym>">
-]>
-
-<refentry>
-  <refentryinfo>
-    <address>
-      &dhemail;
-    </address>
-    <author>
-      &dhfirstname;
-      &dhsurname;
-    </author>
-    <copyright>
-      <year>2006</year>
-      <holder>&dhusername;</holder>
-    </copyright>
-    &dhdate;
-  </refentryinfo>
-  <refmeta>
-    &dhucpackage;
-
-    &dhsection;
-  </refmeta>
-  <refnamediv>
-    <refname>&dhprogram;</refname>
-
-    <refpurpose>program to calculate the offset of a swap file in a partition</refpurpose>
-  </refnamediv>
-  <refsynopsisdiv>
-    <cmdsynopsis>
-      <command>&dhswapoffset;</command>
-
-      <arg>&lt;swap_file&gt;</arg>
-
-    </cmdsynopsis>
-
-  </refsynopsisdiv>
-  <refsect1>
-    <title>DESCRIPTION</title>
-
-    <para>This manual page documents briefly the <command>&dhswapoffset;</command>.</para>
-
-    <para>This manual page was written for the &debian; distribution
-      because the original program does not have a manual page.</para>
-
-    <para>
-	The programs <command>&dhsuspend;</command> and <command>&dhs2both;</command>
-	can be used to save the state of the whole system to a swap partition or file 
-	and power off or suspend your system.
-	After restarting your system it will be put back in the exact system state
-	you left it (this is sometimes called hibernation).
-    </para>
-    <para>
-	In the case of using a swap file you will have to specify the 
-	location of the swap file's header as the offset from the beginning 
-	of the partition that contains the swap file.
-	The <command>&dhswapoffset;</command> utility can be used to
-	determine this value.
-    </para>
-
-  </refsect1>
-  <refsect1>
-    <title>SEE ALSO</title>
-
-    <para>&dhconfig;(8), &dhsuspend;(8)</para>
-
-    <para>For more information see the <citetitle>HOWTO</citetitle> and
-    the <citetitle>README</citetitle></para>
-  </refsect1>
-  <refsect1>
-    <title>AUTHOR</title>
-
-    <para>This manual page was written by &dhusername; &dhemail; for
-      the &debian; system (but may be used by others).  Permission is
-      granted to copy, distribute and/or modify this document under
-      the terms of the &gnu; General Public License, Version 2 any 
-	  later version published by the Free Software Foundation.
-    </para>
-	<para>
-	  On Debian systems, the complete text of the GNU General Public
-	  License can be found in /usr/share/common-licenses/GPL.
-	</para>
-
-  </refsect1>
-</refentry>
-
diff -Nru uswsusp-1.0/debian/uswsusp.conf.5 uswsusp-1.0+20110509/debian/uswsusp.conf.5
--- uswsusp-1.0/debian/uswsusp.conf.5	1970-01-01 01:00:00.000000000 +0100
+++ uswsusp-1.0+20110509/debian/uswsusp.conf.5	2011-09-25 23:37:52.000000000 +0200
@@ -0,0 +1,180 @@
+'\" t
+.\"     Title: uswsusp.conf
+.\"    Author: TimTim DijkstraDijkstra <tim@famdijkstra.org>
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
+.\"      Date: juni 24, 2006
+.\"    Manual: uswsusp.conf
+.\"    Source: uswsusp
+.\"  Language: English
+.\"
+.TH "USWSUSP\&.CONF" "5" "juni 24, 2006" "uswsusp" "uswsusp.conf"
+.\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
+.\" * set default formatting
+.\" -----------------------------------------------------------------
+.\" disable hyphenation
+.nh
+.\" disable justification (adjust text to left margin only)
+.ad l
+.\" -----------------------------------------------------------------
+.\" * MAIN CONTENT STARTS HERE *
+.\" -----------------------------------------------------------------
+.SH "NAME"
+uswsusp.conf \- Config file for the s2disk program
+.SH "DESCRIPTION"
+.PP
+This manual page documents briefly the
+\fBuswsusp\&.conf\fR
+file used by the
+\fBs2disk\fR,
+\fBs2both\fR
+and
+\fBresume\fR
+commands\&.
+.PP
+This manual page was written for the
+Debian(TM)
+distribution because the original program does not have a manual page\&.
+.PP
+\fBs2disk\fR
+is a program that will save the the state of the whole system to disk and power off your system\&. After restarting your system it will be put back in the exact system state you left it (this is sometimes called hibernation)\&.
+.PP
+On a
+Debian(TM)
+system you can run
+\fBdpkg\-reconfigure uswsusp\fR
+to manage this file\&.
+.SH "OPTIONS"
+.PP
+\fBsnapshot device [=/dev/snapshot]\fR
+.RS 4
+Device via which
+\fBs2disk\fR
+should talk to the kernel\&.
+.RE
+.PP
+\fBresume device\fR
+.RS 4
+Specifies the device to write the image to\&. This is a swap partition or the partition that contains the swap file (see next parameter)\&.
+.RE
+.PP
+\fBresume offset\fR
+.RS 4
+Necessary if a swap file is used for suspending\&. In such a case the device identified by the "resume device" parameter is regarded as the partition that contains the swap file, and "resume offset" must be equal to the offset from the beginning of this partition at which the swap file\*(Aqs header is located, in <PAGE_SIZE> units\&. The value of this parameter for given swap file can be determined by the swap\-offset program (has to be run as root) included in this package\&. [For this feature to work, you will need an \e\-mm kernel, 2\&.6\&.18\-mm3 or newer\&.]
+.RE
+.PP
+\fBimage size\fR
+.RS 4
+Limit the size of the system snapshot image created by the
+\fBs2disk\fR
+tool, but it\*(Aqs not mandatory\&. Namely, the
+\fBs2disk\fR
+tool will do its best to limit the image size as required by this parameter, but if that\*(Aqs not possible, it will suspend the system anyway, with a bigger image\&. If "image size" is set to 0, the snapshot image will be as small as possible\&.
+.RE
+.PP
+\fBsuspend loglevel\fR
+.RS 4
+You can specify the kernel console loglevel which the
+\fBs2disk\fR/\fBs2both\fR
+and
+\fBresume\fR
+utilities will use to report progress\&. On a stock kernel messages with level higher then 7 are usually not shown\&.
+.RE
+.PP
+\fBshutdown method\fR
+.RS 4
+This parameter defines the operation that will be carried out after the suspend image has been created and the machine is ready to be powered off\&. If it is set to "reboot", the machine will be rebooted immediately\&. If it is set to "platform", the machine will be shut down using special power management operations available from the kernel that may be necessary for the hardware to be properly reinitialized after the resume, and may cause the system to resume faster (this is the recommended shutdown method on the majority of systems and hence the defaul)\&. If set to "shutdown" the machine will be powered off\&.
+.RE
+.PP
+\fBcompute checksum\fR
+.RS 4
+If the "compute checksum" parameter is set to \*(Aqy\*(Aq, the
+\fBs2disk\fR
+and
+\fBresume\fR
+tools will use the MD5 algorithm to verify the image integrity\&.
+.RE
+.PP
+\fBcompress\fR
+.RS 4
+If the "compress" parameter is set to \*(Aqy\*(Aq, the
+\fBs2disk\fR
+and
+\fBresume\fR
+tools will use the LZF compression algorithm to compress/decompress the image\&.
+.RE
+.PP
+\fBencrypt\fR
+.RS 4
+If the "encrypt" parameter is set to \*(Aqy\*(Aq, the
+\fBs2disk\fR
+and
+\fBresume\fR
+tools will use the Blowfish encryption algorithm to encrypt/decrypt the image\&. On resume and suspend you will have to supply a passphrase\&. By using a pregenerated RSA key, you can avoid having to type a passphrase on suspend\&. See the "RSA key file" option for more information\&.
+.RE
+.PP
+\fBRSA key file\fR
+.RS 4
+If this option points to a valid RSA key, which can be created with
+\fBsuspend\-keygen\fR, the
+\fBs2disk\fR
+tool will generate a random key for the Blowfish encryption that will be passed to the
+\fBresume\fR
+tool within the image header with the help of the RSA cipher\&. Consequently you only need to type a passphrase on resume\&.
+.RE
+.PP
+\fBearly writeout\fR
+.RS 4
+If the "early writeout" parameter is set to \*(Aqy\*(Aq, the
+\fBs2disk\fR
+utility will start syncing the resume device early in the process of writing the image to it\&. [This has been reported to speed up the
+\fBs2disk\fR
+on some boxes and eliminates the "fast progress meter and long fsync wait" effect\&.]
+.RE
+.PP
+\fBsplash\fR
+.RS 4
+The "splash" parameter is used to make
+\fBs2disk\fR
+and/or
+\fBresume\fR
+use a splash system (when set to \*(Aqy\*(Aq)\&. Currently the bootsplash\&.org and splashy systems are supported\&. For the former you need a kernel patch, the latter is a userspace solution, but you\*(Aqll need to install a splashy theme\&.
+.sp
+If you use initramfs\-tools on
+Debian(TM)
+to generate your initramfs (and have splashy installed), the necessary files will be copied to it\&.
+.RE
+.SH "SEE ALSO"
+.PP
+s2disk (8)\&. suspend\-keygen(8)
+.SH "AUTHOR"
+.PP
+This manual page was written by Tim Dijkstra
+tim@famdijkstra\&.org
+for the
+Debian(TM)
+system (but may be used by others)\&. Permission is granted to copy, distribute and/or modify this document under the terms of the
+GNU
+General Public License, Version 2 any later version published by the Free Software Foundation\&.
+.PP
+On
+Debian(TM)
+systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL\&.
+.SH "AUTHOR"
+.PP
+\fBTimTim DijkstraDijkstra\fR <\&tim@famdijkstra\&.org\&> <\&tim@famdijkstra\&.org\&>
+.RS 4
+Wrote this manpage for the Debian system\&.
+.RE
+.SH "COPYRIGHT"
+.br
+Copyright \(co 2006 Tim Dijkstra
+.br
diff -Nru uswsusp-1.0/debian/uswsusp.conf.5.xml uswsusp-1.0+20110509/debian/uswsusp.conf.5.xml
--- uswsusp-1.0/debian/uswsusp.conf.5.xml	1970-01-01 01:00:00.000000000 +0100
+++ uswsusp-1.0+20110509/debian/uswsusp.conf.5.xml	2011-09-25 19:02:11.000000000 +0200
@@ -0,0 +1,296 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+
+<!--
+
+Process this file with an XSLT processor: `xsltproc \
+-''-nonet /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/\
+manpages/docbook.xsl manpage.dbk'.  A manual page
+<package>.<section> will be generated.  You may view the
+manual page with: nroff -man <package>.<section> | less'.  A
+typical entry in a Makefile or Makefile.am is:
+
+DB2MAN=/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/\
+manpages/docbook.xsl
+XP=xsltproc -''-nonet
+
+manpage.1: manpage.dbk
+        $(XP) $(DB2MAN) $<
+    
+The xsltproc binary is found in the xsltproc package.  The
+XSL files are in docbook-xsl.  Please remember that if you
+create the nroff version in one of the debian/rules file
+targets (such as build), you will need to include xsltproc
+and docbook-xsl in your Build-Depends control field.
+
+-->
+
+  <!-- Fill in your name for FIRSTNAME and SURNAME. -->
+  <!ENTITY dhfirstname "<firstname>Tim</firstname>">
+  <!ENTITY dhsurname   "<surname>Dijkstra</surname>">
+  <!-- Please adjust the date whenever revising the manpage. -->
+  <!ENTITY dhdate      "<date>juni 24, 2006</date>">
+  <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
+       allowed: see man(7), man(1). -->
+  <!ENTITY dhsection   "<manvolnum>5</manvolnum>">
+  <!ENTITY dhemail     "<email>tim@famdijkstra.org</email>">
+  <!ENTITY dhusername  "Tim Dijkstra">
+  <!ENTITY dhucpackage "<refentrytitle>uswsusp.conf</refentrytitle>">
+  <!ENTITY dhpackage   "uswsusp">
+  <!ENTITY dhtitle     "uswsusp.conf">
+  <!ENTITY dhprogram   "uswsusp.conf">
+  <!ENTITY dhsuspend   "s2disk">
+  <!ENTITY dhs2both    "s2both">
+  <!ENTITY dhresume    "resume">
+  <!ENTITY dhkeygen    "suspend-keygen">
+  <!ENTITY dhswapoffset "swap-offset">
+
+  <!ENTITY debian      "<productname>Debian</productname>">
+  <!ENTITY gnu         "<acronym>GNU</acronym>">
+  <!ENTITY gpl         "&gnu; <acronym>GPL</acronym>">
+]>
+
+<refentry>
+  <refentryinfo>
+    <title>&dhtitle;</title>
+    <productname>&dhpackage;</productname>
+    <authorgroup>
+      <author>
+       <firstname>&dhfirstname;</firstname>
+        <surname>&dhsurname;</surname>
+        <contrib>Wrote this manpage for the Debian system.</contrib>
+        <address>
+          <email>&dhemail;</email>
+        </address>
+      </author>
+    </authorgroup>
+    <copyright>
+      <year>2006</year>
+      <holder>&dhusername;</holder>
+    </copyright>
+    &dhdate;
+  </refentryinfo>
+  <refmeta>
+    &dhucpackage;
+
+    &dhsection;
+  </refmeta>
+  <refnamediv>
+    <refname>&dhprogram;</refname>
+
+    <refpurpose>Config file for the &dhsuspend; program</refpurpose>
+  </refnamediv>
+  <refsect1>
+    <title>DESCRIPTION</title>
+
+    <para>This manual page documents briefly the <command>&dhprogram;</command>
+     file used by the <command>&dhsuspend;</command>, <command>&dhs2both;</command> and <command>&dhresume;</command> commands.</para>
+
+    <para>This manual page was written for the &debian; distribution
+      because the original program does not have a manual page.</para>
+
+    <para><command>&dhsuspend;</command> is a program that will save the
+    the state of the whole system to disk and power off your system.
+    After restarting your system it will be put back in the exact system state
+    you left it (this is sometimes called hibernation).
+    </para>
+    <para>
+    On a &debian; system you can run <command>dpkg-reconfigure &dhpackage;</command> to manage this file.
+    </para>
+  </refsect1>
+  <refsect1>
+    <title>OPTIONS</title>
+
+    <variablelist>
+      <varlistentry>
+        <term><option>snapshot device [=/dev/snapshot]</option>
+        </term>
+        <listitem>
+          <para>
+	  Device via which <command>&dhsuspend;</command> should talk
+	  to the kernel.
+	  </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>resume device</option>
+        </term>
+        <listitem>
+	    <para>Specifies the device to write the image to. This is a swap partition or 
+		the partition that contains the swap file (see next parameter).
+	    </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>resume offset</option>
+        </term>
+        <listitem>
+	    <para>
+		Necessary if a swap file is used for suspending.  In such a case 
+		the device identified by the "resume device" parameter is regarded 
+		as the partition that contains the swap file, and "resume offset" must 
+		be equal to the offset from the beginning of this
+		partition at which the swap file's header is located, in &lt;PAGE_SIZE&gt; units.
+		The value of this parameter for given swap file can be determined by the
+		swap-offset program (has to be run as root) included in this package.  [For
+		this feature to work, you will need an \-mm kernel, 2.6.18-mm3 or newer.]
+	    </para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>image size</option>
+        </term>
+        <listitem>
+          <para>
+	  Limit the size of the system
+	  snapshot image created by the <command>&dhsuspend;</command> tool, but it's not mandatory. Namely,
+	  the <command>&dhsuspend;</command> tool will do its best to limit the image size as required by
+	  this parameter, but if that's not possible, it will suspend the system anyway,
+	  with a bigger image. If "image size" is set to 0, the snapshot image will be
+	  as small as possible.
+	  
+	  </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>suspend loglevel</option>
+        </term>
+        <listitem>
+          <para>
+	  
+	  You can specify the kernel console loglevel which the 
+	  <command>&dhsuspend;</command>/<command>&dhs2both;</command> and
+	  <command>&dhresume;</command>
+	   utilities will use to report progress. On a stock kernel messages with
+	    level higher then 7 are usually not shown.
+	    
+	  </para>
+        </listitem>
+    </varlistentry>
+      <varlistentry>
+        <term><option>shutdown method</option>
+        </term>
+        <listitem>
+          <para>
+This parameter defines the operation that will be carried out
+after the suspend image has been created and the machine is ready to be powered
+off.  If it is set to "reboot", the machine will be rebooted immediately.
+If it is set to "platform", the machine will be shut down using special
+power management operations available from the kernel that may be necessary
+for the hardware to be properly reinitialized after the resume, and may cause
+the system to resume faster (this is the recommended shutdown method on the
+majority of systems and hence the defaul).  
+If set to "shutdown" the machine will be powered off. 
+	    
+	  </para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>compute checksum</option>
+        </term>
+        <listitem>
+          <para>
+	  If the "compute checksum" parameter is set to 'y', the <command>&dhsuspend;</command> and <command>&dhresume;</command>
+	  tools will use the MD5 algorithm to verify the image integrity.
+	  
+	  </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>compress</option>
+        </term>
+        <listitem>
+          <para>
+	  If the "compress" parameter is set to 'y', the <command>&dhsuspend;</command> and <command>&dhresume;</command> tools will
+	  use the LZF compression algorithm to compress/decompress the image. 
+	  </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>encrypt</option>
+        </term>
+        <listitem>
+          <para>
+	  If the "encrypt" parameter is set to 'y', the 
+	  <command>&dhsuspend;</command> and <command>&dhresume;</command> tools will
+	  use the Blowfish encryption algorithm to encrypt/decrypt the image.
+	  On resume and suspend you will have to supply a passphrase.
+	  By using a pregenerated RSA key, you can avoid having to type a
+	  passphrase on suspend.
+	  See the "RSA key file" option for more information.
+	  </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>RSA key file</option>
+        </term>
+        <listitem>
+          <para>
+	  If this option points to a valid RSA key, which can be created
+	  with <command>&dhkeygen;</command>, 
+	  the <command>&dhsuspend;</command> tool will generate a random
+	  key for the Blowfish encryption that will be passed to the 
+	  <command>&dhresume;</command> tool
+	  within the image header with the help of the RSA cipher. 
+	  Consequently you only need to type a passphrase on resume.
+	  </para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>early writeout</option>
+        </term>
+        <listitem>
+          <para>
+	  
+	  If the "early writeout" parameter is set to 'y', the <command>&dhsuspend;</command>
+	  utility will start syncing the resume device early in the process of writing
+	  the image to it.  [This has been reported to speed up the <command>&dhsuspend;</command> on some
+	  boxes and eliminates the "fast progress meter and long fsync wait" effect.]
+	  
+	  </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>splash</option>
+        </term>
+        <listitem>
+          <para>
+	  The "splash" parameter is used to make <command>&dhsuspend;</command> and/or <command>&dhresume;</command> use a splash system (when set to 'y').  Currently the bootsplash.org and splashy systems are supported. For the former you need a kernel patch, the latter is a userspace solution, but you'll need to install a splashy theme.
+	  </para>
+	  <para>
+	  If you use initramfs-tools on &debian; to generate your initramfs 
+	  (and have splashy installed), the necessary files will be copied to it.
+	  </para>
+        </listitem>
+      </varlistentry>
+      
+      
+    </variablelist>
+  </refsect1>
+  <refsect1>
+    <title>SEE ALSO</title>
+
+    <para>&dhsuspend; (8). &dhkeygen;(8)</para>
+
+  </refsect1>
+  <refsect1>
+    <title>AUTHOR</title>
+
+    <para>This manual page was written by &dhusername; &dhemail; for
+      the &debian; system (but may be used by others).  Permission is
+      granted to copy, distribute and/or modify this document under
+      the terms of the &gnu; General Public License, Version 2 any 
+	  later version published by the Free Software Foundation.
+    </para>
+	<para>
+	  On &debian; systems, the complete text of the GNU General Public
+	  License can be found in /usr/share/common-licenses/GPL.
+	</para>
+
+  </refsect1>
+</refentry>
+
diff -Nru uswsusp-1.0/debian/uswsusp.config uswsusp-1.0+20110509/debian/uswsusp.config
--- uswsusp-1.0/debian/uswsusp.config	2011-03-11 23:53:37.000000000 +0100
+++ uswsusp-1.0+20110509/debian/uswsusp.config	2011-05-11 08:33:41.000000000 +0200
@@ -12,15 +12,15 @@
 LOWQ="snapshot_device compute_checksum compress early_writeout image_size suspend_loglevel max_loglevel shutdown_method"
 MEDQ="resume_device encrypt splash"
 HIGHQ=""
-NOTQ="RSA_key_file resume_offset"
+NOTQ="RSA_key_file shutdown_method resume_offset"
 
 
 # If we don't have /proc or /sys we can't work, this will probably
 # be a chroot or so.
 mountpoint -q /sys || 
-  { echo "/sys not mounted. Can't create uswsusp.conf" > /dev/stderr; exit 0; }
+  { echo "/sys not mounted. Can't create uswsusp.conf" >> /dev/stderr; exit 0; }
 mountpoint -q /proc || 
-  { echo "/proc not mounted. Can't create uswsusp.conf" > /dev/stderr; exit 0; }
+  { echo "/proc not mounted. Can't create uswsusp.conf" >> /dev/stderr; exit 0; }
 
 # Reset these flags
 db_fset uswsusp/no_swap hit false
diff -Nru uswsusp-1.0/debian/uswsusp.conf.xml uswsusp-1.0+20110509/debian/uswsusp.conf.xml
--- uswsusp-1.0/debian/uswsusp.conf.xml	2011-03-11 23:53:37.000000000 +0100
+++ uswsusp-1.0+20110509/debian/uswsusp.conf.xml	1970-01-01 01:00:00.000000000 +0100
@@ -1,291 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-
-<!--
-
-Process this file with an XSLT processor: `xsltproc \
--''-nonet /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/\
-manpages/docbook.xsl manpage.dbk'.  A manual page
-<package>.<section> will be generated.  You may view the
-manual page with: nroff -man <package>.<section> | less'.  A
-typical entry in a Makefile or Makefile.am is:
-
-DB2MAN=/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/\
-manpages/docbook.xsl
-XP=xsltproc -''-nonet
-
-manpage.1: manpage.dbk
-        $(XP) $(DB2MAN) $<
-    
-The xsltproc binary is found in the xsltproc package.  The
-XSL files are in docbook-xsl.  Please remember that if you
-create the nroff version in one of the debian/rules file
-targets (such as build), you will need to include xsltproc
-and docbook-xsl in your Build-Depends control field.
-
--->
-
-  <!-- Fill in your name for FIRSTNAME and SURNAME. -->
-  <!ENTITY dhfirstname "<firstname>Tim</firstname>">
-  <!ENTITY dhsurname   "<surname>Dijkstra</surname>">
-  <!-- Please adjust the date whenever revising the manpage. -->
-  <!ENTITY dhdate      "<date>juni 24, 2006</date>">
-  <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
-       allowed: see man(7), man(1). -->
-  <!ENTITY dhsection   "<manvolnum>5</manvolnum>">
-  <!ENTITY dhemail     "<email>tim@famdijkstra.org</email>">
-  <!ENTITY dhusername  "Tim Dijkstra">
-  <!ENTITY dhucpackage "<refentrytitle>uswsusp.conf</refentrytitle>">
-  <!ENTITY dhpackage   "uswsusp">
-  <!ENTITY dhprogram   "uswsusp.conf">
-  <!ENTITY dhsuspend   "s2disk">
-  <!ENTITY dhs2both	"s2both">
-  <!ENTITY dhresume    "resume">
-  <!ENTITY dhkeygen    "suspend-keygen">
-  <!ENTITY dhswapoffset "swap-offset">
-
-
-  <!ENTITY debian      "<productname>Debian</productname>">
-  <!ENTITY gnu         "<acronym>GNU</acronym>">
-  <!ENTITY gpl         "&gnu; <acronym>GPL</acronym>">
-]>
-
-<refentry>
-  <refentryinfo>
-    <address>
-      &dhemail;
-    </address>
-    <author>
-      &dhfirstname;
-      &dhsurname;
-    </author>
-    <copyright>
-      <year>2006</year>
-      <holder>&dhusername;</holder>
-    </copyright>
-    &dhdate;
-  </refentryinfo>
-  <refmeta>
-    &dhucpackage;
-
-    &dhsection;
-  </refmeta>
-  <refnamediv>
-    <refname>&dhprogram;</refname>
-
-    <refpurpose>Config file for the &dhsuspend; program</refpurpose>
-  </refnamediv>
-  <refsect1>
-    <title>DESCRIPTION</title>
-
-    <para>This manual page documents briefly the <command>&dhprogram;</command>
-     file used by the <command>&dhsuspend;</command>, <command>&dhs2both;</command> and <command>&dhresume;</command> commands.</para>
-
-    <para>This manual page was written for the &debian; distribution
-      because the original program does not have a manual page.</para>
-
-    <para><command>&dhsuspend;</command> is a program that will save the
-    the state of the whole system to disk and power off your system.
-    After restarting your system it will be put back in the exact system state
-    you left it (this is sometimes called hibernation).
-    </para>
-    <para>
-    On a &debian; system you can run <command>dpkg-reconfigure &dhpackage;</command> to manage this file.
-    </para>
-  </refsect1>
-  <refsect1>
-    <title>OPTIONS</title>
-
-    <variablelist>
-      <varlistentry>
-        <term><option>snapshot device [=/dev/snapshot]</option>
-        </term>
-        <listitem>
-          <para>
-	  Device via which <command>&dhsuspend;</command> should talk
-	  to the kernel.
-	  </para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>resume device</option>
-        </term>
-        <listitem>
-	    <para>Specifies the device to write the image to. This is a swap partition or 
-		the partition that contains the swap file (see next parameter).
-	    </para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>resume offset</option>
-        </term>
-        <listitem>
-	    <para>
-		Necessary if a swap file is used for suspending.  In such a case 
-		the device identified by the "resume device" parameter is regarded 
-		as the partition that contains the swap file, and "resume offset" must 
-		be equal to the offset from the beginning of this
-		partition at which the swap file's header is located, in &lt;PAGE_SIZE&gt; units.
-		The value of this parameter for given swap file can be determined by the
-		swap-offset program (has to be run as root) included in this package.  [For
-		this feature to work, you will need an \-mm kernel, 2.6.18-mm3 or newer.]
-	    </para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><option>image size</option>
-        </term>
-        <listitem>
-          <para>
-	  Limit the size of the system
-	  snapshot image created by the <command>&dhsuspend;</command> tool, but it's not mandatory. Namely,
-	  the <command>&dhsuspend;</command> tool will do its best to limit the image size as required by
-	  this parameter, but if that's not possible, it will suspend the system anyway,
-	  with a bigger image. If "image size" is set to 0, the snapshot image will be
-	  as small as possible.
-	  
-	  </para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>suspend loglevel</option>
-        </term>
-        <listitem>
-          <para>
-	  
-	  You can specify the kernel console loglevel which the 
-	  <command>&dhsuspend;</command>/<command>&dhs2both;</command> and
-	  <command>&dhresume;</command>
-	   utilities will use to report progress. On a stock kernel messages with
-	    level higher then 7 are usually not shown.
-	    
-	  </para>
-        </listitem>
-    </varlistentry>
-      <varlistentry>
-        <term><option>shutdown method</option>
-        </term>
-        <listitem>
-          <para>
-This parameter defines the operation that will be carried out
-after the suspend image has been created and the machine is ready to be powered
-off.  If it is set to "reboot", the machine will be rebooted immediately.
-If it is set to "platform", the machine will be shut down using special
-power management operations available from the kernel that may be necessary
-for the hardware to be properly reinitialized after the resume, and may cause
-the system to resume faster (this is the recommended shutdown method on the
-majority of systems and hence the defaul).  
-If set to "shutdown" the machine will be powered off. 
-	    
-	  </para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><option>compute checksum</option>
-        </term>
-        <listitem>
-          <para>
-	  If the "compute checksum" parameter is set to 'y', the <command>&dhsuspend;</command> and <command>&dhresume;</command>
-	  tools will use the MD5 algorithm to verify the image integrity.
-	  
-	  </para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>compress</option>
-        </term>
-        <listitem>
-          <para>
-	  If the "compress" parameter is set to 'y', the <command>&dhsuspend;</command> and <command>&dhresume;</command> tools will
-	  use the LZF compression algorithm to compress/decompress the image. 
-	  </para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>encrypt</option>
-        </term>
-        <listitem>
-          <para>
-	  If the "encrypt" parameter is set to 'y', the 
-	  <command>&dhsuspend;</command> and <command>&dhresume;</command> tools will
-	  use the Blowfish encryption algorithm to encrypt/decrypt the image.
-	  On resume and suspend you will have to supply a passphrase.
-	  By using a pregenerated RSA key, you can avoid having to type a
-	  passphrase on suspend.
-	  See the "RSA key file" option for more information.
-	  </para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>RSA key file</option>
-        </term>
-        <listitem>
-          <para>
-	  If this this options points a valid RSA key, which can be created
-	  with <command>&dhkeygen;</command>, 
-	  the <command>&dhsuspend;</command> tool will generate a random
-	  key for the Blowfish encryption that will be passed to the 
-	  <command>&dhresume;</command> tool
-	  within the image header with the help of the RSA cipher. 
-	  Consequently you only need to type a passphrase on resume.
-	  </para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><option>early writeout</option>
-        </term>
-        <listitem>
-          <para>
-	  
-	  If the "early writeout" parameter is set to 'y' is specified, the <command>&dhsuspend;</command>
-	  utility will start syncing the resume device early in the process of writing
-	  the image to it.  [This has been reported to speed up the <command>&dhsuspend;</command> on some
-	  boxes and eliminates the "fast progress meter and long fsync wait" effect.]
-	  
-	  </para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>splash</option>
-        </term>
-        <listitem>
-          <para>
-	  The "splash" parameter is used to make <command>&dhsuspend;</command> and/or <command>&dhresume;</command> use a splash system (when set to 'y').  Currently the bootsplash.org and splashy systems are supported. For the former you need a kernel patch, the later is a userspace solution, but you'll need to install a splashy theme.
-	  </para>
-	  <para>
-	  If you use initramfs-tools on &debian; to generate your initramfs 
-	  (and have splashy installed), the necessary files will be copied to it.
-	  </para>
-        </listitem>
-      </varlistentry>
-      
-      
-    </variablelist>
-  </refsect1>
-  <refsect1>
-    <title>SEE ALSO</title>
-
-    <para>&dhsuspend; (8). &dhkeygen;(8)</para>
-
-  </refsect1>
-  <refsect1>
-    <title>AUTHOR</title>
-
-    <para>This manual page was written by &dhusername; &dhemail; for
-      the &debian; system (but may be used by others).  Permission is
-      granted to copy, distribute and/or modify this document under
-      the terms of the &gnu; General Public License, Version 2 any 
-	  later version published by the Free Software Foundation.
-    </para>
-	<para>
-	  On &debian; systems, the complete text of the GNU General Public
-	  License can be found in /usr/share/common-licenses/GPL.
-	</para>
-
-  </refsect1>
-</refentry>
-
diff -Nru uswsusp-1.0/debian/uswsusp.lintian-overrides uswsusp-1.0+20110509/debian/uswsusp.lintian-overrides
--- uswsusp-1.0/debian/uswsusp.lintian-overrides	1970-01-01 01:00:00.000000000 +0100
+++ uswsusp-1.0+20110509/debian/uswsusp.lintian-overrides	2011-09-25 18:32:36.000000000 +0200
@@ -0,0 +1 @@
+unused-debconf-template
diff -Nru uswsusp-1.0/debian/uswsusp.postinst uswsusp-1.0+20110509/debian/uswsusp.postinst
--- uswsusp-1.0/debian/uswsusp.postinst	2011-03-11 23:53:37.000000000 +0100
+++ uswsusp-1.0+20110509/debian/uswsusp.postinst	2011-09-25 18:01:36.000000000 +0200
@@ -46,15 +46,15 @@
 			# It is permissible for swap to be a regular file, which
 			# is typically not available in a chroot (and this script
 			# needs to work in chroots too).
-			echo "The swapfile $dname could not be found, exiting." > /dev/stdout
+			echo "The swapfile $dname could not be found, exiting." >&1
 			exit 0
 		fi
 		devnode="/dev/"$(awk '$1=='$(($devid>>8))' && $2=='$(($devid&0x00ff))' {print $4}' /proc/partitions)
 
 		# This shouldn't happen that much...
 		if [ ! -b $devnode ]; then
-		    echo "You have a strange /dev layout. " > /dev/stdout
-		    echo "I couldn't find a node with devid $(($devid>>8)):$(($devid&0x00ff))" > /dev/stdout
+		    echo "You have a strange /dev layout." >&1
+		    echo "I couldn't find a node with devid $(($devid>>8)):$(($devid&0x00ff))" >&1
 		    exit 0;
 		fi
 
@@ -63,11 +63,11 @@
 	fi
 
 	if [ ! -f $CONFIGFILE -o ! -s $CONFIGFILE ]; then 
-	    echo "# $CONFIGFILE(8) -- Configuration file for s2disk/s2both " > $CONFIGFILE
+	    echo "# $CONFIGFILE(5) -- Configuration file for s2disk/s2both " > $CONFIGFILE
 	fi
 
 	TMPFILE=`mktemp`
-	cp -a -f $CONFIGFILE $TMPFILE
+	cp -f $CONFIGFILE $TMPFILE
 
 	SEDCMD=""
 	
@@ -98,11 +98,11 @@
 	    else 
 		SEDCMD="$SEDCMD -e '$ a ${I//_/ } = $VAL'"
 	    fi
-		
 	done
 	
 	eval sed $SEDCMD < $CONFIGFILE > $TMPFILE
-	mv -f $TMPFILE $CONFIGFILE
+	eval cat $TMPFILE > $CONFIGFILE
+	eval rm $TMPFILE
 
  	db_get uswsusp/create_RSA_key
 	VAL=$RET
@@ -135,16 +135,19 @@
 		update-initramfs -u;
 	fi
 
-	# Make snapshot device if they chose /dev/snapshot 
+	# Make snapshot device if they choose /dev/snapshot 
 	db_get uswsusp/snapshot_device
 	VAL=$RET
 	if [ -z "$VAL" -a  ! -c /dev/snapshot ] ; then
-		# Until MAKEDEV knows how to make it ... 
-		DEV=`cat /sys/class/misc/snapshot/dev `
-		(cd /dev; ./MAKEDEV snapshot) || mknod /dev/snapshot c ${DEV%:*} ${DEV#*:}
+		if [ -x /dev/MAKEDEV ] ; then
+			# Until MAKEDEV knows how to make it ... 
+			DEV=`cat /sys/class/misc/snapshot/dev `
+			(cd /dev; ./MAKEDEV snapshot) || mknod /dev/snapshot c ${DEV%:*} ${DEV#*:}
+		else
+			echo "The config file is using snapshot device"
+			echo "But /dev/MAKEDEV do not exists!"
+		fi
 	fi
-
-
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)
@@ -164,4 +167,3 @@
 
 exit 0
 
-
diff -Nru uswsusp-1.0/debian/watch uswsusp-1.0+20110509/debian/watch
--- uswsusp-1.0/debian/watch	2011-03-11 23:53:37.000000000 +0100
+++ uswsusp-1.0+20110509/debian/watch	2011-09-25 16:19:30.000000000 +0200
@@ -1,20 +1,2 @@
-# Example watch control file for uscan
-# Rename this file to "watch" and then you can run the "uscan" command
-# to check for upstream updates and more.
-# See uscan(1) for format
-
-# Compulsory line, this is a version 3 file
 version=3
-
-# Uncomment to examine a Webpage 
-# <Webpage URL> <string match>
-#http://www.example.com/downloads.php suspend-(.*)\.tar\.gz
-
-# Uncomment to examine a Webserver directory
-#http://www.example.com/pub/suspend-(.*)\.tar\.gz
-
-# Uncommment to examine a FTP server
-#ftp://ftp.example.com/pub/suspend-(.*)\.tar\.gz debian uupdate
-
-# Uncomment to find new files on sourceforge, for debscripts >= 2.9
 http://sf.net/suspend/suspend-(.*)\.tar\.gz
diff -Nru uswsusp-1.0/README.s2ram-whitelist uswsusp-1.0+20110509/README.s2ram-whitelist
--- uswsusp-1.0/README.s2ram-whitelist	2011-03-07 00:24:15.000000000 +0100
+++ uswsusp-1.0+20110509/README.s2ram-whitelist	2011-05-08 23:56:44.000000000 +0200
@@ -60,104 +60,17 @@
 
 How to use it?
 -------------- 
-Install it, then just call s2ram. If your machine is in the whitelist, it
-should suspend to RAM. Be careful though, some broken drivers need to be
-unloaded before suspend and reloaded after resume. If you just want to know
-if your machine is known and which workarounds (if any) will be used, call
-s2ram -n.
+Install it, then just call s2ram. If your machine is in the whitelist or
+if the kenel supports KMS (Kernel Mode Switch), it should suspend to RAM.
+Be careful though, some broken drivers need to be unloaded before suspend
+and reloaded after resume. If you just want to know if your machine is
+known and which workarounds (if any) will be used, call s2ram -n.
 
 My machine is not in the whitelist, what can i do?
 --------------------------------------------------
-Just find out which workaround is needed for your machine (if any), then
-get this knowledge to us, together with the output of "s2ram -i".
-The workarounds can be activated from the s2ram commandline:
-
-seife@susi:~> s2ram -h
-Usage: s2ram [-nhi] [-fspmrav]
-
-Options:
-    -h, --help:       this text.
-    -n, --test:       test if the machine is in the database.
-                      returns 0 if known and supported
-    -i, --identify:   prints a string that identifies the machine.
-    -f, --force:      force suspending, even on unknown machines.
-
-the following options are only available with --force:
-    -s, --vbe_save:   save VBE state before suspending and restore after resume.
-    -p, --vbe_post:   VBE POST the graphics card after resume
-    -m, --vbe_mode:   get VBE mode before suspend and set it after resume
-    -r, --radeontool: turn off the backlight on radeons before suspending.
-    -a, --acpi_sleep: set the acpi_sleep parameter before suspend
-                      1=s3_bios, 2=s3_mode, 3=both
-    -v, --pci_save:   save the PCI config space for the VGA card.
-
-The options should be mostly self-explaining. Note that you need to use the
--f option on all unknown machines, then add the proper workarounds.
-Option -a needs an additional numeric argument from 1 to 3, specifying
-s3_bios, s3_mode or both.
-The best way to start investigating an unknown machine is probably to
-boot with init=/bin/bash at the boot prompt into a minimal environment,
-then do:
-   mount /proc
-   mount /sys
-   s2ram -f
-
-if the first try already succeeds, everything is fine. Send us the output of
-"s2ram -i". If it doesn't, try the following variations:
-   s2ram -f -a 1
-   s2ram -f -a 2
-   s2ram -f -a 3
-   s2ram -f -p -m
-   s2ram -f -p -s
-   s2ram -f -m
-   s2ram -f -s
-   s2ram -f -p
-   s2ram -f -a 1 -m
-   s2ram -f -a 1 -s
-
-If none of those combination works, start again but add the "-v" switch.
-
-Note: mixing up the "-a" options and the vbetool options ("-p", "-m", "-s")
-is normally only a measure of last resort, it usually does not make much
-sense.
-
-One of those combinations should hopefully get your machine back to life
-(and the backlight back on).
-Once you have found a combination that works, send us that information
-together with the output of "s2ram -i". If you find several combinations
-that work (e.g. "s2ram -f -a 3" and "s2ram -f -p -m" both work on your
-machine), the in-kernel method ("-a") should be preferred over the userspace
-methods ("-p", "-m" and "-s").
-
-Verify all combinations in both cases when reporting success to the s2ram
-developers:
-- when issuing s2ram from console
-- when issuing s2ram from X itself
-
-It is normal that the contents of the text console are gone after using
-"-p" and "-m", on the framebuffer console this can easily be solved by
-switching consoles once. Although this might be better with "-s", still
-"-m" should be the preferred option if it works.  Note that you really
-should try this from a minimal text mode console. Reports that it works
-there are much more useful than those done only from within X. You also do
-not get adverse side effects like shutting down immediately after resume
-from running powermanagement daemons. 
-
-Note that there are some issues that might make suspend fail regardless of
-video, such as IDE drives not properly waking up (using the latest -mm
-kernel sometimes helps here) and APIC issues (booting with "noapic" to
-verify those is sometimes useful).
-
-My machine is in the whitelist but it does not work, what can i do?
--------------------------------------------------------------------
-
-There are some wildcard matches in the whitelist, and it is possible that
-they might match on machines that are different than the originally tested
-ones. The procedure is about the same as with "My machine is not in the
-whitelist": find out which options your particular machine needs and send
-us this information together with the output of "s2ram -n" (better than
-"s2ram -i", because we can see what entry actually matched your machine),
-so we can update the whitelist accordingly. 
+After the suspend version 1.0, with KMS support, no new machines will be
+added to the whitelist. You don't need to do nothing, the new kernels
+support KMS.
 
 How to contact the authors of s2ram?
 ------------------------------------
diff -Nru uswsusp-1.0/s2ram-main.c uswsusp-1.0+20110509/s2ram-main.c
--- uswsusp-1.0/s2ram-main.c	2011-03-07 00:24:15.000000000 +0100
+++ uswsusp-1.0+20110509/s2ram-main.c	2011-05-08 23:56:44.000000000 +0200
@@ -63,10 +63,6 @@
 		case 'n':
 			ret = machine_known();
 			exit(ret);
-		case '?':
-			usage("s2ram", options, optstring);
-			exit(1);
-			break;
 		default:
 			s2ram_add_flag(i,optarg);
 			break;
diff -Nru uswsusp-1.0/whitelist.c uswsusp-1.0+20110509/whitelist.c
--- uswsusp-1.0/whitelist.c	2011-03-07 00:25:10.000000000 +0100
+++ uswsusp-1.0+20110509/whitelist.c	1970-01-01 01:00:00.000000000 +0100
@@ -1,2075 +0,0 @@
-/* whitelist.c
- * whitelist of machines that are known to work somehow
- * and all the workarounds
- * Script generated file, please do not edit by hand
- */
-
-#include "config.h"
-#include <stdlib.h>
-#include "whitelist.h"
-
-char *whitelist_version = "$Id: whitelist.c ver. 20110307 00:25:10 automatic generation - kix - Exp $";
-
-struct machine_entry whitelist[] = {
-	/* Michael Wagner <michael-wagner@gmx.de> */
-	{ "4MBOL&S",	"7521 *",	"REV. A0",	"",	0 },
-	/* Klaus Ade Johnstad <klaus@skolelinux.no> */
-	{ "Acer *",	"AcerPower 2000",	"",	"",	0 },
-	/* Tomáš Kaluža <elpraga@gmail.com> */
-	{ "Acer            ",	"AO532h          ",	"V1.25",	"V1.25",	0 },
-	/* Jan 29, 2010 - Luca Rei <luca.rei@ge...> */
-	{ "Acer            ",	"AO751h           ",	"Not Applicable",	"V0.32*",	0 },
-	/* Jan Matuska <jan.matuska@s-help.sk>, Aspire One 110 */
-	{ "Acer",	"AOA110",	"",	"",	0 },
-	/* Matt Harlum <Matt@cactuar.net> Aspire One 150 + Dec 29, 2009 - Scott Lees <plmeister@gmail.com> */
-	{ "Acer",	"AOA150",	"",	"",	0 },
-	/* Simon Bachmann <simonbachmann@bluewin.ch> works with proprietary ATI driver */
-	{ "Acer *",	"Aspire 1500 *",	"",	"",	VBE_POST|VBE_SAVE },
-	/* Andreas Wagner <A.Wagner@stud.uni-frankfurt.de> */
-	{ "Acer",	"Aspire 1520",	"",	"",	VBE_POST|VBE_MODE },
-	/* Mario J. Borgnia <mborgnia@verizon.net> */
-	{ "Acer           ",	"Aspire 1551                    ",	"V1.11          ",	"V1.11          ",	S3_BIOS|VBE_SAVE },
-	/* Acer Aspire 1620, Sascha Warner <PRX@gmx.net> */
-	{ "Acer           ",	"Aspire 1620    ",	"0100           ",	"V1.05     ",	0 },
-	/* Stefano Sabatini https://bugzilla.novell.com/show_bug.cgi?id=415675 */
-	{ "Acer *",	"Aspire 1670     ",	"",	"",	S3_BIOS|S3_MODE },
-	/* Acer 1810TZ, tom <thoemu@gmail.com> */
-	{ "Acer",	"Aspire 1810TZ",	"v0.3115",	"v0.3115",	0 },
-	/* imported from acpi-support 0.59 "half known". */
-	{ "Acer",	"Aspire 2000*",	"",	"",	VBE_POST|VBE_SAVE|UNSURE },
-	/* Eberhard Niendorf <Eberhard.Niendorf@t-online.de>, kernel 2.6.25.9 */
-	{ "Acer *",	"Aspire 2920 *",	"",	"",	0 },
-	/* Marek Stopka (M4r3k) <marekstopka@gmail.com> */
-	{ "Acer *",	"Aspire 3100 *",	"",	"",	0 },
-	/* From: Bontemps Camille <camille.bontemps@gmail.com> */
-	{ "Acer",	"Aspire 3610",	"",	"",	S3_BIOS|S3_MODE },
-	/* From: Saul Mena Avila <saul_2110@yahoo.com.mx> */
-	{ "Acer",	"Aspire 3620",	"",	"",	S3_BIOS|S3_MODE },
-	/* From: Witmaster <witmaster@op.pl> */
-	{ "Acer            ",	"Aspire 3690 *",	"",	"",	S3_BIOS|S3_MODE },
-	/* Martin Luethi, luethi@vaw.baug.ethz.ch + Mar 21, 2010 - Theo Band <theo.band@of...> */
-	{ "Acer",	"Aspire 4810T",	"",	"",	0 },
-	/* Oct 29, 2010 - Deepak Nayak <deepak201@gm....com> */
-	{ "Acer",	"Aspire 4820T",	"V1.17",	"V1.17",	0 },
-	/* Carlos Corbacho <cathectic@gmail.com> */
-	{ "Acer",	"Aspire 5020",	"",	"",	VBE_POST },
-	/* Fadain Tariq <fadain.tariq@gmail.com> reported S3_BIOS|S3_MODE, but for Donald Curtis <donald@curtisliberty.de> only VBE_* works... NEW: Jun 23, 2010 - Max Sydorenko <maxsydorenko@gmail.com>, KMS shoud be disabled */
-	{ "Acer *",	"Aspire 5100 *",	"",	"",	VBE_SAVE|PCI_SAVE|S3_MODE },
-	/* Damyan Ivanov <dmn@debian.org> */
-	{ "Acer *",	"Aspire 5110 *",	"",	"",	VBE_POST|VBE_MODE },
-	/* Paul Kretek <pk@oz4.org> */
-	{ "Acer            ",	"Aspire 5500Z *",	"",	"",	0 },
-	/* Vadim Dashkevich <vadim.dashkevich@gmail.com> */
-	{ "Acer            ",	"Aspire 5610Z *",	"",	"",	S3_BIOS|S3_MODE },
-	/* Andrey Popov <potopi@gmx.net> */
-	{ "Acer *",	"Aspire 5630 *",	"",	"",	S3_BIOS|S3_MODE },
-	/* Eduardo Bach <hellbach@gmail.com> */
-	{ "Acer *",	"Aspire 5670 *",	"",	"v1.3219",	RADEON_OFF },
-	/* Acer Aspire 5730Z, Will Donnelly <will.donnelly@gmail.com> */
-	{ "Acer           ",	"Aspire 5730                    ",	"0100           ",	"V1.07          ",	0 },
-	/* Vladimir Zapolskiy <vzapolskiy@gmail.com> */
-	{ "Acer",	"Aspire One 753",	"V1.11",	"V1.11",	0 },
-	/* Christine Upadek <5upadek@informatik.uni-hamburg.de> */
-	{ "Acer",	"Extensa 2900",	"",	"",	VBE_POST|VBE_MODE },
-	/* Paolo Herms <paolo.herms@gmx.net> */
-	{ "Acer",	"Extensa 3000 *",	"",	"",	S3_BIOS|S3_MODE },
-	/* seife */
-	{ "Acer            ",	"Extensa 4150 *",	"",	"",	S3_BIOS|S3_MODE },
-	/* Xavier Douville <s2ram@douville.org> */
-	{ "Acer            ",	"Extensa 5620 *",	"",	"",	S3_BIOS|S3_MODE },
-	/* Libor Plucnar <Plucnar.Libor@seznam.cz> */
-	{ "Acer           ",	"Extensa 6220 *",	"",	"",	S3_BIOS },
-	/* Felix Rommel, https://bugzilla.novell.com/show_bug.cgi?id=228572 */
-	{ "Acer,Inc.",	"Aspire 1350",	"",	"",	VBE_POST|VBE_MODE|NOFB },
-	/* Giorgio Lando <patroclo7@gmail.com> */
-	{ "Acer, inc.",	"Aspire 1640     ",	"",	"",	VBE_SAVE },
-	/* Stefano Costa <steko@iosa.it> */
-	{ "Acer, inc.",	"Aspire 1650     ",	"",	"",	VBE_POST|VBE_MODE },
-	/* */
-	{ "Acer, inc.",	"Aspire 1690     ",	"",	"",	VBE_POST|VBE_SAVE },
-	/* Ricardo Garcia <sarbalap+freshmeat@gmail.com> */
-	{ "Acer, inc.",	"Aspire 3000 *",	"",	"",	VBE_POST|VBE_MODE },
-	/* <somewho@gmail.com> */
-	{ "Acer, inc.",	"Aspire 4520 *",	"",	"",	0 },
-	/* Jim Hague <jim.hague@acm.org> */
-	{ "Acer, inc.",	"Aspire 5050 *",	"",	"",	S3_BIOS },
-	/* From: "cj.yap" <chuanren.ye@gmail.com> */
-	{ "Acer, inc.",	"Aspire 5570 *",	"",	"",	VBE_POST|VBE_MODE },
-	/* <vanhtu1987@gmail.com>, probably only with nvidia driver :-( */
-	{ "Acer, inc.",	"Aspire 5580 *",	"",	"",	0 },
-	/* Adrian Levi <adrian.levi@gmail.com>. S3_BIOS reported by: Jun 29, 2010 - morpheus <jacopogg83@li...>. No flags: Feb 10, 2010 - Juraj Misur <juraj.misur@gm...> */
-	{ "Acer, inc.",	"Aspire 5920G *",	"",	"",	0 },
-	/* Ronny Dahl <ronny.dahl@gmx.net> */
-	{ "Acer, inc.",	"Aspire 5920 *",	"",	"",	VBE_POST|VBE_MODE },
-	/* Hannes Reinecke https://bugzilla.novell.com/show_bug.cgi?id=354728 */
-	{ "Acer, inc.",	"Ferrari 1000    ",	"",	"",	VBE_POST|VBE_SAVE },
-	/* */
-	{ "Acer, inc.",	"Ferrari 4000    ",	"",	"",	VBE_POST|VBE_SAVE|NOFB },
-	/* Russ Dill <russ.dill@gmail.com> * does not work with fglrx, trenn@suse.de */
-	{ "Acer, inc.",	"Ferrari 5000    ",	"",	"",	VBE_POST|VBE_MODE },
-	/* Quentin Denis <quentin.denis@gmail.com> */
-	{ "Acer, inc.",	"TravelMate 2310 ",	"",	"",	VBE_POST|VBE_MODE },
-	/* */
-	{ "Acer, inc.",	"TravelMate 3000 ",	"",	"",	VBE_POST|VBE_SAVE },
-	/* Norbert Preining <preining@logic.at>, kernel 2.6.23-rc2++ needed */
-	{ "Acer, inc.",	"TravelMate 3010 ",	"",	"",	VBE_POST|VBE_MODE },
-	/* Momsen Reincke <mreincke@gmx.net> */
-	{ "Acer, inc.",	"TravelMate 3020 ",	"",	"",	VBE_POST|VBE_MODE },
-	/* Rohan Dhruva <rohandhruva@gmail.com> */
-	{ "Acer, inc.",	"TravelMate 3260 ",	"",	"",	VBE_POST|VBE_MODE },
-	/* From: LucaB <lbonco@tin.it> */
-	{ "Acer, inc.",	"TravelMate 4100 ",	"",	"",	VBE_POST|VBE_SAVE },
-	/* Paul Korossy <korossy.p@freemail.hu> */
-	{ "Acer, inc.",	"TravelMate 6291 ",	"",	"",	VBE_POST|VBE_MODE },
-	/* imported from acpi-support 0.59 "half known". */
-	{ "Acer, inc.",	"TravelMate 8100*",	"",	"",	VBE_POST|VBE_SAVE|UNSURE },
-	/* Sven Foerster <madman-sf@gmx.de> */
-	{ "Acer, inc.",	"TravelMate C200 ",	"",	"",	0 },
-	/* decoder <decoder@own-hero.net> */
-	{ "Acer, inc.",	"Xspire 1650 *",	"",	"",	0 },
-	/* Arkadiusz Miskiewicz <arekm@maven.pl> */
-	{ "Acer",	"TravelMate 2300",	"",	"",	VBE_POST|VBE_MODE },
-	/* Sridar Dhandapani <sridar@gmail.com> */
-	{ "Acer           ",	"TravelMate 230 ",	"",	"",	S3_BIOS|S3_MODE },
-	/* Arjan Oosting <arjanoosting@home.nl> */
-	{ "Acer",	"TravelMate 2350 *",	"",	"",	S3_BIOS|S3_MODE },
-	/* */
-	{ "Acer           ",	"TravelMate 240 ",	"",	"",	VBE_POST|VBE_SAVE },
-	/* jan sekal <jsekal@seznam.cz> */
-	{ "Acer",	"TravelMate 2410",	"",	"",	S3_BIOS|S3_MODE },
-	/* Peter Stolz <p.stolz@web.de> */
-	{ "Acer",	"TravelMate 2420",	"",	"",	S3_BIOS|S3_MODE },
-	/* Erki Ferenc <ferki@3rdparty.hu> */
-	{ "Acer            ",	"TravelMate 2450 ",	"",	"",	0 },
-	/* Vit Cepela <vitek@shar.cz> */
-	{ "Acer            ",	"TravelMate 2490 ",	"",	"",	S3_BIOS|S3_MODE },
-	/* */
-	{ "Acer            ",	"TravelMate 3220 *",	"",	"",	S3_BIOS|S3_MODE },
-	/* Andreas Juch <andreas.juch@tele2.at> */
-	{ "Acer",	"TravelMate 4000",	"",	"",	S3_BIOS|S3_MODE },
-	/* gebu@seznam.cz */
-	{ "Acer",	"TravelMate 4400",	"",	"",	0 },
-	/* */
-	{ "Acer            ",	"TravelMate 4650 *",	"",	"",	S3_BIOS|S3_MODE },
-	/* Adrian C. <anrxc@sysphere.org> */
-	{ "Acer *",	"TravelMate 5320 *",	"",	"",	S3_BIOS|S3_MODE },
-	/* TravelMate 630Lci	Tim Dijkstra <tim@famdijkstra.org> */
-	{ "Acer           ",	"TravelMate 630 ",	"",	"",	S3_BIOS|S3_MODE },
-	/* Hubert Lepicki <hubert.lepicki@gmail.com> */
-	{ "Acer",	"TravelMate 6492",	"",	"",	0 },
-	/* Norbert Preining */
-	{ "Acer",	"TravelMate 650",	"",	"",	VBE_POST|VBE_SAVE },
-	/* imported from acpi-support 0.59 "half known". */
-	{ "Acer",	"TravelMate 660*",	"",	"",	VBE_POST|VBE_SAVE|UNSURE },
-	/* <leva@ecentrum.hu> */
-	{ "Acer",	"TravelMate 7520",	"",	"",	S3_BIOS },
-	/* Martin Sack, this one may be NOFB, to be verified */
-	{ "Acer",	"TravelMate 800",	"",	"",	VBE_POST },
-	/* */
-	{ "Acer           ",	"TravelMate C300",	"",	"",	VBE_SAVE },
-	/* Mar 15, 2010 - Robert Jason Meerman <robert.meerman@gm...> */
-	{ "Acer                 		     ",	"TravelMate C310              	     ",	"0100           ",	"V1.08     ",	0 },
-	/* AMI :-), Mario Maas <mariomaas@googlemail.com> */
-	{ "American Megatrends Inc.",	"Uknown",	"1.0",	"P2.00",	0 },
-	/* Ian <no-spam@people.net.au> ASI Claro TW7M Notebook */
-	{ "AnabelleB",	"Claro TW7M",	"",	"",	S3_BIOS|S3_MODE },
-	/* Alexander Wirt reported "VBE_SAVE", but Penny Leach <penny@she.geek.nz> needs VBE_POST|VBE_MODE */
-	{ "Apple Computer, Inc.",	"MacBook1,1",	"",	"",	VBE_POST|VBE_MODE },
-	/* Marvin Stark <marv@der-marv.de> */
-	{ "Apple Computer, Inc.",	"MacBook2,1",	"",	"",	VBE_POST },
-	/* Brian Kroth <bpkroth@wisc.edu>, newer BIOS does not like VBE_POST?, (sys_ver:"   MBP22.88Z.00A5.B00.0610192105", VBE_POST|VBE_MODE, Julien BLACHE jb@jblache.org) */
-	{ "Apple Computer, Inc.",	"MacBookPro2,2",	"",	"",	VBE_MODE },
-	/* Mildred <ml.mildred593@online.fr>, needs VBE_SAVE from console, but that slows resuming */
-	{ "Apple Inc.",	"MacBook2,1",	"1.0",	"",	0 },
-	/* <skanabiz@gmail.com>  Kernel 2.6.26-rc9, probably with i910 */
-	{ "Apple Inc.",	"MacBook3,1",	"1.0",	"",	0 },
-	/* Tilman Vogel <tilman.vogel@web.de>, only works from X */
-	{ "Apple Inc.",	"MacBookPro4,1",	"",	"",	0 },
-	/* Giovanni Toraldo <scurippio@gmail.com>, no flags tested */
-	{ "Apple Inc.",	"MacBookPro5,1",	"1.0",	"   MBP51.88Z.007E.B00.0902031928",	0 },
-	/* Macbook 5,5, Giorgio <giorgio@gilestro.tk> */
-	{ "Apple Inc.",	"MacBookPro5,5",	"1.0",	"   MBP55.88Z.00AC.B03.0906151708",	0 },
-	/* Aug 18, 2010 - Michel Bauer <michel.bauer@ce...> (nvidia propietary driver */
-	{ "Apple Inc.",	"MacBookPro6,2",	"1.0",	"   MBP61.88Z.0057.B0A.1005121001",	0 },
-	/* ASUS a7v600 motherboard, has no usable sys_* entries besides bios_version :-( reported by James Spencer */
-	{ "",	"",	"",	"ASUS A7V600 ACPI BIOS Revision *",	S3_BIOS|S3_MODE },
-	/* Gabriel <gabriel@opensuse.org> */
-	{ "",	"",	"",	"ASUS A7V8X-X ACPI BIOS Revision *",	VBE_POST|VBE_MODE },
-	/* ASUS A7V Mainboard, Michael Klein <michael.klein@puffin.lb.shuttle.de> */
-	{ "",	"",	"",	"ASUS A7V ACPI BIOS Revision *",	0 },
-	/* Tristan Hoffmann <info@tristanhoffmann.de> Newer bios revisions (1705) seem to need VBE_POST, bios_ver: "ASUS M2A-VM ACPI BIOS Revision 1101", S3_BIOS|VBE_MODE, Andreas Bolsch <Andreas.Bolsch@alumni.TU-Berlin.DE>, Lajos Bor�czki <boroczki.lajos@gmail.com> reports S3_BIOS|S3_MODE because -f fails on console */
-	{ "",	"",	"",	"ASUS M2A-VM ACPI BIOS Revision *",	VBE_POST|VBE_MODE },
-	/* Jan Schaefer <jan.schaefer@gmail.com> */
-	{ "",	"",	"",	"ASUS M2A-VM HDMI ACPI BIOS Revision 1603",	VBE_POST|VBE_MODE },
-	/* */
-	{ "",	"",	"",	"ASUS M2N32-SLI DELUXE ACPI BIOS Revision 1101",	VBE_POST|VBE_MODE },
-	/* another ASUS Mainboard, reported by mailinglist@prodigy7.de */
-	{ "",	"",	"",	"ASUS M2N32-SLI DELUXE ACPI BIOS Revision 1201",	VBE_POST|VBE_MODE },
-	/* ASUS M2N-E motherboars, not much usable in DMI :-( reported by Ingo <ingo.steiner@gmx.net> */
-	{ "",	"",	"",	"ASUS M2N-E ACPI BIOS Revision *",	0 },
-	/* another ASUS Mainboard, RidewithStyle <ridewithstyle@googlemail.com> */
-	{ "",	"",	"",	"ASUS Striker ACPI BIOS Revision *",	0 },
-	/* Cristian Rigamonti */
-	{ "ASUSTEK ",	"A2H/L ",	"",	"",	0 },
-	/* Daniel Willkomm <plabo@willkomms.de> EEE 1000H */
-	{ "ASUSTeK Computer INC.",	"1000H",	"",	"",	0 },
-	/* ASUS Eeepc 1002HA, Miguel Figueiredo <elmig@debianpt.org> */
-	{ "ASUSTeK Computer INC.",	"1002HA",	"x.x",	"0802   ",	0 },
-	/* ASUS Eeepc 1005HA, Raphael Scholer <raphael@scholer-online.de> (bios_version="0703   ", J�r�me H�nin <heninj@gmail.com>, (bios_version="0505   ") */
-	{ "ASUSTeK Computer INC.",	"1005HA",	"x.x",	"",	0 },
-	/* James Dewar <ameotoko@gmail.com> */
-	{ "ASUSTeK Computer INC.",	"1005PR",	"x.x",	"0201   ",	S3_BIOS|S3_MODE },
-	/* Oct 5, 2010 - Brandon Kase <bkase@....edu> */
-	{ "ASUSTeK Computer INC.",	"1015PE",	"x.x",	"0601   ",	S3_BIOS },
-	/* Jul 2, 2010 - Brian Harkness <maestro_bwh@ya...> */
-	{ "ASUSTeK Computer INC.",	"1201T",	"x.x",	"0317   ",	0 },
-	/* Andrea Zucchelli <zukka77@gmail.com> EEE-PC 4G */
-	{ "ASUSTeK Computer INC.",	"701",	"",	"",	VBE_POST|VBE_MODE },
-	/* Jul 3, 2010 - <jon@wh...> */
-	{ "ASUSTeK Computer INC.",	"900",	"0704",	"0802*",	0 },
-	/* Apr 10, 2010 - Bernhard M. Wiedemann <s2rambmw@ls...> */
-	{ "ASUSTeK Computer INC.",	"900A",	"x.x",	"0403   ",	0 },
-	/* From: Julien Puydt <jpuydt@free.fr> */
-	{ "ASUSTeK Computer Inc.",	"A2D       ",	"",	"",	S3_BIOS|S3_MODE },
-	/* Asus A3N, Stephan Schaller <raw-jaw@gmx.de> */
-	{ "ASUSTeK Computer Inc.        ",	"A3N       ",	"1.0       ",	"0215                     ",	S3_BIOS },
-	/* Thomas Thrainer <tom_t@gmx.at> */
-	{ "ASUSTeK Computer Inc.*",	"A6G       ",	"",	"",	0 },
-	/* Piotr Drozdek <pioruns@o2.pl> */
-	{ "ASUSTeK Computer Inc. ",	"A6JC *",	"",	"",	0 },
-	/* Arnout Boelens <aboelens@engin.umass.edu> */
-	{ "ASUSTeK Computer Inc. ",	"A6J *",	"",	"",	VBE_POST|VBE_MODE },
-	/* Tom Gruben <tom.gruben@gmail.com>, maybe only with nvidia? */
-	{ "ASUSTeK Computer Inc. ",	"A6K *",	"",	"",	0 },
-	/* Patryk Zawadzki <patrys@icenter.pl> */
-	{ "ASUSTeK Computer Inc. ",	"A6Km      ",	"",	"",	0 },
-	/* Tom Malfrere <tom.malfrere@pandora.be> */
-	{ "ASUSTeK Computer Inc. ",	"A6Kt      ",	"",	"",	S3_BIOS|S3_MODE },
-	/* Szalai Akos <szalakos@gmail.com> */
-	{ "ASUSTeK Computer Inc. ",	"A6M",	"",	"",	VBE_POST },
-	/* Anthony Mahe <anthonymahe@gmail.com> */
-	{ "ASUSTeK Computer INC. ",	"A6T",	"",	"",	0 },
-	/* tias@ulyssis.org */
-	{ "ASUSTeK Computer Inc. ",	"A6U       ",	"",	"",	VBE_POST|VBE_MODE },
-	/* Daniel Bumke <danielbumke@gmail.com> */
-	{ "ASUSTeK Computer INC. ",	"A6VA      ",	"",	"",	0 },
-	/* Alex Myltsev <avm@altlinux.ru> */
-	{ "ASUSTeK Computer Inc. ",	"A8He *",	"",	"",	S3_BIOS|S3_MODE },
-	/* Oliver Moessinger <olivpass@web.de> */
-	{ "ASUSTeK Computer Inc. ",	"A8JS *",	"",	"",	0 },
-	/* Arkadiusz Miskiewicz <arekm@maven.pl> */
-	{ "ASUSTeK Computer Inc. ",	"F2J *",	"",	"",	S3_BIOS },
-	/* Julien Puydt <jpuydt@free.fr> works from console and with nvidia driver, S3_BIOS|S3_MODE (q0mw3fk02@sneakemail.com) */
-	{ "ASUSTeK Computer Inc. ",	"F3F *",	"",	"",	0 },
-	/* Daniel Kinzler <daniel@brightbyte.de> */
-	{ "ASUSTeK Computer Inc. ",	"F3JC *",	"",	"",	S3_BIOS|S3_MODE },
-	/* Marco Jorge <mbernardesjorge@users.sourceforge.net> */
-	{ "ASUSTeK Computer Inc. ",	"F3JP *",	"",	"",	VBE_POST|VBE_MODE },
-	/* Oliver Neukum, only works without FB, https://bugzilla.novell.com/show_bug.cgi?id=425071 */
-	{ "ASUSTeK Computer Inc. ",	"F3Ka *",	"",	"",	VBE_POST|VBE_SAVE|NOFB },
-	/* Anghinolfi Luca <anghi83@gmail.com> */
-	{ "ASUSTeK Computer INC. *",	"F3Sg *",	"",	"",	0 },
-	/* Vladimir Pouzanov <farcaller@gmail.com>, probably only with nvidia and from X */
-	{ "ASUSTeK Computer INC. ",	"F3T",	"",	"",	0 },
-	/* Asus F80L laptop, Manuel P�gouri�-Gonnard <mpg@elzevir.fr> */
-	{ "ASUSTeK Computer Inc.        ",	"F80L                ",	"1.0       ",	"204    ",	VBE_POST },
-	/* Enrico Zini <enrico@enricozini.org> */
-	{ "ASUSTeK Computer Inc. *",	"F9E *",	"",	"",	0 },
-	/* Paul Cousins <namain@gmail.com> */
-	{ "ASUSTeK Computer Inc. *",	"G1S *",	"",	"",	0 },
-	/* ASUS Mainboard, Christoph Jaeschke <chrjae@arcor.de> */
-	{ "ASUSTek Computer Inc.",	"K8N-E-Deluxe",	"",	"",	S3_BIOS },
-	/* Asus Mainboard, Ian McAnena <ianegg@gmail.com> */
-	{ "ASUSTeK Computer Inc.",	"K8V-MX",	"",	"",	0 },
-	/* imported from acpi-support 0.59 "half known". */
-	{ "ASUSTeK Computer Inc.",	"L7000G series Notebook PC*",	"",	"",	VBE_POST|VBE_SAVE|UNSURE },
-	/* Guenther Schwarz <guenther.schwarz@gmx.de> */
-	{ "ASUSTeK Computer Inc.        ",	"M2N       ",	"",	"",	S3_BIOS|S3_MODE },
-	/* Peter Suetterlin <P.Suetterlin@astro.uu.nl>, VBE_MODE does not work */
-	{ "ASUSTeK Computer Inc.        ",	"M3N       ",	"",	"",	VBE_POST|VBE_SAVE },
-	/* Galeffi Christian gallochri2@alice.it */
-	{ "ASUSTeK Computer Inc.        ",	"M51Sr *",	"",	"",	S3_MODE },
-	/* Charles de Miramon */
-	{ "ASUSTeK Computer Inc.        ",	"M5N       ",	"",	"",	S3_BIOS|S3_MODE },
-	/* */
-	{ "ASUSTeK Computer Inc.        ",	"M6Ne      ",	"",	"",	S3_MODE },
-	/* Manfred Tremmel, https://bugzilla.novell.com/show_bug.cgi?id=171107 */
-	{ "ASUSTeK Computer Inc.        ",	"M6N       ",	"",	"",	S3_BIOS|S3_MODE },
-	/* M6VA, seraphim@glockenbach.net */
-	{ "ASUSTeK Computer Inc.        ",	"M6VA      ",	"",	"",	S3_BIOS|S3_MODE },
-	/* M7N, Xavier Douville <s2ram-sourceforge@douville.org> */
-	{ "ASUSTeK Computer Inc.        ",	"M7A       ",	"",	"",	S3_BIOS|S3_MODE },
-	/* Mar 4, 2010 - Igor Ternovsky <igor.ternovsky@gm...> */
-	{ "ASUSTeK Computer Inc.        ",	"N50Vc                ",	"1.0       ",	"211    ",	0 },
-	/* ASUS S5200N Philip Frei <pjf@gmx.de> */
-	{ "ASUSTeK Computer Inc.        ",	"S5N       ",	"",	"",	S3_BIOS|S3_MODE },
-	/* Tobias Rothe <ir268155@mail.inf.tu-dresden.de> */
-	{ "ASUSTeK Computer Inc.        ",	"U3S *",	"",	"",	VBE_POST|VBE_SAVE },
-	/* ASUS U5F, Krzysztof Krzyzaniak <eloy@kofeina.net> */
-	{ "ASUSTeK Computer Inc. ",	"U5F *",	"",	"",	S3_BIOS },
-	/* Oct 20, 2010 - Simon Hafner <hafnersimon@gmail.com> */
-	{ "ASUSTeK Computer Inc.        ",	"UL30A               ",	"1.0       ",	"206    ",	S3_MODE },
-	/* Apr 22, 2010 - Florian Ragwitz <rafl@de...> */
-	{ "ASUSTeK Computer Inc.        ",	"UL30A               ",	"1.0       ",	"212    ",	0 },
-	/* Szymon Olko <szymonolko@o2.pl> */
-	{ "ASUSTeK Computer Inc. ",	"V1J *",	"",	"",	VBE_POST|VBE_MODE|NOFB },
-	/* ASUS V6V, Johannes Engel <j-engel@gmx.de> */
-	{ "ASUSTeK Computer INC.",	"V6V",	"",	"",	S3_MODE },
-	/* Kanru Chen <kanru@csie.us> */
-	{ "ASUSTeK Computer INC.",	"W3A",	"",	"",	S3_BIOS|S3_MODE },
-	/* ASUS W5A, Riccardo Sama' <riccardo.sama@yetopen.it> */
-	{ "ASUSTeK Computer Inc.        ",	"W5A       ",	"",	"",	S3_BIOS|S3_MODE },
-	/* imported from acpi-support 0.59 "half known". */
-	{ "ASUSTeK Computer Inc.",	"W5A*",	"",	"",	VBE_POST|VBE_SAVE|UNSURE },
-	/* ASUS W7J, https://bugzilla.novell.com/show_bug.cgi?id=351661 */
-	{ "ASUSTeK Computer Inc.",	"W7J *",	"",	"",	VBE_MODE },
-	/* Mar 11, 2010 - 易松林 <yisl04@gm...> */
-	{ "ASUSTeK Computer Inc.        ",	"W7Sg                ",	"1.0       ",	"309    ",	0 },
-	/* Bernhard M. Wiedemann <s2rambmw@lsmod.de>, works with radeon and fglrx */
-	{ "ASUSTeK Computer Inc.",	"X51RL *",	"",	"",	VBE_POST|VBE_SAVE },
-	/* ASUS Z35Fm, Francois Marier <francois@debian.org> */
-	{ "ASUSTeK Computer Inc.        ",	"Z35FM *",	"",	"",	S3_BIOS|PCI_SAVE },
-	/* */
-	{ "ASUSTEK ",	"L2000D",	"",	"",	S3_MODE },
-	/* */
-	{ "ASUSTEK ",	"L3000D",	"",	"",	VBE_POST|VBE_SAVE },
-	/* Carl Troein <carl@thep.lu.se> */
-	{ "ASUSTEK ",	"M2000E",	"",	"",	S3_BIOS },
-	/* Ross Patterson <me@rpatterson.net> */
-	{ "AVERATEC",	"1000 Series",	"",	"",	S3_BIOS|S3_MODE },
-	/* Mark Stillwell */
-	{ "AVERATEC",	"3700 Series",	"",	"",	S3_BIOS|S3_MODE },
-	/* Joel Dare <joel@joeldare.com> */
-	{ "AVERATEC",	"5500 Series",	"",	"",	S3_MODE },
-	/* Sebastian Maus <sebastian.maus@bluemars.net> */
-	{ "BENQ",	"JoyBook 7000",	"GRASSHOPPER2",	"",	S3_BIOS|S3_MODE },
-	/* Andreas Schmitz */
-	{ "BenQ           ",	"Joybook R22",	"",	"",	S3_BIOS|S3_MODE },
-	/* Miroslav Hruz <miroslav.hruz@gmail.com> */
-	{ "BenQ",	"Joybook S32",	"",	"",	VBE_POST|VBE_MODE },
-	/* Paul Duncan <eresse@greenpixel.ch> */
-	{ "BenQ",	"Joybook S52",	"",	"",	VBE_POST|VBE_MODE },
-	/* Apr 6, 2010 - John Rusnak <john.rusnak@mi...> */
-	{ "BIOSTAR Group",	"N61PB-M2S",	" ",	"6.00 PG",	0 },
-	/* Feb 11, 2010 - Gernot Schilling <gernot@ns...> */
-	{ "BIOSTAR Group",	"TA780G M2+",	"6.0",	"080014 ",	0 },
-	/* Noah Romer <baronmog@gm....com> */
-	{ "CLEVO CO.                       ",	"M570TU                          ",	"Not Applicable                  ",	"1.00.10",	0 },
-	/* Roel van den Berg <beroslingblade@gmail.com> */
-	{ "CLEVO CO.              ",	"M860TU                 ",	"Not Applicable",	"1.00.06",	0 },
-	/* Alexandre Viard <alexandre.viard@gmail.com> */
-	{ "CLEVO CO.",	"TN120R",	"",	"",	0 },
-	/* John K Pate <j.k.pate@sms.ed.ac.uk> */
-	{ "CLEVO CO.                       ",	"W760T/M740T/M760T               ",	"Not Applicable",	"1.00.03",	0 },
-	/* Gilles Grandou <gilles@grandou.net> */
-	{ "CLEVO",	"D500P",	"",	"",	VBE_POST|NOFB },
-	/* Francisco Neto <frc_neto@yahoo.com.br> */
-	{ "CLEVO ",	"M5X0JE ",	"",	"",	S3_BIOS },
-	/* Justin Lewis <jlew.blackout@gmail.com> */
-	{ "COMPAL",	"HEL80C          ",	"",	"",	0 },
-	/* Leszek Kubik <leszek.kubik@googlemail.com> */
-	{ "COMPAL          ",	"HEL80I          ",	"",	"",	0 },
-	/* Jason Clinton <jclinton@advancedclustering.com> */
-	{ "COMPAL *",	"HEL81I *",	"",	"",	0 },
-	/* This Armada m300, reported by benoit.monin@laposte.net seems not to have a useful model description, so to make sure i also added the bios_version */
-	{ "Compaq",	"Armada                                     ",	"",	"1.35",	0 },
-	/* seife has some of those */
-	{ "Compaq",	"Armada    E500  *",	"",	"",	0 },
-	/* <marmodoro@libero.it> */
-	{ "Compaq",	"Armada    M700 *",	"",	"",	0 },
-	/* Rod Schafter rschaffter@comcast.net */
-	{ "Compaq",	"Armada    M70  *",	"",	"",	0 },
-	/* Martin Heimes <martin.heimes@gmx.de> */
-	{ "Compaq",	"Evo  D510 USDT",	"",	"",	0 },
-	/* Viktor Placek <viktor.placek@fs.cvut.cz> */
-	{ "Compaq",	"Evo N400c *",	"",	"",	0 },
-	/* Joel Schaerer <joel.schaerer@insa-lyon.fr> has a later BIOS and needs different Options :-/ sys_ver:"F.05", VBE_POST|VBE_SAVE, Chris AtLee <chris@atlee.ca>, VBE_MODE does not work, text size changes. */
-	{ "Compaq ",	"Evo N800w *",	"",	"",	S3_BIOS|S3_MODE|VBE_POST|VBE_MODE },
-	/* */
-	{ "Compaq*",	"N620c *",	"",	"",	S3_BIOS|S3_MODE },
-	/* Paolo Saggese <pmsa4-gen@yahoo.it> */
-	{ "Compaq",	"Presario 2701EA *",	"",	"",	VBE_POST|VBE_SAVE|NOFB },
-	/* Ed Barrett <ebarrett@tadl.tcnet.org> */
-	{ "Dell Computer Corp.",	"Latitude LS  ",	"",	"",	0 },
-	/* Alain Prignet <alain.prignet@univ-mlv.fr> */
-	{ "Dell Computer Corp.",	"Latitude X200",	"",	"",	VBE_POST|VBE_SAVE },
-	/* Michael Witten mfwitten@MIT.EDU */
-	{ "Dell Computer Corporation",	"Dimension 2400 *",	"",	"",	VBE_POST|VBE_MODE },
-	/* Allen <ducalen@sympatico.ca>, Desktop with onboard grephics */
-	{ "Dell Computer Corporation",	"Dimension 3000 *",	"",	"",	VBE_POST|VBE_MODE },
-	/* Eitan Mosenkis <eitan@mosenkis.net> */
-	{ "Dell Computer Corporation",	"Inspiron 1100 *",	"",	"",	VBE_POST|VBE_MODE },
-	/* From bug 1544913@sf.net, Andrei - amaces */
-	{ "Dell Computer Corporation",	"Inspiron 1150*",	"",	"",	0 },
-	/* imported from acpi-support 0.59 "half known". */
-	{ "Dell Computer Corporation",	"Inspiron 1200*",	"",	"",	VBE_POST|VBE_SAVE|UNSURE },
-	/* Dell Inspiron 500m, Georg Zumstrull <Georg.Zumstrull@web.de> */
-	{ "Dell Computer Corporation",	"Inspiron 500m*",	"",	"",	VBE_POST|VBE_MODE },
-	/* Eric Sandall <eric@sandall.us> */
-	{ "Dell Computer Corporation",	"Inspiron 5100 *",	"",	"",	NOFB },
-	/* Another Inspiron 5100, Tony Ernst <tee@sgi.com> */
-	{ "Dell Computer Corporation",	"Inspiron 5100",	"Revision A0",	"",	VBE_SAVE|VBE_MODE|PCI_SAVE },
-	/* VBE_POST|VBE_SAVE works on text console, but not under X. Tested by Chirag Rajyaguru */
-	{ "Dell Computer Corporation",	"Inspiron 5150*",	"",	"",	VBE_SAVE },
-	/* Felipe Alvarez https://bugzilla.novell.com/show_bug.cgi?id=364429 */
-	{ "Dell Computer Corporation",	"Inspiron 5160*",	"",	"",	VBE_POST|VBE_MODE },
-	/* imported from acpi-support 0.59 "half known". */
-	{ "Dell Computer Corporation",	"Inspiron 6000*",	"",	"",	VBE_POST|VBE_SAVE|UNSURE },
-	/* Dell Inspiron 600m, Gavrie Philipson <gavrie@gmail.com> */
-	{ "Dell Computer Corporation",	"Inspiron 600m *",	"",	"",	VBE_POST|VBE_MODE },
-	/* imported from acpi-support 0.59 "half known". */
-	{ "Dell Computer Corporation",	"Inspiron 700m*",	"",	"",	VBE_POST|VBE_SAVE|UNSURE },
-	/* */
-	{ "Dell Computer Corporation",	"Inspiron 8000 *",	"",	"",	VBE_POST|VBE_SAVE },
-	/* imported from acpi-support 0.59 "half known". */
-	{ "Dell Computer Corporation",	"Inspiron 8100*",	"",	"",	VBE_POST|VBE_SAVE|UNSURE },
-	/* imported from acpi-support 0.59 "half known". */
-	{ "Dell Computer Corporation",	"Inspiron 8200*",	"",	"",	VBE_POST|VBE_SAVE|UNSURE },
-	/* by Henare Degan <henare.degan@gmail.com> 8500 w. NVidia card. There are also 8500s w. ATI cards */
-	{ "Dell Computer Corporation",	"Inspiron 8500 *",	"",	"",	VBE_POST|VBE_SAVE },
-	/* imported from acpi-support 0.59 "half known". */
-	{ "Dell Computer Corporation",	"Inspiron 8600*",	"",	"",	VBE_POST|VBE_SAVE|UNSURE },
-	/* imported from acpi-support 0.59 "half known". */
-	{ "Dell Computer Corporation",	"Inspiron 9300*",	"",	"",	VBE_POST|VBE_SAVE|UNSURE },
-	/* imported from acpi-support 0.59 "half known". */
-	{ "Dell Computer Corporation",	"Latitude 110L*",	"",	"",	VBE_POST|VBE_SAVE|UNSURE },
-	/* Bernie du Breuil <bmrcldb56@yahoo.com> */
-	{ "Dell Computer Corporation",	"Latitude C400 *",	"",	"",	VBE_POST|VBE_SAVE },
-	/* */
-	{ "Dell Computer Corporation",	"Latitude C600 *",	"",	"",	RADEON_OFF },
-	/* */
-	{ "Dell Computer Corporation",	"Latitude C610 *",	"",	"",	VBE_POST|VBE_MODE },
-	/* Tom Lear <tom@trap.mtview.ca.us> */
-	{ "Dell Computer Corporation",	"Latitude C840 *",	"",	"",	VBE_POST|VBE_SAVE },
-	/* Manuel Jander */
-	{ "Dell Computer Corporation",	"Latitude CPx J650GT*",	"",	"",	0 },
-	/* Luke Myers */
-	{ "Dell Computer Corporation",	"Latitude CPx J800GT*",	"",	"",	VBE_POST|VBE_MODE },
-	/* https://bugzilla.novell.com/show_bug.cgi?id=366460 */
-	{ "Dell Computer Corporation",	"Latitude D400 *",	"",	"",	VBE_POST|VBE_MODE },
-	/* imported from acpi-support 0.59 "half known". */
-	{ "Dell Computer Corporation",	"Latitude D410*",	"",	"",	VBE_POST|VBE_SAVE|UNSURE },
-	/* Roland Hagemann <mail@rolandhagemann.de> */
-	{ "Dell Computer Corporation",	"Latitude D500 *",	"",	"",	VBE_POST|VBE_SAVE },
-	/* imported from acpi-support 0.59 "half known". */
-	{ "Dell Computer Corporation",	"Latitude D510*",	"",	"",	VBE_POST|VBE_SAVE|UNSURE },
-	/* */
-	{ "Dell Computer Corporation",	"Latitude D600 *",	"",	"",	VBE_POST|VBE_SAVE|NOFB },
-	/* */
-	{ "Dell Computer Corporation",	"Latitude D800 *",	"",	"",	VBE_POST|VBE_SAVE },
-	/* imported from acpi-support 0.59 "half known". */
-	{ "Dell Computer Corporation",	"Latitude D810*",	"",	"",	VBE_POST|VBE_SAVE|UNSURE },
-	/* imported from acpi-support 0.59 "half known". */
-	{ "Dell Computer Corporation",	"Latitude X1*",	"",	"",	VBE_POST|VBE_SAVE|UNSURE },
-	/* imported from acpi-support 0.59 "half known". */
-	{ "Dell Computer Corporation",	"Latitude X300*",	"",	"",	VBE_POST|VBE_SAVE|UNSURE },
-	/* Seppe Hoogzaad <seppe.hoogzaad@gmail.com> */
-	{ "Dell Computer Corporation",	"OptiPlex 170L *",	"",	"",	0 },
-	/* Ian McAnena <ianegg@gmail.com>, zhengdao@iastate.edu */
-	{ "Dell Computer Corporation",	"OptiPlex GX260 *",	"",	"",	VBE_POST|VBE_MODE },
-	/* Aug 28, 2010 - Klaviersegler <klaviersegler@g...de> */
-	{ "Dell Computer Corporation",	"OptiPlex GX270               ",	"",	"A07",	VBE_POST|VBE_MODE },
-	/* imported from acpi-support 0.59 "half known". */
-	{ "Dell Computer Corporation",	"Precision M20*",	"",	"",	VBE_POST|VBE_SAVE|UNSURE },
-	/* Per Øyvind Karlsen <pkarlsen@mandriva.com> VBE_POST will get console working, but break X */
-	{ "Dell Computer Corporation",	"Precision M60*",	"",	"",	VBE_SAVE },
-	/* Christoph Pacher <christoph.pacher@arcs.ac.at>, maybe only with nvidia driver :-( */
-	{ "Dell Computer Corporation",	"Precision WorkStation 360*",	"",	"",	0 },
-	/* Richard Osborne <r.osborne@bigfoot.com>, Dimension E520 */
-	{ "Dell Inc. *",	"Dell DM061 *",	"",	"",	0 },
-	/* Struan Bartlett <struan.bartlett@NewsNow.co.uk> */
-	{ "Dell Inc.                ",	"Dell DXP051 *",	"",	"",	0 },
-	/* Edward Webb https://bugzilla.novell.com/show_bug.cgi?id=428181 */
-	{ "Dell Inc. *",	"Dimension 9100 *",	"",	"",	VBE_POST|VBE_MODE },
-	/* Dell Inspiron 1010, Alfredo Rezinovsky <alfredo@rezinovsky.com.ar> */
-	{ "Dell Inc.",	"Inspiron 1010   ",	"A09",	"A09",	VBE_POST|VBE_SAVE },
-	/* Alex Palecek <alex.palecek@gmail.com> +  May 23, 2010 - Graeme Roberts <chee@sn...> */
-	{ "Dell Inc.",	"Inspiron 1011",	"A06",	"A06",	0 },
-	/* Jamie Kitson <jamie@kitten-x.com> */
-	{ "Dell Inc.",	"Inspiron 1120   ",	"A03",	"A03",	0 },
-	/* imported from acpi-support 0.59 "half known". */
-	{ "Dell Inc.",	"Inspiron 1200*",	"",	"",	VBE_POST|VBE_SAVE|UNSURE },
-	/* joey <joey7d6@yahoo.com> */
-	{ "Dell Inc.",	"Inspiron 1420 *",	"",	"",	VBE_POST|VBE_MODE },
-	/* Dell Inspiron 1501, https://bugzilla.novell.com/show_bug.cgi?id=304281 */
-	{ "Dell Inc.",	"Inspiron 1501 ",	"",	"",	S3_BIOS|S3_MODE },
-	/* Sebastian Rittau <srittau@jroger.in-berlin.de> */
-	{ "Dell Inc.",	"Inspiron 1520 *",	"",	"",	0 },
-	/* Horvath Andras / Log69.com <mail@log69.com> previously Klaus Thoennissen <klaus.thoennissen@web.de> (VBE_POST|VBE_MODE) */
-	{ "Dell Inc.",	"Inspiron 1525 *",	"",	"",	VBE_SAVE },
-	/* Christophe Gay <christophegay@free.fr>, maybe only with binary only driver */
-	{ "Dell Inc.",	"Inspiron 1720 *",	"",	"",	0 },
-	/* Dell Inspiron 510m, Jose Carlos Garcia Sogo <jsogo@debian.org> */
-	{ "Dell Inc.",	"Inspiron 510m *",	"",	"",	VBE_POST },
-	/* Rob OpenSuSE <rob.opensuse.linux@googlemail.com> */
-	{ "Dell Inc.",	"Inspiron 531",	"00",	"1.0.13",	VBE_POST|VBE_MODE },
-	/* imported from acpi-support 0.59 "half known". */
-	{ "Dell Inc.",	"Inspiron 6000*",	"",	"",	VBE_POST|VBE_SAVE|UNSURE },
-	/* imported from acpi-support 0.59 "half known". */
-	{ "Dell Inc.",	"Inspiron 700m*",	"",	"",	VBE_POST|VBE_SAVE|UNSURE },
-	/* imported from acpi-support 0.59 "half known". */
-	{ "Dell Inc.",	"Inspiron 8100*",	"",	"",	VBE_POST|VBE_SAVE|UNSURE },
-	/* imported from acpi-support 0.59 "half known". */
-	{ "Dell Inc.",	"Inspiron 8200*",	"",	"",	VBE_POST|VBE_SAVE|UNSURE },
-	/* imported from acpi-support 0.59 "half known". */
-	{ "Dell Inc.",	"Inspiron 8600*",	"",	"",	VBE_POST|VBE_SAVE|UNSURE },
-	/* imported from acpi-support 0.59 "half known". */
-	{ "Dell Inc.",	"Inspiron 9300*",	"",	"",	VBE_POST|VBE_SAVE|UNSURE },
-	/* Adams Micsku <adams_micsku1994@yahoo.com> */
-	{ "Dell Inc.",	"Inspiron N5010",	"A08",	"A08",	0 },
-	/* imported from acpi-support 0.59 "half known". */
-	{ "Dell Inc.",	"Latitude 110L*",	"",	"",	VBE_POST|VBE_SAVE|UNSURE },
-	/* https://bugzilla.novell.com/show_bug.cgi?id=220865 */
-	{ "Dell Inc.",	"Latitude D410 *",	"",	"",	VBE_POST|VBE_MODE },
-	/* tested by seife and Nenad ANTONIC <nenad.antonic@gmail.com> */
-	{ "Dell Inc.",	"Latitude D420 *",	"",	"",	VBE_POST|VBE_MODE },
-	/* Benoit Gschwind <doth.gschwind@gmail.com> */
-	{ "Dell Inc.",	"Latitude D430 *",	"",	"",	VBE_POST|VBE_MODE },
-	/* Ian Samule, https://bugzilla.novell.com/show_bug.cgi?id=175568 */
-	{ "Dell Inc.",	"Latitude D505 *",	"",	"",	VBE_POST|VBE_SAVE },
-	/* imported from acpi-support 0.59 "half known". */
-	{ "Dell Inc.",	"Latitude D510*",	"",	"",	VBE_POST|VBE_SAVE|UNSURE },
-	/* tested by seife */
-	{ "Dell Inc.",	"Latitude D520 *",	"",	"",	VBE_POST|VBE_MODE },
-	/* Jim <jim@zednet.org.uk> */
-	{ "Dell Inc.",	"Latitude D530 *",	"",	"",	VBE_POST|VBE_MODE },
-	/* */
-	{ "Dell Inc.",	"Latitude D610 *",	"",	"",	VBE_POST|VBE_SAVE|NOFB },
-	/* D620 reported by Miroslav Ruda <ruda@ics.muni.cz>, <nicolae.mihalache@spaceapplications.com> */
-	{ "Dell Inc.",	"Latitude D620 *",	"",	"",	VBE_POST|VBE_MODE },
-	/* D630 Ian Bezanson <irb@getchalk.com> and tested by seife */
-	{ "Dell Inc.",	"Latitude D630 *",	"",	"",	VBE_POST|VBE_MODE },
-	/* imported from acpi-support 0.59 "half known". */
-	{ "Dell Inc.",	"Latitude D810*",	"",	"",	VBE_POST|VBE_SAVE|UNSURE },
-	/* Johannes Engel <j-engel@gmx.de> */
-	{ "Dell Inc.",	"Latitude D820 *",	"",	"",	VBE_POST|VBE_MODE },
-	/* Gabriel Ambuehl <gabriel_ambuehl@buz.ch>, version with intel graphics */
-	{ "Dell Inc.",	"Latitude D830 *",	"",	"",	VBE_POST|VBE_MODE },
-	/* Nov 24, 2010 - <kmeaw@lar....ru> */
-	{ "Dell Inc.",	"Latitude E4200                  ",	"",	"A16",	0 },
-	/* Dell Latitude E4300, Nicolas Estibals <Nicolas.Estibals@gmail.com> & Frank Ploss <frank@frankploss.de> */
-	{ "Dell Inc.",	"Latitude E4300                  ",	"",	"",	0 },
-	/* Jul 9, 2010 - João Santiago <exalowprofile@gm...> */
-	{ "Dell Inc.",	"Latitude E5400",	"",	"A15",	0 },
-	/* Sep 19, 2010 - TOOTAI <devel@to....net> */
-	{ "Dell Inc.",	"Latitude E5510",	"0001",	"A04",	0 },
-	/* Feb 9, 2010 - Krzysztof SOCHA <kszysss@gm...> */
-	{ "Dell Inc.",	"Latitude E6400                  ",	"",	"A15",	0 },
-	/* Apr 25, 2010 - George B. <i93.borg@gm...> */
-	{ "Dell Inc.",	"Latitude E6400                  ",	"",	"A20",	0 },
-	/* Martin Jungmann <74258byme@gmx.de> */
-	{ "Dell Inc.",	"Latitude E6500                  ",	"",	"A23",	0 },
-	/* imported from acpi-support 0.59 "half known". */
-	{ "Dell Inc.",	"Latitude X1*",	"",	"",	VBE_POST|VBE_SAVE|UNSURE },
-	/* imported from acpi-support 0.59 "half known". */
-	{ "Dell Inc.",	"Latitude X300*",	"",	"",	VBE_POST|VBE_SAVE|UNSURE },
-	/* Dell inspiron 1300, Tim Dijkstra <tim@famdijkstra.org> */
-	{ "Dell Inc.",	"ME051 *",	"",	"",	0 },
-	/* Dell e1505, Alexander Antoniades / Inspiron 6400, James Cherryh <jcherryh@gmail.com> */
-	{ "Dell Inc.",	"MM061 *",	"",	"",	VBE_POST|VBE_MODE },
-	/* Dell Inspiron E1702, Julian Krause <suspend@thecrypto.org> */
-	{ "Dell Inc.",	"MP061 *",	"",	"",	0 },
-	/* Dell Inspiron E1705, Paul Hummel <paulhummel@gmail.com> */
-	{ "Dell Inc.",	"MP061",	"",	"",	0 },
-	/* Dell Inspiron 630m, Fredrik Edemar */
-	{ "Dell Inc.",	"MXC051 *",	"",	"",	0 },
-	/* Dell Inspiron 640m, Daniel Drake <dsd@gentoo.org> */
-	{ "Dell Inc.",	"MXC061 *",	"",	"",	VBE_POST },
-	/* Dell XPS M1210 BryanL <fox_rlnocr@dynmail.no-ip.org> */
-	{ "Dell Inc.",	"MXC062 *",	"",	"",	S3_BIOS|S3_MODE },
-	/* Dell XPS M1710 Harry Kuiper <hkuiper@xs4all.nl>, console only resumes with vesafb! */
-	{ "Dell Inc.",	"MXG061 *",	"",	"",	0 },
-	/* Ted Percival <ted@midg3t.net>, ATI Graphics, no FB :( */
-	{ "Dell Inc.",	"OptiPlex 755 *",	"",	"",	VBE_POST|NOFB },
-	/* */
-	{ "Dell Inc.",	"OptiPlex FX160 *",	"",	"",	S3_BIOS|S3_MODE },
-	/* Dell FX160, James Willcox <snorp@novell.com> https://bugzilla.novell.com/show_bug.cgi?id=379774 */
-	{ "Dell Inc.",	"Optiplex FX160 *",	"",	"",	S3_BIOS|S3_MODE },
-	/* Desktop with Intel graphics, Sitsofe Wheeler <sitsofe@yahoo.com> */
-	{ "Dell Inc.                ",	"OptiPlex GX520 *",	"",	"",	VBE_POST|VBE_MODE },
-	/* Jon Dowland <jon+suspend-devel@alcopop.org> */
-	{ "Dell Inc. *",	"OptiPlex GX620 *",	"",	"",	0 },
-	/* imported from acpi-support 0.59 "half known". */
-	{ "Dell Inc.",	"Precision M20*",	"",	"",	VBE_POST|VBE_SAVE|UNSURE },
-	/* Bruno Friedmann <bruno@ioda-net.ch> */
-	{ "Dell Inc.",	"Precision M4300 *",	"",	"",	0 },
-	/* Chris Debrunner <chd@evcohs.com> */
-	{ "Dell Inc.",	"Precision M6300 *",	"",	"",	VBE_POST|VBE_MODE },
-	/* gaofi@gaofi.com */
-	{ "Dell Inc.",	"Precision M65 *",	"",	"",	VBE_POST|VBE_MODE },
-	/* Manoj Srivastava <srivasta@debian.org> */
-	{ "Dell Inc.",	"Precision M90 *",	"",	"",	0 },
-	/* Orel Weinstock <orelweinstock@gmail.com> */
-	{ "Dell Inc.",	"Studio 1555",	"A08",	"A08",	S3_MODE },
-	/* JackDesBwa <jackdesbwa@gmail.com> */
-	{ "Dell Inc.",	"Studio XPS 1640",	"A113",	"A11",	0 },
-	/* Apr 6, 2010 - Jon Arne Jørgensen <jonjon.arnearne@gm...> Not minimal mode */
-	{ "Dell Inc.",	"Studio XPS 1645",	"A08 ",	"A08",	0 },
-	/* Florian Buether <fbuether@jasminefields.net> */
-	{ "Dell Inc.",	"Vostro   1000 ",	"",	"",	S3_BIOS|S3_MODE },
-	/* Kyle Kearney <elyk53@gmail.com> */
-	{ "Dell Inc.",	"Vostro 1500 *",	"",	"",	VBE_POST|VBE_MODE },
-	/* Luciano A. Ferrer <laferrer@gmail.com> */
-	{ "Dell Inc.",	"Vostro1710",	"",	"",	0 },
-	/* Oct, 2010 - Mathias Teugels <mathias@code.....be> */
-	{ "Dell Inc.",	"Vostro 3300",	"Not Specified",	"A01  ",	VBE_POST|VBE_MODE },
-	/* Aug 9, 2010 - Anton Olsson <exuvo@ex...> */
-	{ "Dell Inc.",	"Vostro 3500",	"Not Specified",	"A01  ",	0 },
-	/* Petr Morávek [Xificurk] <xificurk@gmail.com> */
-	{ "Dell Inc.",	"Vostro 3700",	"",	"A09  ",	0 },
-	/* Dell XPS M1330, Danny Kukawka <dkukawka@suse.de> */
-	{ "Dell Inc.",	"XPS M1330 *",	"",	"",	VBE_POST|VBE_MODE },
-	/* Pierre <pinaraf@robertlan.eu.org> maybe only with nvidia driver...  Elie Roux <elie.roux@telecom-bretagne.eu> */
-	{ "Dell Inc.",	"XPS M1530 *",	"",	"",	0 },
-	/* Jarek Grzys <grzys@gazeta.pl> */
-	{ "DIXONSXP",	"To be filled by O.E.M.",	"Ver.001",	"",	0 },
-	/* Michael Dickson <mike@communicatezing.com> */
-	{ "ECS",	"536",	"",	"",	VBE_POST|NOFB },
-	/* imported from acpi-support 0.59 "half known". */
-	{ "ECS",	"G556 Centrino*",	"",	"",	VBE_POST|VBE_SAVE|UNSURE },
-	/* Michael Bunk <michael.bunk@gmail.com> */
-	{ "Elitegroup Co.",	"ECS G320",	"",	"",	VBE_POST|VBE_MODE },
-	/* Jan 9, 2010 - Andreas Balser <a@abalser.de> */
-	{ "eMachines",	"ET1831",	"",	"P01-A1",	0 },
-	/* ASUS M2400N, Daniel Gollub */
-	{ "ERGOUK                       ",	"M2N       ",	"",	"",	S3_BIOS|S3_MODE },
-	/* Jan 20, 2010 - John Gallagher <johnkgallagher@gmail.com> */
-	{ " EVGA ",	"nForce 750i SLI",	"1",	"6.00 PG",	0 },
-	/* Oct 31, 2010 - Markus Mayer <code@de...de> */
-	{ "Foxconn",	"nT-330i",	"To Be Filled By O.E.M.",	"080015 ",	0 },
-	/* Aurelien Jacobs <aurel@gnuage.org> */
-	{ "FUJITSO",	"FMVLT70R",	"",	"",	S3_BIOS|S3_MODE|PCI_SAVE },
-	/* Fujitsu S6120, Andre Kusuma <andrekusuma@gmail.com> */
-	{ "FUJITSU",	"0000000000",	" ",	"Version 1.04 ",	0 },
-	/* imported from acpi-support 0.59 "half known". */
-	{ "FUJITSU",	"Amilo M*",	"",	"",	VBE_POST|VBE_SAVE|UNSURE },
-	/* Feb 7, 2010 - Eckehardt Luhm <bselu@we...> */
-	{ "FUJITSU                         ",	"D2950-A1                      ",	"        ",	"6.00 R1.05.2950.A1              ",	0 },
-	/* rmmod xhci; s2ram -f -a 2; modprobe xhci - May 18, 2010 - Michael Fellinger <m.fellinger@gm....com> */
-	{ "FUJITSU",	"FMVMGG75N7",	" ",	"Version 1.12 ",	S3_MODE },
-	/* Stephen Gildea <stepheng@gildea.com> */
-	{ "FUJITSU",	"LifeBook P7010D",	"",	"",	S3_BIOS },
-	/* imported from acpi-support 0.59 "half known". */
-	{ "FUJITSU",	"LIFEBOOK P7010*",	"",	"",	VBE_POST|VBE_SAVE|UNSURE },
-	/* Andi Kleen, reported to work in 64bit mode */
-	{ "FUJITSU",	"LifeBook S2110",	"",	"",	S3_BIOS },
-	/* imported from acpi-support 0.59 "half known". */
-	{ "FUJITSU",	"LIFEBOOK S6120*",	"",	"",	VBE_POST|VBE_SAVE|UNSURE },
-	/* Oct 6, 2010 - Andreas Tille <andreas@an...eu> */
-	{ "FUJITSU",	"LIFEBOOK S710",	" ",	"Version 1.08 ",	S3_MODE },
-	/* Srinath Madhavan <msrinath80@yahoo.com> */
-	{ "FUJITSU",	"LifeBook S7110",	"",	"",	0 },
-	/* imported from acpi-support 0.59 "half known". */
-	{ "FUJITSU",	"LifeBook S Series*",	"",	"",	VBE_POST|VBE_SAVE|UNSURE },
-	/* Duy Nguyen <d.nguyen4@ugrad.unimelb.edu.au> */
-	{ "FUJITSU",	"LifeBook T2010",	"",	"",	S3_BIOS|S3_MODE },
-	/* David Nolden <zwabel@googlemail.com> */
-	{ "FUJITSU",	"LifeBook T Series",	"",	"",	0 },
-	/* Loki Harfagr <l0k1@free.fr> */
-	{ "FUJITSU SIEMENS",	"Amilo A1645 ",	"",	"",	S3_BIOS|S3_MODE },
-	/* Ramon Schenkel <ramonschenkel@onlinehome.de> */
-	{ "FUJITSU SIEMENS",	"Amilo A1650G",	"",	"",	VBE_MODE },
-	/* stan ioan-eugen <stan.ieugen@gmail.com> */
-	{ "FUJITSU SIEMENS",	"Amilo A1667G Serie",	"",	"",	S3_BIOS },
-	/* Holger Macht <hmacht@suse.de>, with kernel 2.6.22+, x86_64 */
-	{ "FUJITSU SIEMENS",	"Amilo A7640 ",	"",	"",	S3_BIOS|S3_MODE },
-	/* reported by Thomas Halva Labella <hlabella@ulb.ac.be> */
-	{ "FUJITSU SIEMENS",	"Amilo A7645 ",	"",	"",	VBE_SAVE|S3_BIOS|S3_MODE },
-	/* Chris Hammond <christopher.hammond@gmail.com> Amilo A 1630 */
-	{ "FUJITSU SIEMENS",	"Amilo A Series",	"0.01",	"",	VBE_POST|VBE_SAVE },
-	/* Hendrik Golzke <hendrik.golzke@yahoo.de> */
-	{ "FUJITSU SIEMENS",	"Amilo D Series",	"",	"",	VBE_POST|VBE_MODE },
-	/* Marcel Klemmer <imklemmer@web.de> */
-	{ "FUJITSU SIEMENS",	"AMILO L Series",	"",	"",	VBE_POST|VBE_MODE },
-	/* Simon Maurer <Twiks@gmx.de> again, match exactly. */
-	{ "FUJITSU SIEMENS",	"AMILO M        ",	"-1 *",	"R01-S0N *",	VBE_POST|VBE_SAVE|PCI_SAVE },
-	/* Reiner Herrmann <reiner@reiner-h.de>, this one realls needs VBE_SAVE since there are many different models of the "AMILO M" series, i do a very exact match */
-	{ "FUJITSU SIEMENS",	"AMILO M        ",	"-1 *",	"R01-S0Z *",	VBE_POST|VBE_SAVE },
-	/* Moritz Heidkamp <moritz@invision-team.de> */
-	{ "FUJITSU SIEMENS",	"AMILO M Series",	"",	"1.0G*",	VBE_SAVE },
-	/* imported from acpi-support 0.59 "half known". */
-	{ "FUJITSU SIEMENS",	"Amilo M*",	"",	"",	VBE_POST|VBE_SAVE|UNSURE },
-	/* Sab <sabry84@gmail.com> */
-	{ "FUJITSU SIEMENS",	"AMILO Pi 1505",	"",	"",	S3_BIOS|S3_MODE },
-	/* Giorgos Mavrikas <mavrikas@gmail.com> */
-	{ "FUJITSU SIEMENS",	"AMILO Pi 1536",	"",	"",	VBE_POST|VBE_MODE },
-	/* Yasen Pramatarov <yasen@lindeas.com> */
-	{ "FUJITSU SIEMENS",	"AMILO Pi 2515",	"",	"",	VBE_POST|VBE_MODE },
-	/* Alexandr Kara <Alexandr.Kara@seznam.cz> */
-	{ "FUJITSU SIEMENS",	"AMILO Pro Edition V3405",	"",	"",	S3_BIOS|S3_MODE },
-	/* Igor A. Goncharovsky <igi-go@ya.ru> */
-	{ "FUJITSU SIEMENS",	"AMILO Pro Edition V3505 *",	"",	"",	S3_BIOS|S3_MODE },
-	/* Juhasz Adam <jadaml@gmail.com> */
-	{ "FUJITSU SIEMENS",	"AMILO Pro Series V3525 *",	"",	"",	0 },
-	/* Aleksandar Markovic <acojlo@gmail.com> */
-	{ "FUJITSU SIEMENS",	"AMILO PRO V2030",	"",	"",	VBE_POST|VBE_MODE },
-	/* some unknown contributor */
-	{ "FUJITSU SIEMENS",	"AMILO PRO V2035",	"",	"",	VBE_POST|VBE_MODE },
-	/* Florian Herrmann <florian-herrmann@gmx.de> */
-	{ "FUJITSU SIEMENS",	"AMILO Pro V2040",	"",	"",	0 },
-	/* <arild.haugstad@gmx.net> / https://bugzilla.novell.com/show_bug.cgi?id=279944 */
-	{ "FUJITSU SIEMENS",	"AMILO Pro V3205",	"",	"",	S3_BIOS|S3_MODE },
-	/* AmiloPro V3515, Julian Wollrath <jwollrath@web.de> */
-	{ "FUJITSU SIEMENS",	"AMILO PRO V3515",	"20",	"1.0M-2309-8A20",	VBE_POST|VBE_MODE },
-	/* Steffen <mlsone@forevers.de> */
-	{ "FUJITSU SIEMENS",	"AMILO PRO V8010 *",	"",	"",	VBE_POST|VBE_MODE },
-	/* Markus Meyer <markus.meyer@koeln.de>, Christian Illy <christian.illy@gmx.de> */
-	{ "FUJITSU SIEMENS",	"Amilo Si 1520",	"",	"",	S3_BIOS|S3_MODE },
-	/* <noname1@onlinehome.de> */
-	{ "FUJITSU SIEMENS",	"AMILO Xi 1546",	"",	"",	S3_BIOS|S3_MODE },
-	/* Elmar Stellnberger <estellnb@gmail.com> */
-	{ "FUJITSU SIEMENS",	"AMILO Xi 2550",	"                                ",	"1.11C",	VBE_POST|VBE_MODE },
-	/* Guilhem Bonnefille <guilhem.bonnefille@gmail.com> */
-	{ "FUJITSU SIEMENS",	"ESPRIMO Mobile D9500",	"",	"",	0 },
-	/* Martin Wilck <martin.wilck@fujitsu-siemens.com> */
-	{ "FUJITSU SIEMENS",	"ESPRIMO Mobile M9400",	"",	"",	0 },
-	/* Aug 15, 2010 - Ondřej Caletka <O.Caletka@sh...> */
-	{ "FUJITSU SIEMENS",	"ESPRIMO Mobile U9200",	"1.0",	"1.11 - 067 - 1566",	0 },
-	/* Jan Schaefer <jan.schaefer@informatik.fh-wiesbaden.de> */
-	{ "FUJITSU SIEMENS",	"ESPRIMO P*",	"",	"",	0 },
-	/* Nov 16, 2010 - Michael Franz <franz@fh-nordhausen.de> */
-	{ "FUJITSU SIEMENS",	"ESPRIMO Q5030",	"None",	"R2.03TFS",	0 },
-	/* Clement LAGRANGE <clement.lagrange@gmail.com> */
-	{ "FUJITSU SIEMENS",	"LIFEBOOK B Series",	"",	"",	0 },
-	/* wolfgang.aigner@gmx.de */
-	{ "FUJITSU SIEMENS",	"LIFEBOOK E4010",	"",	"",	VBE_SAVE },
-	/* Robin Knapp <mail@gizzmo.org> */
-	{ "FUJITSU SIEMENS",	"LIFEBOOK E8020",	"",	"",	VBE_POST|VBE_MODE },
-	/* Florian Lohoff <flo@rfc822.org> */
-	{ "FUJITSU SIEMENS",	"LIFEBOOK E8110",	"",	"",	0 },
-	/* seife. Without Flags: Apr 13, 2010 - Gabriel Sailer <Gabriel.Sailer@gm...>*/
-	{ "FUJITSU SIEMENS",	"LIFEBOOK E8410",	"",	"",	S3_BIOS|S3_MODE },
-	/* imported from acpi-support 0.59 "half known". */
-	{ "FUJITSU SIEMENS",	"LIFEBOOK P7010*",	"",	"",	VBE_POST|VBE_SAVE|UNSURE },
-	/* Michael Hillerstrom <michael@hillerstrom.org> */
-	{ "FUJITSU SIEMENS",	"LIFEBOOK P7230",	"",	"",	S3_BIOS|S3_MODE|PCI_SAVE },
-	/* Bernd Speiser <bernd.speiser@t-online.de> */
-	{ "FUJITSU SIEMENS",	"LIFEBOOK P8010",	"",	"",	S3_BIOS|S3_MODE },
-	/* imported from acpi-support 0.59 "half known". */
-	{ "FUJITSU SIEMENS",	"LIFEBOOK S6120*",	"",	"",	VBE_POST|VBE_SAVE|UNSURE },
-	/* Fred Lahuis <fred@sron.nl> */
-	{ "FUJITSU SIEMENS",	"LIFEBOOK S6410",	"",	"",	VBE_POST|VBE_MODE },
-	/* <jan.lockenvitz.ext@siemens.com>, tested with X only */
-	{ "FUJITSU SIEMENS",	"LIFEBOOK S7010",	"",	"",	0 },
-	/* Antonio Cardoso Martins <digiplan.pt@gmail.com> */
-	{ "FUJITSU SIEMENS",	"LIFEBOOK S7020",	"",	"",	S3_BIOS|S3_MODE|PCI_SAVE },
-	/* Samuel Tardieu <sam@rfc1149.net> */
-	{ "FUJITSU SIEMENS",	"LIFEBOOK S7110",	"",	"",	0 },
-	/* imported from acpi-support 0.59 "half known". */
-	{ "FUJITSU SIEMENS",	"LifeBook S Series*",	"",	"",	VBE_POST|VBE_SAVE|UNSURE },
-	/* Alexander Clouter <alex@digriz.org.uk>, needs vbe_save or the vga mode is upset */
-	{ "FUJITSU SIEMENS",	"LifeBook T2010",	"",	"",	VBE_POST|VBE_SAVE|PCI_SAVE },
-	/* arnold seiler <arnold338250622@web.de> */
-	{ "FUJITSU SIEMENS",	"LIFEBOOK T3010",	"",	"",	0 },
-	/* Eckhart Woerner <ew@ewsoftware.de> */
-	{ "FUJITSU SIEMENS",	"LIFEBOOK T4010",	"",	"",	S3_BIOS|S3_MODE },
-	/* Jay <jay@jay.cz> */
-	{ "FUJITSU SIEMENS",	"LIFEBOOK T4210",	"",	"",	S3_BIOS|S3_MODE|PCI_SAVE },
-	/* Apr 27, 2010 - H.-Dirk Schmitt <dirk@co...> */
-	{ "FUJITSU SIEMENS",	"LifeBook T4310",	"10601127925",	"Version 1.05 ",	0 },
-	/* Dennis Koll <dennis.koll@gmx.de> */
-	{ "FUJITSU SIEMENS",	"P5GD1-FM",	"",	"1004.001",	0 },
-	/* Tomas Pospisek <tpo@sourcepole.ch> */
-	{ "Fujitsu Siemens",	"P6VAP-AP",	"",	"",	0 },
-	/* Ulf Lange <mopp@gmx.net> */
-	{ "FUJITSU SIEMENS",	"SCENIC N300/N600",	"",	"",	VBE_POST|VBE_MODE },
-	/* Guenther Schwarz <guenther.schwarz@gmx.de> */
-	{ "FUJITSU SIEMENS",	"SCENIC P / SCENICO P",	"",	"",	VBE_POST|VBE_MODE },
-	/* This is a desktop with onboard i810 video <seife@suse.de> */
-	{ "FUJITSU SIEMENS",	"SCENIC W300/W600",	"",	"",	VBE_POST|VBE_MODE },
-	/* Peer Heinlein <p.heinlein@jpberlin.de> */
-	{ "FUJITSU SIEMENS",	"SCENIC W",	"",	"",	VBE_POST|VBE_MODE },
-	/* */
-	{ "FUJITSU SIEMENS",	"Stylistic ST5000",	"",	"",	S3_BIOS|S3_MODE },
-	/* Jan 30, 2010 - Jay Logan <jermaine151@ya...> */
-	{ "Gateway         ",	"LT31            ",	"Not Applicable",	"v1.3201 ",	S3_BIOS|S3_MODE },
-	/* Mario Nigrovic <Mario@nigrovic.net> */
-	{ "Gateway *",	"MT6707 *",	"",	"",	S3_BIOS|S3_MODE },
-	/* Gateway MX3228, The Space Man <thespaceman@verizon.net> */
-	{ "Gateway",	"MX3228",	"73.08   ",	"73.08   ",	VBE_POST|VBE_MODE },
-	/* Ilya Eremin <che_guevara_3@bk.ru> */
-	{ "Gateway *",	"MX6922B *",	"",	"",	0 },
-	/* Christoph Wiesmeyr <christoph.wiesmeyr@liwest.at> */
-	{ "GERICOM",	"259IA1",	"",	"",	0 },
-	/* Jan 9, 2010 - Andreas Balser <a@abalser.de> */
-	{ "Gericom",	"G730",	"Revision A0",	"6.00",	0 },
-	/* booiiing@gmail.com */
-	{ "Gericom",	"HUMMER",	"",	"1.03   ",	VBE_POST|VBE_MODE },
-	/* From: Einon <einon@animehq.hu>, seems to work only from X :-( */
-	{ "Gericom",	"Montara-GML ",	"FAB-2",	"",	0 },
-	/* Nik Tripp https://bugzilla.novell.com/show_bug.cgi?id=400356 */
-	{ "Gigabyte Technology Co., Ltd.",	"945GCM-S2L",	"",	"",	0 },
-	/* Art Mitskevich <art@unlit.org> */
-	{ "Gigabyte Technology Co., Ltd.",	"945GCMX-S2",	"",	"",	VBE_POST|VBE_MODE },
-	/* Josef Zenisek <jzenisek@gmx.de> */
-	{ "Gigabyte Technology Co., Ltd.",	"945GZM-S2",	"",	"",	0 },
-	/* Jul 4, 2010 - tuxfusion <tuxfusion@go...> */
-	{ "Gigabyte Technology Co., Ltd.",	"EP45-UD3R",	" ",	"F12",	0 },
-	/* Florian Sesser <florian@sesser.at> */
-	{ "Gigabyte Technology Co., Ltd.",	"GA-MA69G-S3H",	" ",	"F5",	0 },
-	/* Apr 9, 2010 - Eri Johnson <ericj@ca...> */
-	{ "Gigabyte Technology Co., Ltd.",	"GA-MA785GMT-UD2H",	" ",	"F5",	0 },
-	/* Andi Valachi <avalachi@2link.ca> */
-	{ "Gigabyte Technology Co., Ltd.",	"GA-MA785GM-US2H",	" ",	"F5",	S3_BIOS|S3_MODE },
-	/* Sebastian Koerner <s.koerner@online.de> */
-	{ "Gigabyte Technology Co., Ltd.",	"GA-MA78G-DS3H",	" ",	"FC",	S3_BIOS|S3_MODE },
-	/* Ian-Xue Li <da.mi.spirit@gmail.com> */
-	{ "Gigabyte Technology Co., Ltd.",	"GA-MA78GPM-DS2H",	" ",	"F1",	S3_BIOS },
-	/* Mar 12, 2010 - Vit <vitruss@gm...> */
-	{ "Gigabyte Technology Co., Ltd.",	"GA-MA790XT-UD4P",	" ",	"F4",	0 },
-	/* Mar 5, 2010 - Márcio Spezani <spezani@gm...> */
-	{ "Gigabyte Technology Co., Ltd.",	"M61PM-S2",	" ",	"Beta F9c",	0 },
-	/* Thorsten Goetzke <th.goetzke@gmx.net> */
-	{ "Gigabyte Technology Co., Ltd.",	"P35-DS3",	" ",	"F6",	0 },
-	/* Gigabyte P35-DS3L, Kainr�th Roland <kainrath.roland@gmail.com> */
-	{ "Gigabyte Technology Co., Ltd.",	"P35-DS3L",	" ",	"F8",	0 },
-	/* Roberto Lumbreras <rover@lumbreras.org> */
-	{ "Gigabyte Technology Co., Ltd.",	"P35-DS4",	"",	"",	VBE_POST|VBE_MODE },
-	/* Andreas Mueller <andreas@anmueller.de> */
-	{ "Gigabyte Technology Co., Ltd.",	"P55M-UD2",	"",	"F11",	0 },
-	/* Jun 7, 2010 - Damir Perisa <damir.perisa@gm...> */
-	{ "Gigabyte Technology Co., Ltd.",	"X58A-UD7",	" ",	"F6",	0 },
-	/* Michal Sedkowski <msedkowski@gmail.com>,  VBE_POST (Michal Vyskocil <michal.vyskocil@gmail.com>), VBE_POST|VBE_MODE (Danny Kukawka <dkukawka@suse.de>), Hendrik Tews <tews@cs.ru.nl> "HP Compaq nc6320 (RH367ET*" */
-	{ "Hewlett-Packard",	"",	"",	"68YDU*",	0 },
-	/* Michael Meskes <meskes@debian.org>, this is a NX 7400 */
-	{ "Hewlett-Packard",	"",	"",	"68YGU*",	VBE_POST },
-	/* May 4, 2010 - Peter Becker <peter.de@gm...> */
-	{ "Hewlett-Packard",	"Compaq 515",	"F.06",	"68GVV Ver. F.06",	0 },
-	/* Oct 10, 2010 - John Thiga <mjthiga@g..com> */
-	{ "Hewlett-Packard",	"Compaq nc4000 (DA762AV)         ",	"F.30                      ",	"68BAS Ver. F.30",	S3_BIOS|S3_MODE },
-	/* Jan Adlen <janne@rosehip.mine.nu> */
-	{ "Hewlett-Packard",	"Compaq nc6000 *",	"",	"68BDD*",	S3_BIOS|S3_MODE },
-	/* */
-	{ "Hewlett-Packard*",	"Compaq nx5000 *",	"",	"68BCU*",	VBE_POST|VBE_MODE },
-	/* Philippe Marzouk <phil@ozigo.org> */
-	{ "Hewlett-Packard ",	"Compaq nx 7010 (DU394T#*",	"",	"68BAL*",	S3_BIOS|S3_MODE },
-	/* François Münch <francois.munch@free.fr> */
-	{ "Hewlett-Packard ",	"Compaq nx 7010 (PG588EA#*",	"",	"",	S3_BIOS },
-	/* egelor <e.trifonidis@gmail.com> */
-	{ "Hewlett-Packard ",	"Compaq Presario CQ60 Notebook PC",	"F.32",	"F.32",	0 },
-	/* "Zirkel, Timothy K" <zirkelt@lafayette.edu> */
-	{ "Hewlett-Packard ",	"Compaq Presario X1000 (DK454AV)*",	"",	"",	S3_BIOS },
-	/* Marcos Pinto <markybob@gmail.com>, HP dv6000 */
-	{ "Hewlett-Packard",	"EW434AVABA *",	"",	"",	S3_BIOS|S3_MODE },
-	/* hp compaq 2133, https://bugzilla.novell.com/show_bug.cgi?id=409246 */
-	{ "Hewlett-Packard",	"HP 2133",	"",	"68VGU*",	S3_BIOS|S3_MODE },
-	/* arideyla@web.de */
-	{ "Hewlett-Packard",	"HP 550",	"",	"68MVU*",	VBE_POST|VBE_MODE },
-	/* hp compaq 2133, https://bugzilla.novell.com/show_bug.cgi?id=363240 */
-	{ "Hewlett-Packard",	"HP Compaq 2133",	"",	"68VGU*",	S3_BIOS|S3_MODE },
-	/* Wouter Verhelst <w@uter.be> */
-	{ "Hewlett-Packard",	"HP Compaq 2230s (FU312EA)",	"F.0D",	"68PHU Ver. F.0D",	0 },
-	/* Stefan Kulow https://bugzilla.novell.com/show_bug.cgi?id=362928 */
-	{ "Hewlett-Packard",	"HP Compaq 2510p *",	"",	"68MSP*",	VBE_POST|VBE_MODE },
-	/* Holger Sickenberg https://bugzilla.novell.com/show_bug.cgi?id=376715 */
-	{ "Hewlett-Packard",	"HP Compaq 2710*",	"",	"68MOU*",	VBE_POST|VBE_MODE },
-	/* Jamil Djadala <djadala@datamax.bg> */
-	{ "Hewlett-Packard",	"HP Compaq 6510b (GB863EA*",	"",	"68DDU*",	VBE_POST|VBE_MODE },
-	/* peeetax@googlemail.com */
-	{ "Hewlett-Packard",	"HP Compaq 6510b (KE134EA*",	"",	"68DDU*",	0 },
-	/* Jamalulkhair Khairedin <jalut78@gmail.com>, tested on console and X */
-	{ "Hewlett-Packard",	"HP Compaq 6520s",	"F.0A",	"68MDU Ver. F.0A",	0 },
-	/* Jun 21, 2010 - Luiz Kuwabara <luizk22@gm...> */
-	{ "Hewlett-Packard",	"HP Compaq 6710b",	"F.15",	"68DDU Ver. F.15",	0 },
-	/* Michal Sojka <sojkam1@fel.cvut.cz> */
-	{ "Hewlett-Packard",	"HP Compaq 6710b (GB893EA*",	"",	"68DDU*",	VBE_POST|VBE_MODE },
-	/* Harry ten Berge <htenberge@gmail.com> */
-	{ "Hewlett-Packard",	"HP Compaq 6710b (GB893ET*",	"",	"68DDU*",	VBE_POST|VBE_MODE },
-	/* Michal Skrzypek <mskrzypek886@gmail.com> */
-	{ "Hewlett-Packard",	"HP Compaq 6710b (GR681EA*",	"",	"68DDU*",	VBE_POST|VBE_MODE },
-	/* Jaromrir Cervenka <cervajz@cervajz.com> */
-	{ "Hewlett-Packard",	"HP Compaq 6710b (KE123EA*",	"",	"68DDU*",	0 },
-	/* Jakub Talas <kuba.talas@gmail.com> */
-	{ "Hewlett-Packard",	"HP Compaq 6710b (KE124EA*",	"",	"68DDU*",	VBE_POST|VBE_MODE },
-	/* Alberto Gonzalez <luis6674@yahoo.com> */
-	{ "Hewlett-Packard",	"HP Compaq 6710s (GC014ET*",	"",	"68DDU*",	VBE_POST|VBE_MODE },
-	/* Darek Nawrocki <dnawrock@gmail.com> */
-	{ "Hewlett-Packard",	"HP Compaq 6715b (GB834EA*",	"",	"68YTT*",	VBE_POST|VBE_MODE },
-	/* Radu Benea <kitanatahu@gmail.com> */
-	{ "Hewlett-Packard",	"HP Compaq 6715b (GB835EA*",	"",	"68YTT*",	S3_BIOS|S3_MODE },
-	/* Andrey Petrov <apetrov87@gmail.com> */
-	{ "Hewlett-Packard",	"HP Compaq 6715b (RK156AV*",	"",	"68YTT*",	S3_BIOS|S3_MODE },
-	/* Matthias Hopf, https://bugzilla.novell.com/show_bug.cgi?id=390271, needs strange combination */
-	{ "Hewlett-Packard",	"HP Compaq 6715b (RM174UT*",	"",	"68YTT*",	S3_BIOS|VBE_MODE },
-	/* Petteri Tolonen <pretzel@mbnet.fi> works with radeonhd and fglrx */
-	{ "Hewlett-Packard",	"HP Compaq 6715s (GR656ET*",	"",	"68YTT*",	S3_BIOS },
-	/* Paul Smet <paul.smet@gmail.com> */
-	{ "Hewlett-Packard",	"HP Compaq 6720s",	"",	"68MDU*",	VBE_POST|VBE_MODE },
-	/* Babarovic Ivica <ivica.babarovic@asist.si> */
-	{ "Hewlett-Packard",	"HP Compaq 6820s",	"",	"68MDD*",	S3_BIOS },
-	/* Robert Norris <rob@cataclysm.cx>, tested with fglrx */
-	{ "Hewlett-Packard",	"HP Compaq 6910p",	"",	"68MCD*",	S3_BIOS|S3_MODE },
-	/* Daniele Frijia <daniele@sase.de>, this machine has no model number in DMI. BIOS F.14 */
-	{ "Hewlett-Packard",	"HP Compaq 6910p",	"",	"68MCU*",	VBE_POST|VBE_MODE },
-	/* Ola Widlund <olwix@yahoo.com>, works with proprietary ATI driver, to be verified without */
-	{ "Hewlett-Packard",	"HP Compaq 6910p (GB951EA*",	"",	"68MCD*",	VBE_MODE },
-	/* HP Compaq 6910p, Alexander Mikhailian <mikhailian@mova.org> */
-	{ "Hewlett-Packard",	"HP Compaq 6910p (GH717AW#UUG)",	"F.15",	"68MCD Ver. F.15",	VBE_POST|VBE_MODE },
-	/* Tomas Kejzlar <t.kejzlar@gmail.com> */
-	{ "Hewlett-Packard",	"HP Compaq 6910p (RH241AV)",	"",	"68MCU*",	VBE_POST|VBE_MODE },
-	/* Krisztian Loki <krisztian.loki@freemail.hu>, does not work with proprietary ATI driver */
-	{ "Hewlett-Packard",	"HP Compaq 8510p ",	"",	"68MVD*",	VBE_POST|VBE_MODE },
-	/* Milan Znamenacek <mznamenacek@retia.cz>, only from X */
-	{ "Hewlett-Packard",	"HP Compaq 8710p (GC102EA*",	"",	"68MAD*",	0 },
-	/* Tim Harris <tim.harris@redhillconsulting.com.au> */
-	{ "Hewlett-Packard",	"HP Compaq 8710p (GT647PA*",	"",	"68MAD*",	0 },
-	/* Marek Stopka <mstopka@opensuse.org>, kernel 2.6.25 */
-	{ "Hewlett-Packard",	"HP Compaq dc5800 Small Form Factor",	"",	"786F2*",	0 },
-	/* hp compaq nc2400, tested by seife. sometimes has keyboard problems after resume */
-	{ "Hewlett-Packard",	"HP Compaq nc2400*",	"",	"68YOP*",	VBE_POST|VBE_MODE },
-	/* imported from acpi-support 0.59 "half known". */
-	{ "Hewlett-Packard",	"HP Compaq nc4200*",	"",	"",	VBE_POST|VBE_SAVE|UNSURE },
-	/* Antti Laine <antti.a.laine@tut.fi>, "did not work with older BIOS", now has F.09  sys_ver="F.08": VBE_POST|VBE_SAVE, Rene Seindal <rene@seindal.dk> */
-	{ "Hewlett-Packard",	"HP Compaq nc4400*",	"",	"68YHV*",	VBE_POST|VBE_MODE },
-	/* there seem to be versions with a " " after Hewlett-Packard and without. */
-	{ "Hewlett-Packard*",	"HP Compaq nc6000 *",	"",	"68BDD*",	S3_BIOS|S3_MODE },
-	/* Winfried Dobbe, https://bugzilla.novell.com/show_bug.cgi?id=159688 */
-	{ "Hewlett-Packard",	"HP Compaq nc6120 *",	"",	"",	VBE_POST|VBE_MODE },
-	/* imported from acpi-support 0.59 "half known". */
-	{ "Hewlett-Packard",	"HP Compaq nc6220*",	"",	"",	VBE_POST|VBE_SAVE|UNSURE },
-	/* */
-	{ "Hewlett-Packard",	"HP Compaq nc6230 *",	"",	"",	VBE_SAVE|NOFB },
-	/* https://bugzilla.novell.com/show_bug.cgi?id=260451 */
-	{ "Hewlett-Packard",	"HP Compaq nc6400 (EH522AV)",	"",	"68YCU*",	VBE_POST|VBE_MODE },
-	/* https://bugzilla.novell.com/show_bug.cgi?id=295489 */
-	{ "Hewlett-Packard",	"HP Compaq nc6400 (EY582ES*",	"",	"68YCU*",	VBE_POST|VBE_MODE },
-	/* https://bugzilla.novell.com/show_bug.cgi?id=326526 */
-	{ "Hewlett-Packard",	"HP Compaq nc6400 (RH560EA*",	"",	"68YCU*",	VBE_POST|VBE_MODE },
-	/* imported from acpi-support 0.59 "half known". */
-	{ "Hewlett-Packard",	"HP Compaq nc8230*",	"",	"",	VBE_POST|VBE_SAVE|UNSURE },
-	/* Jan 19, 2010 - Stefan Schneider <stefan.schneider@bspire.de> */
-	{ "Hewlett-Packard",	"HP Compaq nc8430 (ES591EA#ABD)",	"F.16",	"68YVD Ver. F.16",	VBE_MODE },
-	/* Stefan Seyfried <seife@suse.de> novell bug 259831, this machine is only available in one configuration (ATI Graphics) */
-	{ "Hewlett-Packard",	"HP Compaq nw8440 *",	"",	"68YVD*",	VBE_POST|VBE_MODE },
-	/* Magnus Hoglund <magnus.hoglund@hallsberg.se> */
-	{ "Hewlett-Packard",	"HP Compaq nw9440 *",	"",	"68YAF*",	0 },
-	/* */
-	{ "Hewlett-Packard*",	"hp compaq nx5000 *",	"",	"68BCU*",	VBE_POST|VBE_MODE },
-	/* Ed Hoo <whoishoo@gmail.com> */
-	{ "Hewlett-Packard*",	"hp Compaq nx5000 *",	"",	"68BCU*",	VBE_POST|VBE_MODE },
-	/* <gabriel.pettier@gmail.com> */
-	{ "Hewlett-Packard",	"HP Compaq nx6110 *",	"",	"68DTD",	VBE_POST|VBE_MODE },
-	/* Niv aharonovich <niv.kaha@gmail.com> */
-	{ "Hewlett-Packard",	"HP Compaq nx6120 *",	"",	"68DTD*",	VBE_POST|VBE_MODE },
-	/* */
-	{ "Hewlett-Packard",	"HP Compaq nx6125 *",	"",	"",	VBE_SAVE|NOFB },
-	/* Pavel Machek */
-	{ "Hewlett-Packard",	"HP Compaq nx6315",	"",	"68MOU*",	S3_BIOS|S3_MODE },
-	/* Benedikt Nimmervoll <nimmervoll.benedikt@googlemail.com>, EY350EA#ABD also works with version RD115AA#ABA <hmacht@suse.de> */
-	{ "Hewlett-Packard",	"HP Compaq nx6325 *",	"",	"68TT2*",	VBE_POST|VBE_SAVE },
-	/* Michael Biebl <biebl@teco.edu> */
-	{ "Hewlett-Packard ",	"HP compaq nx7000 *",	"",	"",	VBE_POST|VBE_SAVE },
-	/* Valent Turkovic <valent.turkovic@gmail.com> */
-	{ "Hewlett-Packard",	"HP Compaq nx7300 (RU374ES#*",	"",	"",	VBE_POST|VBE_MODE },
-	/* Slawomir Skrzyniarz <diodak@gmail.com> */
-	{ "Hewlett-Packard",	"HP Compaq nx7400 (RH412EA#)",	"",	"",	VBE_POST|VBE_MODE },
-	/* */
-	{ "Hewlett-Packard",	"HP Compaq nx8220 *",	"",	"",	VBE_SAVE|NOFB },
-	/* HP Compaq nx9420, Adam <ajett2@gmail.com> */
-	{ "Hewlett-Packard",	"HP Compaq nx9420 (RB549UT#ABA)",	"F.1D",	"68YAF Ver. F.1D",	S3_BIOS|S3_MODE },
-	/* Georg Walser <gwa@aspedi.com> Model DG286A */
-	{ "Hewlett-Packard",	"HP d330 uT*",	"",	"",	0 },
-	/* Ryan Bair <ryandbair@gmail.com> */
-	{ "Hewlett-Packard",	"HP d530 SFF*",	"",	"",	0 },
-	/* Works with -a 1, -a 2 and -a 3 too. Jir� Nov�cek <jnovacek69@gmail.com> 26/12/2009 */
-	{ "Hewlett-Packard",	"HP EliteBook 8530w",	"F.0F",	"68PDV Ver. F.0F",	0 },
-	/* Jan 5, 2010 - Tom Petit <hrothgar1@gmail.com> */
-	{ "Hewlett-Packard",	"HP G60 Notebook PC",	"F.54",	"F.54",	0 },
-	/* Oct 6, 2010 - Zdeněk Janeček <jan.zdenek@gm....com> */
-	{ "Hewlett-Packard",	"HP Mini 5101",	"F.02",	"68DGI Ver. F.02",	0 },
-	/* HP OmniBook 500, Oliver Redner <oliver.redner@arcor.de> */
-	{ "Hewlett-Packard",	"HP OmniBook PC         ",	"HP OmniBook 500 FA     ",	"FA.M2.71",	0 },
-	/* Frederic Mothe <mothe@nancy.inra.fr> */
-	{ "Hewlett Packard",	"",	"HP OmniBook XE3 GC *",	"",	VBE_POST|VBE_SAVE },
-	/* */
-	{ "Hewlett Packard",	"",	"HP OmniBook XE3 GF *",	"",	VBE_POST|VBE_SAVE },
-	/* Bernd Rinn <bb@rinn.ch> */
-	{ "Hewlett Packard",	"",	"HP OmniBook XT1000 *",	"",	S3_MODE },
-	/* Feb 18, 2010 - Stefano Z. <mie.iscrizioni@gm...> */
-	{ "Hewlett-Packard",	"HP Pavilion dm1 Notebook PC",	"048C110000241B00000320000",	"F.11",	0 },
-	/* Jan 20, 2010 - Michael Cheah <michael.csj@gmail.com> */
-	{ "Hewlett-Packard",	"HP Pavilion dm3t Notebook PC    ",	"039F100000240000110320000",	"F.0A",	S3_BIOS|S3_MODE },
-	/* imported from acpi-support 0.59 "half known". */
-	{ "Hewlett-Packard",	"HP Pavilion dv1000*",	"",	"",	VBE_POST|VBE_SAVE|UNSURE },
-	/* Tarek Soliman <tarek-spam@zeusmail.bounceme.net> */
-	{ "Hewlett-Packard",	"HP Pavilion dv2000 (GA534UA#*",	"",	"",	0 },
-	/* S.Çağlar Onur <caglar@pardus.org.tr>, works only from X! */
-	{ "Hewlett-Packard",	"HP Pavilion dv2000 (GF759EA#*",	"",	"",	0 },
-	/* Daniel Forrer <daniel.forrer@unipd.it> and Jimmi <jommi@7girello.net> */
-	{ "Hewlett-Packard",	"HP Pavilion dv2000 (RN066EA#*",	"",	"",	0 },
-	/* Robert Hart <Robert.Hart@BuroHappold.com> */
-	{ "Hewlett-Packard",	"HP Pavilion dv2500 Notebook PC",	"",	"",	0 },
-	/* HP Pavilion dv2, Mike Leimon <leimon@gmail.com>. VBE_POST only Mar 9, 2010 - Andre Pereira <icebraining@gm...> */
-	{ "Hewlett-Packard",	"HP Pavilion dv2 Notebook PC     ",	"F.03    ",	"F.03    ",	VBE_POST|VBE_SAVE },
-	/* Benjamin Kudria <ben@kudria.net> */
-	{ "Hewlett-Packard",	"HP Pavilion dv6000 (EW434AV#*",	"",	"",	S3_BIOS|S3_MODE },
-	/* Carlos Andrade <crandrad@gmail.com> */
-	{ "Hewlett-Packard",	"HP Pavilion dv6000 (EY798AV*",	"",	"",	0 },
-	/* Valent Turkovic <valent.turkovic@gmail.com> */
-	{ "Hewlett-Packard",	"HP Pavilion dv6000 (GA378UA#*",	"",	"",	S3_MODE },
-	/* Marlin Forbes <marlinf@datashaman.com> */
-	{ "Hewlett-Packard",	"HP Pavilion dv6000 (GF688EA*",	"",	"",	0 },
-	/* Eric Brasseur <eric.brasseur@gmail.com> */
-	{ "Hewlett-Packard",	"HP Pavilion dv6000 (GH907EA#*",	"",	"",	S3_MODE },
-	/* Antony Dovgal <tony2001@phpclub.net> */
-	{ "Hewlett-Packard",	"HP Pavilion dv6000 (RM469EA#*",	"",	"",	0 },
-	/* Jens Kaiser <kaiser@caltech.edu>, maybe only with binary nvidia module? */
-	{ "Hewlett-Packard",	"HP Pavilion dv6000 (RP153UA#*",	"",	"",	S3_BIOS|S3_MODE },
-	/* John Soros <sorosj@gmail.com> "HP dv6120ea" */
-	{ "Hewlett-Packard",	"HP Pavilion dv6000 (RP980EA#*",	"",	"",	0 },
-	/* Fran Firman <fran@ipsm.net.nz>, no hacks, maybe only works due to the Nvidia driver?  Marco Nenciarini <mnencia@prato.linux.it> needs S3_BIOS */
-	{ "Hewlett-Packard",	"HP Pavilion dv6500 Notebook PC *",	"",	"",	S3_BIOS },
-	/* fsuzzi@libero.it, dv6855el. No flags from: Jun 27, 2010 - Stanila Sorin-Valer <st_sorin2004@ya...> */
-	{ "Hewlett-Packard",	"HP Pavilion dv6700 Notebook PC *",	"",	"",	S3_BIOS|S3_MODE },
-	/* Wael Nasreddine <wael.nasreddine@gmail.com */
-	{ "Hewlett-Packard",	"HP Pavilion dv7 Notebook PC*",	"",	"",	0 },
-	/* Bengt Gorden <bengan@bag.org> */
-	{ "Hewlett-Packard",	"HP Pavilion dv9700 Notebook PC *",	"",	"",	0 },
-	/* <admin@tomobiki.dyndns.org> hp pavilion xz275 */
-	{ "Hewlett-Packard",	"HP Pavilion Notebook PC",	"HP Pavilion Notebook *",	" IC.M1.02",	0 },
-	/* <veesah@gmail.com> */
-	{ "Hewlett-Packard",	"HP Pavilion tx1000 Notebook PC *",	"",	"",	0 },
-	/* Joachim Deguara <joachim.deguara@gmail.com> */
-	{ "Hewlett-Packard",	"HP Pavilion tx2500 Notebook PC",	"",	"",	S3_BIOS|S3_MODE },
-	/* Chris Polderman <chris.polderman@gmail.com> */
-	{ "Hewlett-Packard",	"HP Pavilion ze2000 (EK791EA#*",	"",	"",	0 },
-	/* Fuad Tabba <fuad@cs.auckland.ac.nz>, only available with integr. gfx */
-	{ "Hewlett-Packard ",	"hp pavilion ze4900 (*",	"",	"",	0 },
-	/* imported from acpi-support 0.59 "half known". */
-	{ "Hewlett-Packard",	"HP Pavilion zt3000*",	"",	"",	VBE_POST|VBE_SAVE|UNSURE },
-	/* Nov 6, 2010 - Marc Wirz <marc.wirz@gmail.com> | Sep 4, 2010 - Damien Kesteman <damien.kesteman@g...com> */
-	{ "Hewlett-Packard",	"HP ProBook 4515s",	"",	"",	S3_BIOS|VBE_SAVE },
-	/* imported from acpi-support 0.59 "half known". */
-	{ "Hewlett-Packard",	"HP Tablet PC TR1105*",	"",	"",	VBE_POST|VBE_SAVE|UNSURE },
-	/* imported from acpi-support 0.59 "half known". */
-	{ "Hewlett-Packard",	"HP Tablet PC Tx1100*",	"",	"",	VBE_POST|VBE_SAVE|UNSURE },
-	/* HP xw4300 Workstation, Florian Reitmeir <florian@reitmeir.org> */
-	{ "Hewlett-Packard",	"HP xw4300 Workstation",	" ",	"786D3 v01.11",	0 },
-	/* tested by HP https://bugzilla.novell.com/show_bug.cgi?id=436284 */
-	{ "Hewlett-Packard",	"HP xw4550 Workstation",	"",	"786F7*",	0 },
-	/* tested by HP https://bugzilla.novell.com/show_bug.cgi?id=436284 */
-	{ "Hewlett-Packard",	"HP xw6600 Workstation",	"",	"786F4*",	0 },
-	/* tested by HP https://bugzilla.novell.com/show_bug.cgi?id=436284 */
-	{ "Hewlett-Packard",	"HP xw8600 Workstation",	"",	"786F5*",	0 },
-	/* tested by HP https://bugzilla.novell.com/show_bug.cgi?id=436284 */
-	{ "Hewlett-Packard",	"HP xw9400 Workstation",	"",	"786D6*",	0 },
-	/* Damien Raude-Morvan <drazzib@drazzib.com>, This is a dv4052ea, i915GM */
-	{ "Hewlett-Packard",	"Pavilion dv4000 (EB911EA#*",	"",	"",	S3_BIOS },
-	/* Fabio Comolli <fabio.comolli@gmail.com>, dv4378ea, ATI X700 */
-	{ "Hewlett-Packard",	"Pavilion dv4000 (ES973EA#*",	"",	"",	VBE_POST|VBE_SAVE|NOFB },
-	/* Daniel L Wells <daniel@bigmalletman.com> */
-	{ "Hewlett-Packard",	"Pavilion dv4000 (PX306UA#*",	"",	"",	S3_BIOS|S3_MODE },
-	/* Sep 27, 2010 - William Welch <buwelch@gm....com> */
-	{ "Hewlett-Packard",	"Pavilion dv5000 (ET805UA#ABA)     ",	"F.33",	"",	VBE_SAVE },
-	/* Wally Valters <deepsky99@gmail.com> */
-	{ "Hewlett-Packard",	"Pavilion dv5000 (EZ535UA#*",	"",	"",	0 },
-	/* HP Pavilion dv5244eu, Adrian Connolly <aconnolly08@qub.ac.uk> */
-	{ "Hewlett-Packard",	"Pavilion dv5000 (RA648EA#ABU)     ",	"F.42",	"F.42",	0 },
-	/* Arun Gupta <axgupta1@gmail.com> */
-	{ "Hewlett-Packard",	"Pavilion dv6000 (EY798AV#*",	"",	"",	0 },
-	/* imported from acpi-support 0.59 "half known". */
-	{ "Hewlett-Packard",	"Pavilion zd7000*",	"",	"",	VBE_POST|VBE_SAVE|UNSURE },
-	/* Etienne URBAH <etienne.urbah@free.fr> */
-	{ "Hewlett-Packard",	"Pavilion zd8000 (EL030EA#*",	"",	"",	VBE_POST },
-	/* Karthik <molecularbiophysics@gmail.com> */
-	{ "Hewlett-Packard ",	"Pavilion zt3300 *",	"",	"68BAL*",	S3_BIOS },
-	/* Frank Schröder <frank.schroeder@gmail.com>, zt3380us */
-	{ "Hewlett-Packard ",	"Pavilion zt3300 (PF083UA#*",	"",	"",	0 },
-	/* Feb 2011 - Pierre Hilson <zorglups.mailing@gmail.com> */
-	{ "Hewlett-Packard",	"Pavilion ZV6100 (EK848EA#*",	"F.1B",	"F.1B",	0 },
-	/* Jari Turkia <jmjt@lut.fi> */
-	{ "Hewlett-Packard*",	"Presario 2100 (DP835E)*",	"",	"",	0 },
-	/* Frederic Koehler <fkfire@gmail.com> */
-	{ "Hewlett-Packard*",	"Presario 2200 (PR309UA#*",	"",	"",	0 },
-	/* Matto Marjanovic <maddog@mir.com> */
-	{ "Hewlett-Packard",	"Presario C500 (RZ341UA#*",	"",	"",	0 },
-	/* Igor Tamara <igor@tamarapatino.org> */
-	{ "Hewlett-Packard",	"Presario C700 (GV681LA#*",	"",	"",	0 },
-	/* Robert Gomulka <r.gom1977@gmail.com>*/
-	{ "Hewlett-Packard",	"Presario F500 (GF596UA#*",	"",	"",	0 },
-	/* Fatih Alabas https://bugzilla.novell.com/show_bug.cgi?id=230528 */
-	{ "Hewlett-Packard",	"Presario M2000 (EQ547PA#*",	"",	"",	S3_BIOS|VBE_MODE },
-	/* Sitsofe Wheeler <sitsofe@yahoo.com> */
-	{ "Hewlett-Packard ",	"Presario R3000 *",	"",	"",	S3_BIOS|S3_MODE },
-	/* Arthur Peters <amp@singingwizard.org> */
-	{ "Hewlett-Packard*",	"Presario R3200 *",	"",	"",	VBE_POST|VBE_SAVE },
-	/* */
-	{ "Hewlett-Packard",	"Presario R4100 *",	"",	"",	S3_BIOS|S3_MODE },
-	/* iamnoah@gmail.com */
-	{ "Hewlett-Packard",	"Presario V2000 (EP381UA#*",	"",	"",	S3_BIOS },
-	/* Cristian S. Rocha  crocha@dc.uba.ar */
-	{ "Hewlett-Packard",	"Presario V3000 (EZ674UA#*",	"",	"",	S3_BIOS|S3_MODE },
-	/* JEROME HAYNES-SMITH <jerome.smith@btinternet.com> */
-	{ "Hewlett-Packard",	"Presario V3000 (EZ755UA#*",	"",	"",	0 },
-	/* From: "Lim Chuen Ee, Mike" <chuenee@starhub.net.sg> */
-	{ "Hewlett-Packard",	"Presario V3000 (RL377PA#*",	"",	"",	S3_BIOS|S3_MODE },
-	/* Adi Nugroho https://bugzilla.novell.com/show_bug.cgi?id=364456 */
-	{ "Hewlett-Packard",	"Presario V3700 Notebook PC",	"",	"",	S3_BIOS|S3_MODE },
-	/* Michael Kimsal <mgkimsal@gmail.com> */
-	{ "Hewlett-Packard",	"Presario V5000 (ET826UA#*",	"",	"",	0 },
-	/* Battle Nick <Nick.Battle@uk.fujitsu.com>, also a nc6120 */
-	{ "Hewlett-Packard",	"PY507ET#*",	"",	"68DTD*",	VBE_POST|VBE_MODE },
-	/* Benjamin Cherian <benjamin.cherian@gmail.com> */
-	{ "HP Pavilion 061",	"D7223K-ABA A650E",	"",	"",	0 },
-	/* A desktop with integrated graphics, Bo Thysell <thysell@fusemail.com> */
-	{ "HP Pavilion 061",	"EJ192AA-ABS t3250.se",	"",	"",	0 },
-	/* Michael Zaugg <dev.miguel@netzbox.ch> */
-	{ "HP Pavilion 061",	"EP198AA-UUZ t3335.ch",	"",	"",	0 },
-	/* Stefan Friedrich <strfr@web.de> */
-	{ "HP Pavilion 061",	"ES061AA-ABD t3320*",	"",	"",	0 },
-	/* Levi Larsen <levi.larsen@gmail.com> */
-	{ "HP Pavilion 061",	"PC098A-ABA M1070N",	"",	"",	0 },
-	/* Philippe LEBOURG <ph.l@wanadoo.fr> */
-	{ "HP-Pavilion",	"NB965AA-ABF s3715fr",	" ",	"5.08 ",	0 },
-	/* Arun Gupta <axgupta1@gmail.com>, works only with nvidia driver :( */
-	{ "HP-Pavilion",	"RP829AV-ABA d4790y",	"",	"",	0 },
-	/* Gijs van Gemert <g.v.gemert@inter.nl.net> */
-	{ "HP-Pavilion",	"RZ418AA-ABH s3020*",	"",	"",	VBE_MODE },
-	/* R50/p imported from acpi-support 0.59 "half known". */
-	{ "IBM",	"1830*",	"",	"",	VBE_POST|VBE_SAVE|UNSURE },
-	/* R50/p imported from acpi-support 0.59 "half known". */
-	{ "IBM",	"1831*",	"",	"",	VBE_POST|VBE_SAVE|UNSURE },
-	/* R50/p imported from acpi-support 0.59 "half known". */
-	{ "IBM",	"1832*",	"",	"",	VBE_POST|VBE_SAVE|UNSURE },
-	/* R50/p imported from acpi-support 0.59 "half known". */
-	{ "IBM",	"1833*",	"",	"",	VBE_POST|VBE_SAVE|UNSURE },
-	/* ThinkPad R50e, Ferenc Wagner <wferi@niif.hu> */
-	{ "IBM",	"1834S5G",	"ThinkPad R50e",	"1WET90WW (2.10 )",	0 },
-	/* R50/p imported from acpi-support 0.59 "half known". */
-	{ "IBM",	"1836*",	"",	"",	VBE_POST|VBE_SAVE|UNSURE },
-	/* R50/p imported from acpi-support 0.59 "half known". */
-	{ "IBM",	"1840*",	"",	"",	VBE_POST|VBE_SAVE|UNSURE },
-	/* R50/p imported from acpi-support 0.59 "half known". */
-	{ "IBM",	"1841*",	"",	"",	VBE_POST|VBE_SAVE|UNSURE },
-	/* R52 imported from acpi-support 0.59 "half known". */
-	{ "IBM",	"1846*",	"",	"",	VBE_POST|VBE_SAVE|UNSURE },
-	/* R52 imported from acpi-support 0.59 "half known". */
-	{ "IBM",	"1847*",	"",	"",	VBE_POST|VBE_SAVE|UNSURE },
-	/* R52 imported from acpi-support 0.59 "half known". */
-	{ "IBM",	"1848*",	"",	"",	VBE_POST|VBE_SAVE|UNSURE },
-	/* R52 imported from acpi-support 0.59 "half known". */
-	{ "IBM",	"1849*",	"",	"",	VBE_POST|VBE_SAVE|UNSURE },
-	/* R52 imported from acpi-support 0.59 "half known". */
-	{ "IBM",	"1850*",	"",	"",	VBE_POST|VBE_SAVE|UNSURE },
-	/* R52, reported by Joscha Arenz */
-	{ "IBM",	"1860*",	"",	"",	S3_BIOS|S3_MODE },
-	/* X41 imported from acpi-support 0.59 "half known". */
-	{ "IBM",	"1864*",	"",	"",	VBE_POST|VBE_SAVE|UNSURE },
-	/* X41 imported from acpi-support 0.59 "half known". */
-	{ "IBM",	"1865*",	"",	"",	VBE_POST|VBE_SAVE|UNSURE },
-	/* R52 imported from acpi-support 0.59 "half known". */
-	{ "IBM",	"1870*",	"",	"",	VBE_POST|VBE_SAVE|UNSURE },
-	/* T43 imported from acpi-support 0.59 "half known". */
-	{ "IBM",	"1871*",	"",	"",	VBE_POST|VBE_SAVE|UNSURE },
-	/* T43 imported from acpi-support 0.59 "half known". */
-	{ "IBM",	"1872*",	"",	"",	VBE_POST|VBE_SAVE|UNSURE },
-	/* T43 imported from acpi-support 0.59 "half known". */
-	{ "IBM",	"1873*",	"",	"",	VBE_POST|VBE_SAVE|UNSURE },
-	/* T43 imported from acpi-support 0.59 "half known". */
-	{ "IBM",	"1874*",	"",	"",	VBE_POST|VBE_SAVE|UNSURE },
-	/* T43 imported from acpi-support 0.59 "half known". */
-	{ "IBM",	"1875*",	"",	"",	VBE_POST|VBE_SAVE|UNSURE },
-	/* T43 imported from acpi-support 0.59 "half known". */
-	{ "IBM",	"1876*",	"",	"",	VBE_POST|VBE_SAVE|UNSURE },
-	/* T30 */
-	{ "IBM",	"2366*",	"",	"",	RADEON_OFF },
-	/* X40 imported from acpi-support 0.59 "half known". */
-	{ "IBM",	"2369*",	"",	"",	VBE_POST|VBE_SAVE|UNSURE },
-	/* X40 imported from acpi-support 0.59 "half known". */
-	{ "IBM",	"2370*",	"",	"",	VBE_POST|VBE_SAVE|UNSURE },
-	/* X40 confirmed by Christian Deckelmann */
-	{ "IBM",	"2371*",	"ThinkPad X40",	"",	S3_BIOS|S3_MODE },
-	/* X40, Confirmed by Ville Kov�cs (From X and console) */
-	{ "IBM",	"2372*",	"ThinkPad X40",	"",	S3_BIOS },
-	/* T42p confirmed by Joe Shaw, T41p by Christoph Thiel (both 2373) */
-	{ "IBM",	"2373*",	"",	"",	S3_BIOS|S3_MODE },
-	/* T41p, Stefan Gerber */
-	{ "IBM",	"2374*",	"",	"",	S3_BIOS|S3_MODE },
-	/* T40/T41/T42/p imported from acpi-support 0.59 "half known". */
-	{ "IBM",	"2375*",	"",	"",	VBE_POST|VBE_SAVE|UNSURE },
-	/* T42, Bjorn Mork <bjorn@mork.no> */
-	{ "IBM",	"2376*",	"",	"",	S3_BIOS|S3_MODE },
-	/* T40/T41/T42/p imported from acpi-support 0.59 "half known". */
-	{ "IBM",	"2378*",	"",	"",	VBE_POST|VBE_SAVE|UNSURE },
-	/* T40/T41/T42/p imported from acpi-support 0.59 "half known". */
-	{ "IBM",	"2379*",	"",	"",	VBE_POST|VBE_SAVE|UNSURE },
-	/* X40 imported from acpi-support 0.59 "half known". */
-	{ "IBM",	"2382*",	"",	"",	VBE_POST|VBE_SAVE|UNSURE },
-	/* X40, Andrew Pimlott <andrew@pimlott.net> */
-	{ "IBM",	"2386*",	"",	"",	S3_BIOS|S3_MODE },
-	/* G40 confirmed by David Härdeman */
-	{ "IBM",	"2388*",	"",	"",	0 },
-	/* Z60t, Sascha Hunold <sascha_hunold@gmx.de> */
-	{ "IBM",	"2511*",	"",	"",	S3_BIOS|S3_MODE },
-	/* X41, Florian Ragwitz <rafl@debian.org>, */
-	{ "IBM",	"2525*",	"",	"",	S3_BIOS|S3_MODE },
-	/* X41, Johannes Zellner <johannes@zellner.org> */
-	{ "IBM",	"2526*",	"",	"",	S3_BIOS|S3_MODE },
-	/* X41 imported from acpi-support 0.59 "half known". */
-	{ "IBM",	"2527*",	"",	"",	VBE_POST|VBE_SAVE|UNSURE },
-	/* X41 imported from acpi-support 0.59 "half known". */
-	{ "IBM",	"2528*",	"",	"",	VBE_POST|VBE_SAVE|UNSURE },
-	/* Z60m, reported by Arkadiusz Miskiewicz */
-	{ "IBM",	"2529*",	"",	"",	S3_BIOS|S3_MODE },
-	/* A21m, Raymund Will */
-	{ "IBM",	"2628*",	"",	"",	0 },
-	/* A21p, Holger Sickenberg */
-	{ "IBM",	"2629*",	"",	"",	0 },
-	/* George says the newer BIOS INET36WW / kernel 2.6.22 works fine with these options / without X  VBE_POST|VBE_MODE, George Tellalov <gtellalov@emporikilife.gr> with X */
-	{ "IBM",	"2645*",	"",	"",	VBE_SAVE },
-	/* T23 Gernot Schilling <gernotschilling@gmx.de> */
-	{ "IBM",	"2647*",	"",	"",	S3_BIOS|S3_MODE },
-	/* T21 imported from acpi-support 0.59 "half known". */
-	{ "IBM",	"2648*",	"",	"",	VBE_POST|VBE_SAVE|UNSURE },
-	/* A30, Axel Braun. https://bugzilla.novell.com/show_bug.cgi?id=309742 Backlight stays on, but RADEON_OFF kills the machine on second suspend :-( */
-	{ "IBM",	"2652*",	"",	"",	S3_BIOS|S3_MODE },
-	/* A31p, Till D"orges <td@pre-secure.de> */
-	{ "IBM",	"2653*",	"",	"",	RADEON_OFF },
-	/* R32 */
-	{ "IBM",	"2658*",	"",	"",	0 },
-	/* X22, confirmed by Richard Neill */
-	{ "IBM",	"2662*",	"",	"",	S3_BIOS|S3_MODE|RADEON_OFF },
-	/* X31, confirmed by Bjoern Jacke */
-	{ "IBM",	"2672*",	"",	"",	S3_BIOS|S3_MODE|RADEON_OFF },
-	/* X31, Vladislav Korecky <v.korecky@gmail.com>, bios_version="1QET73WW (2.11 )" */
-	{ "IBM",	"2673*",	"",	"",	S3_BIOS|S3_MODE },
-	/* R40 */
-	{ "IBM",	"2681*",	"",	"",	0 },
-	/* R40 imported from acpi-support 0.59 "half known". */
-	{ "IBM",	"2682*",	"",	"",	VBE_POST|VBE_SAVE|UNSURE },
-	/* R40 imported from acpi-support 0.59 "half known". */
-	{ "IBM",	"2683*",	"",	"",	VBE_POST|VBE_SAVE|UNSURE },
-	/* R40 imported from acpi-support 0.59 "half known". */
-	{ "IBM",	"2692*",	"",	"",	VBE_POST|VBE_SAVE|UNSURE },
-	/* R40 imported from acpi-support 0.59 "half known". */
-	{ "IBM",	"2693*",	"",	"",	VBE_POST|VBE_SAVE|UNSURE },
-	/* R40 imported from acpi-support 0.59 "half known". */
-	{ "IBM",	"2696*",	"",	"",	VBE_POST|VBE_SAVE|UNSURE },
-	/* R40 imported from acpi-support 0.59 "half known". */
-	{ "IBM",	"2698*",	"",	"",	VBE_POST|VBE_SAVE|UNSURE },
-	/* R40 imported from acpi-support 0.59 "half known". */
-	{ "IBM",	"2699*",	"",	"",	VBE_POST|VBE_SAVE|UNSURE },
-	/* R40 */
-	{ "IBM",	"2722*",	"",	"",	0 },
-	/* R40 imported from acpi-support 0.59 "half known". */
-	{ "IBM",	"2723*",	"",	"",	VBE_POST|VBE_SAVE|UNSURE },
-	/* R40 imported from acpi-support 0.59 "half known". */
-	{ "IBM",	"2724*",	"",	"",	VBE_POST|VBE_SAVE|UNSURE },
-	/* X30 imported from acpi-support 0.59 "half known". */
-	{ "IBM",	"2884*",	"",	"",	VBE_POST|VBE_SAVE|UNSURE|RADEON_OFF },
-	/* X30 imported from acpi-support 0.59 "half known". */
-	{ "IBM",	"2885*",	"",	"",	VBE_POST|VBE_SAVE|UNSURE|RADEON_OFF },
-	/* G41, Steven Rostedt <rostedt@goodmis.org> */
-	{ "IBM",	"2886*",	"",	"",	VBE_POST|VBE_MODE },
-	/* X30 imported from acpi-support 0.59 "half known". */
-	{ "IBM",	"2890*",	"",	"",	VBE_POST|VBE_SAVE|UNSURE|RADEON_OFF },
-	/* X30 imported from acpi-support 0.59 "half known". */
-	{ "IBM",	"2891*",	"",	"",	VBE_POST|VBE_SAVE|UNSURE|RADEON_OFF },
-	/* R40 imported from acpi-support 0.59 "half known". */
-	{ "IBM",	"2897*",	"",	"",	VBE_POST|VBE_SAVE|UNSURE },
-	/* T23 imported from acpi-support 0.59 "half known". */
-	{ "IBM",	"475S*",	"",	"",	VBE_POST|VBE_SAVE|UNSURE },
-	/* R51 confirmed by Christian Zoz and Sitsofe Wheeler <sitsofe@yahoo.com> */
-	{ "IBM",	"",	"ThinkPad R51",	"",	0 },
-	/* R51e, reported by nemec.jiri@gmail.com */
-	{ "IBM",	"",	"ThinkPad R51e",	"",	S3_BIOS|S3_MODE },
-	/* Joerg Platte jplatte@naasa.net, again emtpy sys_product... */
-	{ "IBM",	"       ",	"ThinkPad T40 ",	"1RETDRWW*",	0 },
-	/* T43p reported by Magnus Boman */
-	{ "IBM",	"",	"ThinkPad T43p",	"",	S3_BIOS|S3_MODE },
-	/* Some T43's reported by Sebastian Nagel */
-	{ "IBM",	"",	"ThinkPad T43",	"",	S3_BIOS|S3_MODE },
-	/* */
-	{ "IBM",	"",	"ThinkPad X32",	"",	RADEON_OFF|S3_BIOS|S3_MODE },
-	/* Ralph Thormann, notice the empty sys_product :-( */
-	{ "IBM",	"       ",	"ThinkPad X40",	"1UETD2WW*",	0 },
-	/* X41 Tablet, tested by Danny Kukawka */
-	{ "IBM",	"",	"ThinkPad X41 Tablet",	"",	S3_BIOS|S3_MODE },
-	/* Andrey Melentyev <andrey.melentyev@gmail.com> */
-	{ "Infomash",	"RoverBook",	"",	"",	VBE_POST|VBE_MODE },
-	/* Christian Beier <dontmind@freeshell.org> */
-	{ "JVC",	"J2N       ",	"",	"",	VBE_SAVE },
-	/* May 29, 2010 - rousta bout <rousta_bout@ya...> */
-	{ "LENOVO",	"019624U",	"ThinkPad Edge",	"6YET29WW (1.12 )",	0 },
-	/* Dave Royal <dave@daveroyal.com>, R60e 32bit works with S3_MODE, 64bit needs VBE_MODE */
-	{ "LENOVO",	"0657*",	"",	"",	S3_BIOS|VBE_MODE },
-	/* Leo G <chudified@gmail.com> */
-	{ "LENOVO",	"068928U",	"3000 N100 *",	"",	0 },
-	/* AFAICT the 3000 C100 is only available with intel graphics Luc Levain <luc.levain@yahoo.co.uk>, works with old and new kernel. */
-	{ "LENOVO",	"0761*",	"3000 C100 *",	"",	0 },
-	/* Sebastian Schleehauf <S.Schleehauf@gmx.de>, 3000V100 */
-	{ "LENOVO",	"0763*",	"LENOVO3000 V100",	"",	0 },
-	/* these Lenovo 3000 N100 model 768 are available with different graphics chips, so i do not dare to wildcard anything here :-( https://bugzilla.novell.com/show_bug.cgi?id=299099 */
-	{ "LENOVO",	"076804U",	"3000 N100 *",	"",	S3_BIOS|VBE_MODE },
-	/* Bogdan <boogi77@o2.pl> */
-	{ "LENOVO",	"076831G",	"3000 N100 *",	"",	0 },
-	/* Tim Creech <dezgotspam@gmail.com> */
-	{ "LENOVO",	"076835U",	"3000 N100 *",	"",	0 },
-	/* Aviv Ben-Yosef <aviv.by@gmail.com> */
-	{ "LENOVO",	"07686VG",	"3000 N100 *",	"",	0 },
-	/* Ted Percival <ted@midg3t.net> */
-	{ "LENOVO",	"07687MM",	"3000 N100 *",	"",	S3_MODE },
-	/* Johannes Rohr <jorohr@gmail.com> */
-	{ "LENOVO",	"0768BYG",	"3000 N100 *",	"",	0 },
-	/* I'm not sure how to handle the 3000 N200 models... Thorsten Frey <thorsten@tfrey.de> reported no options, michael.monreal@gmail.com reports -a3 */
-	{ "LENOVO",	"0769AC6",	"3000 N200 *",	"",	S3_BIOS|S3_MODE },
-	/* Moritz Schaefer <mollitz@googlemail.com> */
-	{ "LENOVO",	"0769AH9",	"3000 N200 *",	"",	0 },
-	/* Lenovo 3000 N200, Kyle Jones -- Hotelicom <kyle@hotelicom.com> */
-	{ "LENOVO",	"0769AVU",	"3000 N200                       ",	"68ET31WW",	0 },
-	/* Hans Gunnarsson <hans.gunnarsson@gmail.com> */
-	{ "LENOVO",	"0769B9G",	"3000 N200 *",	"",	0 },
-	/* Stojan Jakotic <stojanjakotic@centrum.cz> */
-	{ "LENOVO",	"0769BBG",	"3000 N200 *",	"",	S3_BIOS|S3_MODE },
-	/* ozon <rootdesign@gmail.com> */
-	{ "LENOVO",	"0769BEG",	"3000 N200 *",	"",	0 },
-	/* Jes�s Malo Poyatos <jesusmalo@gmail.com> */
-	{ "LENOVO",	"0769ESG",	"3000 N200 *",	"",	0 },
-	/* X60 / X60s */
-	{ "LENOVO",	"1702*",	"",	"",	S3_BIOS|S3_MODE },
-	/* X60 / X60s */
-	{ "LENOVO",	"1704*",	"",	"",	S3_BIOS|S3_MODE },
-	/* X60 / X60s */
-	{ "LENOVO",	"1706*",	"",	"",	S3_BIOS|S3_MODE },
-	/* Nov 1, 2010 - Markus Bauer-Sommerfeld <m.bs@g...com> */
-	{ "LENOVO",	"20021,2959",	"Lenovo Ideapad S12",	"19CN21WW",	0 },
-	/* T60p, Stephane Liardet <sliardet@gmail.com> */
-	{ "LENOVO",	"2007*",	"",	"",	S3_BIOS|S3_MODE },
-	/* Apr 12, 2010 - Johannes Engel <jcnengel@go...> */
-	{ "LENOVO",	"20828WG",	"ThinkPad T500",	"7VET81WW (3.11 )",	0 },
-	/* Tanuva <tanuva@googlemail.com> */
-	{ "LENOVO",	"20828WG",	"ThinkPad T500",	"7VET86WW (3.16 )",	0 },
-	/* Lenovo ThinkPad T500, Maciej Piechotka <uzytkownik2@gmail.com> */
-	{ "LENOVO",	"2242CTO",	"ThinkPad T500",	"6FET79WW (3.09 )",	0 },
-	/* LENOVO X300, 2008-04-03 https://bugzilla.novell.com/show_bug.cgi?id=370690 */
-	{ "LENOVO",	"2478*",	"",	"",	S3_BIOS|S3_MODE },
-	/* LENOVO X300, 2008-04-03 https://bugzilla.novell.com/show_bug.cgi?id=370690 */
-	{ "LENOVO",	"2479*",	"",	"",	S3_BIOS|S3_MODE },
-	/* Dec 29, 2009 - Slawek Gocan <alkor@eranet.pl> */
-	{ "LENOVO",	"273232G",	"ThinkPad R500",	"7YET70WW (3.00 )",	VBE_POST|VBE_MODE },
-	/* Lenovo T400, Chris Cain <zshazz@gmail.com>; Whitelist all bioses Arkadiusz Miskiewicz  */
-	{ "LENOVO",	"2764CTO",	"ThinkPad T400",	"",	VBE_POST|VBE_MODE },
-	/* Michael Düll <akurei@furdev.org> Thinkpad T400 | Michael Düll <mail@a....de> */
-	{ "LENOVO",	"2767*",	"ThinkPad T400",	"",	0 },
-	/* IBM T400, Erez Zarum <erez@erezzarum.com> */
-	{ "LENOVO",	"2768EB7",	"ThinkPad T400",	"7UET71WW (3.01 )",	VBE_SAVE|VBE_MODE|PCI_SAVE },
-	/* Jul 18, 2010 - Mathias Lorenz <mathias@lo...> */
-	{ "LENOVO",	"28477MG",	"ThinkPad SL510",	"6JET73WW (1.31 )",	S3_BIOS|S3_MODE },
-	/* Moritz Augsburger <moritz@augsburger.name> */
-	{ "LENOVO",	"2985ETG",	"ThinkPad X201 Tablet",	"6QET61WW (1.31 )",	0 },
-	/* Jun 10, 2010 - Kevin Brosnan <kbrosnan@gm...> */
-	{ "LENOVO",	"3241                            ",	"Lenovo IdeaPad Y550P            ",	"1ECN33WW(V5.07)",	0 },
-	/* T61 / R61 2008-01-29, bug https://bugzilla.novell.com/show_bug.cgi?id=334522#c10 */
-	{ "LENOVO",	"4108*",	"",	"",	S3_BIOS|S3_MODE },
-	/* T61 / R61 2008-01-29, bug https://bugzilla.novell.com/show_bug.cgi?id=334522#c10 */
-	{ "LENOVO",	"4141*",	"",	"",	S3_BIOS|S3_MODE },
-	/* T61 / R61 2008-01-29, bug https://bugzilla.novell.com/show_bug.cgi?id=334522#c10 */
-	{ "LENOVO",	"4143*",	"",	"",	S3_BIOS|S3_MODE },
-	/* Vladimir Zapolskiy <vzapolskiy@gmail.com> */
-	{ "LENOVO",	"4391B76",	"ThinkPad W510",	"6LET63WW (1.26 )",	0 },
-	/* ThinkCentre M57p, <Joerg.Breuninger@de.bosch.com>, intel gfx, kernel 2.6.25.5 */
-	{ "LENOVO",	"6088*",	"",	"",	0 },
-	/* X60 Tablet, Carlos Lange, https://bugzilla.novell.com/show_bug.cgi?id=265613#c12 */
-	{ "LENOVO",	"6363*",	"",	"",	S3_BIOS|S3_MODE },
-	/* X60 Tablet, Gary Ekker, https://bugzilla.novell.com/show_bug.cgi?id=265613 */
-	{ "LENOVO",	"6364*",	"",	"",	S3_BIOS|S3_MODE },
-	/* X60 Tablet, Aaron Denney <wnoise@ofb.net>, needs at least BIOS "7JET25WW (1.10 )"*/
-	{ "LENOVO",	"6365*",	"",	"",	S3_BIOS|S3_MODE },
-	/*  Florian Wagner <florian@wagner-flo.net>, X60 Tablet */
-	{ "LENOVO",	"6366*",	"",	"",	S3_BIOS|S3_MODE },
-	/* T61 */
-	{ "LENOVO",	"6378*",	"",	"",	S3_BIOS|S3_MODE },
-	/* T61 */
-	{ "LENOVO",	"6379*",	"",	"",	S3_BIOS|S3_MODE },
-	/* Christian Borntraeger <borntraeger@de.ibm.com>, VBE_POST|VBE_MODE works without binary driver */
-	{ "LENOVO",	"6457*",	"",	"",	VBE_POST|VBE_MODE },
-	/* confirmed to work with VESA by Ryan Kensrod <rkensrud@novell.com> */
-	{ "LENOVO",	"6458*",	"",	"",	VBE_POST|VBE_MODE },
-	/* T61p, leighton 5 <ng1lei@gmail.com>, ... what's the difference to the other T61p? */
-	{ "LENOVO",	"6459*",	"",	"",	0 },
-	/* T61p, leighton 5 <ng1lei@gmail.com>, ... what's the difference to the other T61p? */
-	{ "LENOVO",	"6460*",	"",	"",	S3_BIOS|VBE_MODE },
-	/* T61 */
-	{ "LENOVO",	"6463*",	"",	"",	S3_BIOS|S3_MODE },
-	/* T61 */
-	{ "LENOVO",	"6464*",	"",	"",	S3_BIOS|S3_MODE },
-	/* T61: Amit Joshi <ajoshi@optonline.net> (S3_BIOS|S3_MODE), No flags KyuHwa Lee <lee.kyuh@gmail.com> + Michael Henry <lug_user@dr...> */
-	{ "LENOVO",	"6465*",	"",	"",	0 },
-	/* T61 */
-	{ "LENOVO",	"6466*",	"",	"",	S3_BIOS|S3_MODE },
-	/* T61 */
-	{ "LENOVO",	"6467*",	"",	"",	S3_BIOS|S3_MODE },
-	/* T61 */
-	{ "LENOVO",	"6468*",	"",	"",	S3_BIOS|S3_MODE },
-	/* T61 */
-	{ "LENOVO",	"6471*",	"",	"",	S3_BIOS|S3_MODE },
-	/* LENOVO X300, 2008-04-03 https://bugzilla.novell.com/show_bug.cgi?id=370690 */
-	{ "LENOVO",	"6476*",	"",	"",	S3_BIOS|S3_MODE },
-	/* LENOVO X300, 2008-04-03 https://bugzilla.novell.com/show_bug.cgi?id=370690 */
-	{ "LENOVO",	"6477*",	"",	"",	S3_BIOS|S3_MODE },
-	/* LENOVO X300, 2008-04-03 https://bugzilla.novell.com/show_bug.cgi?id=370690 */
-	{ "LENOVO",	"6478*",	"",	"",	S3_BIOS|S3_MODE },
-	/* T61 */
-	{ "LENOVO",	"6480*",	"",	"",	S3_BIOS|S3_MODE },
-	/* Mar 5, 2010 - Max Zimmermann <maxzimmermann@go...> */
-	{ "LENOVO",	"7439W8A",	"ThinkPad R400",	"7UET79WW (3.09 )",	0 },
-	/* "Lenovo X200", "7458AD9", "ThinkPad X200", "6DET30WW (1.07 )", penma@penma.de */
-	{ "LENOVO",	"7458*",	"",	"",	0 },
-	/* Nine Cholas <nine.cholas@gmail.com> */
-	{ "LENOVO",	"7459W37",	"ThinkPad X200",	"6DET63WW (3.13 )",	0 },
-	/* Dec 27, 2009 - Lars Stoltenow <penma@penma.de> */
-	{ "LENOVO",	"74665EG",	"ThinkPad X200s",	"6DET60WW (3.10 )",	0 },
-	/*ThinkPad R61 https://bugzilla.novell.com/show_bug.cgi?id=353896 */
-	{ "LENOVO",	"7642*",	"",	"",	S3_BIOS|S3_MODE },
-	/*ThinkPad R61 https://bugzilla.novell.com/show_bug.cgi?id=353896 */
-	{ "LENOVO",	"7643*",	"",	"",	S3_BIOS|S3_MODE },
-	/*ThinkPad R61 https://bugzilla.novell.com/show_bug.cgi?id=353896 */
-	{ "LENOVO",	"7644*",	"",	"",	S3_BIOS|S3_MODE },
-	/*ThinkPad R61 https://bugzilla.novell.com/show_bug.cgi?id=353896 */
-	{ "LENOVO",	"7645*",	"",	"",	S3_BIOS|S3_MODE },
-	/*ThinkPad R61 https://bugzilla.novell.com/show_bug.cgi?id=353896 */
-	{ "LENOVO",	"7646*",	"",	"",	S3_BIOS|S3_MODE },
-	/*ThinkPad R61 https://bugzilla.novell.com/show_bug.cgi?id=353896 */
-	{ "LENOVO",	"7647*",	"",	"",	S3_BIOS|S3_MODE },
-	/*ThinkPad R61 https://bugzilla.novell.com/show_bug.cgi?id=353896 */
-	{ "LENOVO",	"7648*",	"",	"",	S3_BIOS|S3_MODE },
-	/*ThinkPad R61 https://bugzilla.novell.com/show_bug.cgi?id=353896 */
-	{ "LENOVO",	"7649*",	"",	"",	S3_BIOS|S3_MODE },
-	/*ThinkPad R61 https://bugzilla.novell.com/show_bug.cgi?id=353896 */
-	{ "LENOVO",	"7650*",	"",	"",	S3_BIOS|S3_MODE },
-	/*ThinkPad R61 https://bugzilla.novell.com/show_bug.cgi?id=353896 */
-	{ "LENOVO",	"7657*",	"",	"",	S3_BIOS|S3_MODE },
-	/* T61, Joe Nahmias <jello@debian.org>, debian bug #432018, 7658Q4U Frank Seidel <fseidel@suse.de> */
-	{ "LENOVO",	"7658*",	"",	"",	S3_BIOS|S3_MODE },
-	/* T61 */
-	{ "LENOVO",	"7659*",	"",	"",	S3_BIOS|S3_MODE },
-	/* T61 */
-	{ "LENOVO",	"7660*",	"",	"",	S3_BIOS|S3_MODE },
-	/* T61 */
-	{ "LENOVO",	"7661*",	"",	"",	S3_BIOS|S3_MODE },
-	/* T61 with NVidia card, https://bugzilla.novell.com/show_bug.cgi?id=290618 */
-	{ "LENOVO",	"7663*",	"",	"",	S3_MODE },
-	/* Jeremiah Mahler <jmmahler@gmail.com> | T61, Aku Pietikainen <aku.pietikainen@ee.oulu.fi>, works with console and X */
-	{ "LENOVO",	"7664*",	"",	"",	0 },
-	/* Rasmus Borup Hansen <rbh@math.ku.dk>, X61s reported 7666 w. S3_BIOS  Anders Engstrom <ankaan@gmail.com> reported 7666 w. S3_BIOS|S3_MODE */
-	{ "LENOVO",	"7666*",	"",	"",	S3_BIOS|S3_MODE },
-	/* X61s */
-	{ "LENOVO",	"7667*",	"",	"",	S3_BIOS|S3_MODE },
-	/* X61s */
-	{ "LENOVO",	"7668*",	"",	"",	S3_BIOS|S3_MODE },
-	/* X61s, Hendrik-Jan Heins <hjh@passys.nl>. Probably does not restore the framebuffer mode correctly, but S3_MODE as well as VBE_MODE seem to fail sometimes on x86_64 on this machine :-( */
-	{ "LENOVO",	"7669*",	"",	"",	S3_BIOS },
-	/* X61s */
-	{ "LENOVO",	"7670*",	"",	"",	S3_BIOS|S3_MODE },
-	/* X61s */
-	{ "LENOVO",	"7671*",	"",	"",	S3_BIOS|S3_MODE },
-	/* X61, Marco Barreno <barreno@cs.berkeley.edu>, works without any hack | kix: S3_BIOS|S3_MODE */
-	{ "LENOVO",	"7673*",	"",	"",	0 },
-	/* X61, Holger Hetterich <hhetter@novell.com> */
-	{ "LENOVO",	"7674*",	"",	"",	S3_BIOS|S3_MODE },
-	/* X61, Jan Grmela <grmela@gmail.com> */
-	{ "LENOVO",	"7675*",	"",	"",	S3_BIOS|S3_MODE },
-	/* X61*/
-	{ "LENOVO",	"7676*",	"",	"",	S3_BIOS|S3_MODE },
-	/* X61*/
-	{ "LENOVO",	"7678*",	"",	"",	S3_BIOS|S3_MODE },
-	/* X61*/
-	{ "LENOVO",	"7679*",	"",	"",	S3_BIOS|S3_MODE },
-	/* Thinkpad R61, Calvin Walton <calvin.walton@gmail.com>, | kix: probably needs S3_MODE */
-	{ "LENOVO",	"7732*",	"",	"",	S3_BIOS },
-	/* R61 */
-	{ "LENOVO",	"7733*",	"",	"",	S3_BIOS|S3_MODE },
-	/* R61 */
-	{ "LENOVO",	"7734*",	"",	"",	S3_BIOS|S3_MODE },
-	/* R61 */
-	{ "LENOVO",	"7735*",	"",	"",	S3_BIOS|S3_MODE },
-	/* R61 */
-	{ "LENOVO",	"7736*",	"",	"",	S3_BIOS|S3_MODE },
-	/* R61 */
-	{ "LENOVO",	"7737*",	"",	"",	S3_BIOS|S3_MODE },
-	/* Thinkpad R61, <dancingseb@yahoo.de> */
-	{ "LENOVO",	"7738*",	"",	"",	S3_BIOS|S3_MODE },
-	/* Stephane Delcroix https://bugzilla.novell.com/show_bug.cgi?id=362945 */
-	{ "LENOVO",	"7762*",	"",	"",	S3_BIOS|S3_MODE },
-	/*ThinkPad X61 Tablet https://bugzilla.novell.com/show_bug.cgi?id=353896 */
-	{ "LENOVO",	"7763*",	"",	"",	S3_BIOS|S3_MODE },
-	/*ThinkPad X61 Tablet https://bugzilla.novell.com/show_bug.cgi?id=353896 or VBE_POST|VBE_MODE  Baylis Shanks <bshanks3@hotmail.com>, possible problems with video */
-	{ "LENOVO",	"7764*",	"",	"",	S3_BIOS|S3_MODE },
-	/*ThinkPad X61 Tablet https://bugzilla.novell.com/show_bug.cgi?id=353896 */
-	{ "LENOVO",	"7767*",	"",	"",	S3_BIOS|S3_MODE },
-	/* Danny Kukawka <dkukawka@suse.de>  ThinkPad X61 Tablet */
-	{ "LENOVO",	"7768*",	"",	"",	S3_BIOS|S3_MODE },
-	/*ThinkPad X61 Tablet https://bugzilla.novell.com/show_bug.cgi?id=353896 */
-	{ "LENOVO",	"7769*",	"",	"",	S3_BIOS|S3_MODE },
-	/* ThinkCentre M55, Mansfield Jordan <mjordan10@ec.rr.com> */
-	{ "LENOVO",	"8808*",	"",	"",	S3_BIOS|S3_MODE },
-	/* R61 Discrete moritz.rogalli@student.uni-tuebingen.de, works with and without nvidia drivers */
-	{ "LENOVO",	"8889*",	"",	"",	0 },
-	/* T61, intel card <seife@suse.de> 32bit works with S3_MODE, but 64bit needs VBE_MODE */
-	{ "LENOVO",	"8895*",	"",	"",	S3_BIOS|VBE_MODE },
-	/* T61 */
-	{ "LENOVO",	"8896*",	"",	"",	S3_BIOS|S3_MODE },
-	/* T61 */
-	{ "LENOVO",	"8897*",	"",	"",	S3_BIOS|S3_MODE },
-	/* T61 */
-	{ "LENOVO",	"8898*",	"",	"",	S3_BIOS|S3_MODE },
-	/* T61 */
-	{ "LENOVO",	"8899*",	"",	"",	S3_BIOS|S3_MODE },
-	/* T61 */
-	{ "LENOVO",	"8900*",	"",	"",	S3_BIOS|S3_MODE },
-	/* Grzegorz Piektiewicz <gpietkie@proteus.pl>, R61, with nvidia driver */
-	{ "LENOVO",	"8918*",	"",	"",	0 },
-	/* <ruedt@physik.fu-berlin.de>, R61, 64bit, NVidia driver does not work */
-	{ "LENOVO",	"8919*",	"",	"",	S3_BIOS|S3_MODE },
-	/*ThinkPad R61 https://bugzilla.novell.com/show_bug.cgi?id=353896 */
-	{ "LENOVO",	"8930*",	"",	"",	S3_BIOS|S3_MODE },
-	/*ThinkPad R61 https://bugzilla.novell.com/show_bug.cgi?id=353896 */
-	{ "LENOVO",	"8932*",	"",	"",	S3_BIOS|S3_MODE },
-	/*ThinkPad R61 https://bugzilla.novell.com/show_bug.cgi?id=353896 */
-	{ "LENOVO",	"8933*",	"",	"",	S3_BIOS|S3_MODE },
-	/*ThinkPad R61 https://bugzilla.novell.com/show_bug.cgi?id=353896 */
-	{ "LENOVO",	"8934*",	"",	"",	S3_BIOS|S3_MODE },
-	/*ThinkPad R61 https://bugzilla.novell.com/show_bug.cgi?id=353896 */
-	{ "LENOVO",	"8935*",	"",	"",	S3_BIOS|S3_MODE },
-	/*ThinkPad R61 https://bugzilla.novell.com/show_bug.cgi?id=353896 */
-	{ "LENOVO",	"8936*",	"",	"",	S3_BIOS|S3_MODE },
-	/*ThinkPad R61 https://bugzilla.novell.com/show_bug.cgi?id=353896 */
-	{ "LENOVO",	"8937*",	"",	"",	S3_BIOS|S3_MODE },
-	/* T61 */
-	{ "LENOVO",	"8938*",	"",	"",	S3_BIOS|S3_MODE },
-	/* T61 */
-	{ "LENOVO",	"8939*",	"",	"",	S3_BIOS|S3_MODE },
-	/*ThinkPad R61 https://bugzilla.novell.com/show_bug.cgi?id=353896 */
-	{ "LENOVO",	"8942*",	"",	"",	S3_BIOS|S3_MODE },
-	/* ThinkPad R61, peter.pille@tektronix.com */
-	{ "LENOVO",	"8943*",	"",	"",	S3_BIOS|VBE_MODE },
-	/*ThinkPad R61 https://bugzilla.novell.com/show_bug.cgi?id=353896 */
-	{ "LENOVO",	"8944*",	"",	"",	S3_BIOS|S3_MODE },
-	/*ThinkPad R61 https://bugzilla.novell.com/show_bug.cgi?id=353896 */
-	{ "LENOVO",	"8945*",	"",	"",	S3_BIOS|S3_MODE },
-	/*ThinkPad R61 https://bugzilla.novell.com/show_bug.cgi?id=353896 */
-	{ "LENOVO",	"8946*",	"",	"",	S3_BIOS|S3_MODE },
-	/*ThinkPad R61 https://bugzilla.novell.com/show_bug.cgi?id=353896 */
-	{ "LENOVO",	"8947*",	"",	"",	S3_BIOS|S3_MODE },
-	/*ThinkPad R61 https://bugzilla.novell.com/show_bug.cgi?id=353896 */
-	{ "LENOVO",	"8948*",	"",	"",	S3_BIOS|S3_MODE },
-	/* Rick van Hattem <Rick.van.Hattem@fawo.nl>, Z61p*/
-	{ "LENOVO",	"9452*",	"",	"",	S3_BIOS|S3_MODE },
-	/* https://bugzilla.novell.com/show_bug.cgi?id=210928, Thinkpad R60, 32bit? */
-	{ "LENOVO",	"9456*",	"",	"",	S3_BIOS|S3_MODE },
-	/* Xu Zhe <x2446421894@gmail.com> */
-	{ "Lenovo",	"Soleil E660P *",	"",	"",	0 },
-	/* From: gregor herrmann <gregor.herrmann@comodo.priv.at> */
-	{ "LENOVO",	"",	"Thinkpad R60e",	"",	S3_BIOS|S3_MODE },
-	/* Marcus Better <marcus@better.se>, this time with a capital "P" */
-	{ "LENOVO",	"",	"ThinkPad R60",	"",	S3_BIOS|S3_MODE },
-	/* T60p, had a report from a 2007* and a 2008* model */
-	{ "LENOVO",	"",	"ThinkPad T60p",	"",	S3_BIOS|S3_MODE },
-	/* T60 From: Jeff Nichols <jnichols@renkoo.net> and Kristofer Hallgren <kristofer.hallgren@gmail.com> */
-	{ "LENOVO",	"",	"ThinkPad T60",	"",	S3_BIOS|S3_MODE },
-	/* Daniel Corson <danl@alum.mit.edu> */
-	{ "LENOVO",	"",	"ThinkPad X201",	"",	S3_BIOS|S3_MODE },
-	/* At least 1709 series thinkpads can be whitelisted by name, and we can probably delete entries above, too.... */
-	{ "LENOVO",	"",	"ThinkPad X60",	"",	S3_BIOS|S3_MODE },
-	/* Z61m From: Roderick Schertler <roderick@argon.org> */
-	{ "LENOVO",	"",	"ThinkPad Z61m",	"",	S3_BIOS|S3_MODE },
-	/* Paul Wilkinson <pwilko@gmail.com> */
-	{ "LENOVO",	"",	"ThinkPad Z61p",	"",	S3_BIOS|S3_MODE },
-	/* merkur@users.sourceforge.net LM50a */
-	{ "LG Electronics",	"LM50-DGHE",	"",	"",	S3_BIOS|S3_MODE },
-	/* Ragnar Seton <ragnar@dm9.se> */
-	{ "LG Electronics",	"LW20-JNMV",	"",	"WINRSF03",	S3_BIOS|S3_MODE },
-	/* jsusiluo@mappi.helsinki.fi */
-	{ "LG Electronics",	"LW75-SGGV1",	"",	"",	S3_BIOS|S3_MODE },
-	/* jsusiluo@mappi.helsinki.fi */
-	{ "LG Electronics",	"M1-3DGBG",	"",	"",	S3_BIOS|S3_MODE },
-	/* Neysan Schaefer <mail@neysan.de> */
-	{ "LG Electronics",	"R500-U.CPCBG",	"",	"",	0 },
-	/* simon kaucic <simon.kaucic@gmail.com> */
-	{ "                    ",	"M37EW",	"None",	"",	S3_BIOS },
-	/* seife */
-	{ "Matsushita Electric Industrial Co.,Ltd.",	"CF-51E*",	"",	"",	VBE_POST|VBE_MODE },
-	/* https://sourceforge.net/tracker/index.php?func=detail&aid=1601715&group_id=45483&atid=443088 */
-	{ "Matsushita Electric Industrial Co.,Ltd.",	"CF-R2C*",	"0032",	"",	VBE_POST|VBE_MODE },
-	/* Hanspeter Kunz <buzz.rexx@gmail.com> */
-	{ "Matsushita Electric Industrial Co.,Ltd.",	"CF-R3E*",	"002",	"",	VBE_POST|VBE_MODE },
-	/* Hanspeter Kunz <hkunz@ifi.uzh.ch> */
-	{ "Matsushita Electric Industrial Co.,Ltd.",	"CF-R6A*",	"",	"",	VBE_POST|VBE_MODE },
-	/* Itsuo HATONO <hatono@kobe-u.ac.jp> */
-	{ "Matsushita Electric Industrial Co.,Ltd.",	"CF-R6M*",	"",	"",	VBE_POST|VBE_MODE },
-	/* Michal Krasucki <mkrasucki@gmail.com> */
-	{ "Matsushita Electric Industrial Co.,Ltd.",	"CF-W4G*",	"",	"",	0 },
-	/* Joost Witteveen <joost@iliana.nl> */
-	{ "MAXDATA",	"IMPERIO4045A *",	"",	"",	0 },
-	/* Jan Gerrit <JanGerrit@Burg-Borgholz.de> */
-	{ "MAXDATA",	"PRO600IW",	"",	"",	S3_BIOS|S3_MODE },
-	/* Oleg Broytmann <phd@phd.pp.ru> */
-	{ "MaxSelect",	"Mission_A330",	"",	"",	VBE_POST|VBE_SAVE },
-	/* Nicolas HENRY <nicolas.hy@free.fr>, nvidia binary driver */
-	{ "MEDION",	"M295M",	"",	"",	0 },
-	/* Leszek Lesner <leszek.lesner@googlemail.com> Medion MD43100 */
-	{ "MEDIONNB       ",	"WID2010        ",	"",	"",	VBE_POST|VBE_MODE },
-	/* Ralf Auer <ralf.auer@physik.uni-erlangen.de>, tested both with nv and binary nvidia */
-	{ "MEDIONNB       ",	"WIM 2000       ",	"",	"",	0 },
-	/* Alberto Gonzalez <info@gnebu.es> */
-	{ "MEDIONPC",	"MS-6714",	"",	"",	S3_BIOS|S3_MODE },
-	/* Mike Galbraith <efault@gmx.de> needs X to get text console back */
-	{ "MEDIONPC",	"MS-7012",	"",	"",	0 },
-	/* Axel Braun <Axel.Braun@gmx.de> */
-	{ "MEDION",	"WIM 2140",	"",	"",	0 },
-	/* Apr 4, 2010 - Mark van Dijk <mark@vo...> */
-	{ "MICRO-STAR INTERNATIONAL CO.,LTD",	"MS-7514",	"1.0",	"V1.10",	0 },
-	/* Aug 1, 2010 - Tristan Hoffmann <info@tr...> */
-	{ "MICRO-STAR INTERNATIONAL CO.,LTD",	"MS-7596",	"1.0",	"V2.3",	0 },
-	/* Oct 13, 2010 - Matti Ropo <matti.ropo@g....com> */
-	{ "MICRO-STAR INTERNATIONAL CO., LTD",	"MS-9632",	"1.0",	"6.00 PG",	0 },
-	/* Jan 21, 2010 - Paul Slater <paulslater19@gmail.com> */
-	{ "MICRO-STAR INTERNATIONAL CO., LTD",	"MS-N014",	"REV:1.0",	"EN014IMS.10B",	0 },
-	/* MSI Wind U100, fseidel@suse.de */
-	{ "MICRO-STAR INTERNATIONAL CO., LTD",	"U-100",	"",	"",	S3_BIOS|S3_MODE },
-	/* Frank Thomas <frank.thomas@uni-weimar.de> */
-	{ "Micro-Star International",	"EX610",	"",	"",	VBE_POST|VBE_MODE },
-	/* Baruch Even <baruch@ev-en.org> */
-	{ "Micro-Star International",	"MS-1412",	"",	"",	VBE_POST|VBE_SAVE|NOFB },
-	/* Enno Wein <ennowein@yahoo.com> */
-	{ "Micro-Star International",	"PR210",	"MS-1222X",	"",	VBE_POST },
-	/* Daniel <daniel.solgalov@medicalmart.ru> */
-	{ "Micro-Star International",	"U210",	"Ver 1.000",	"080015 ",	VBE_POST|VBE_MODE },
-	/* Feb 12, 2010 - Zach Foresta <foureza87@ya...> */
-	{ "Micro-Star International",	"X320",	"Ver 1.000",	"A1351IMS Ver1.01 ",	VBE_SAVE },
-	/* Branislav Gajdos <brianzee@gmail.com> */
-	{ "MICRO-STAR INT'L CO.,LTD",	"MS-1003",	"",	"",	0 },
-	/* Andreas Kostyrka <andreas@kostyrka.org> */
-	{ "MICRO-STAR INT'L CO.,LTD",	"MS-1012",	"",	"",	S3_BIOS },
-	/* Matthijs Kooijman <matthijs@stdin.nl> */
-	{ "MICRO-STAR INT'L CO.,LTD",	"MS-1013",	"",	"",	S3_BIOS },
-	/* Gergely Csepany <cheoppy@gmail.com> */
-	{ "MICRO-STAR INT'L CO.,LTD.",	"MS-1057",	"",	"",	S3_BIOS|S3_MODE },
-	/* May 24, 2010 - Carl van Tonder <carl@su...> */
-	{ "                                ",	"                                ",	"                        ",	"MOPNV10N.86A.0155.2009.1106.0430",	0 },
-	/* Armin Braunstein <armin.braunstein@gmx.at> */
-	{ "                                ",	"                                ",	"                        ",	"MQ96510J.86A.0816.2006.0716.2308",	VBE_POST|VBE_MODE },
-	/* MSI IM-945GSE, Martin Teufel <teufel@informatik.uni-frankfurt.de> */
-	{ "MSI",	"A9830IMS",	"11",	"080015 ",	S3_BIOS|S3_MODE },
-	/* Matej Tyc <matej.tyc@gmail.com> */
-	{ "MSI",	"MS-6417",	"",	"",	0 },
-	/* Petric Frank <pfrank@gmx.de> MSI K8T Neo-FIS2R */
-	{ "MSI",	"MS-6702",	"",	"",	0 },
-	/* uswsusp@faxm0dem.org */
-	{ "MSI.",	"MS-7207PV",	"",	"",	0 },
-	/* Nicholas T <ntung@ntung.com>, mainboard */
-	{ "MSI",	"MS-7350",	"",	"",	0 },
-	/* Apr 9, 2010 - Dâniel Fraga <fragabr@gm...> */
-	{ "MSI",	"MS-7522",	"3.0",	"V8.10",	0 },
-	/* S.Çağlar Onur <caglar@pardus.org.tr>, only works from X */
-	{ "MTC",	"Montara-GML ",	"FAB-2",	"",	0 },
-	/* "Alex V. Myltsev" <avm@altlinux.ru */
-	{ "NCA_GROUP_LTD",	"iRU_Notebook",	"0106",	"",	VBE_POST|VBE_MODE },
-	/* Hugo Costelha */
-	{ "NEC *",	"B7 *",	"",	"",	VBE_SAVE },
-	/* Benoit Thiell <badzil@gmail.com> */
-	{ "NEC COMPUTERS INTERNATIONAL",	"NEC Versa Premium",	"FAB-2",	"",	0 },
-	/* Nicky Gerritsen <nicky@xept.nl> */
-	{ "NEC Computers International *",	"VC2",	"",	"",	S3_BIOS|S3_MODE },
-	/* Apr 20, 2010 - René Gabriëls <renegabriels@gm...> */
-	{ "NEC                             ",	"L4B                             ",	"                                ",	"NOTE BIOS Version /358A1200     ",	0 },
-	/* Ronny Radke <ronnymichaelradke@web.de> medion MIM2080 */
-	{ "NOTEBOOK",	"MIM2080",	"",	"",	S3_BIOS|S3_MODE },
-	/* Jan Willies <jan@willies.info> medion md 96400 */
-	{ "NOTEBOOK",	"SAM2000",	"0131",	"",	0 },
-	/* Tomas Groth <tomasgroth@yahoo.dk> */
-	{ "Notebook",	"SAM2010",	"1058",	"A1058AM7 V7.23",	VBE_SAVE },
-	/* Thomas Braun <thomas.braun@newthinking.de>, rebranded Uniwill P53IN */
-	{ "OEM",	"P53IN4",	"",	"",	0 },
-	/* Wolf Geldmacher <wolf@womaro.ch> */
-	{ "OQO",	"ZEPTO",	"00",	"",	VBE_POST|VBE_SAVE },
-	/* Angelo Anfossi <aanfossi@gmail.com> "Easy Note A6010" */
-	{ "Packard Bell NEC",	"00000000000000000000000",	"",	"A03 ",	0 },
-	/* Per Waago <waago@stud.ntnu.no> */
-	{ "Packard Bell NEC",	"00000000000000000000000",	"P820008416",	"",	0 },
-	/* Mar 1, 2010 - Jan-Matthias Braun <jan_braun@gm...> */
-	{ "Quanta",	"TW8/SW8/DW8",	"",	"",	0 },
-	/* Florian Tham <ftham@unlimitedmail.org> Samsung P35 */
-	{ "SAMSUNG",	"CoronaR",	"03RK",	"",	0 },
-	/* Aug 11, 2010 - Jan Bessai <jan.bessai@tu...> */
-	{ "SAMSUNG ELECTRONICS CO., LTD.",	"N130                       ",	"Not Applicable",	"05CM.M011.20091013.JIP",	0 },
-	/* Aug 31, 2010 - Marco Maso <demind@g...com> */
-	{ "SAMSUNG ELECTRONICS CO., LTD.",	"Q330                       ",	"Not Applicable",	"02UU.M001.20100611.WZW",	0 },
-	/* Jeremie Delaitre <jeremie.delaitre@gmail.com> */
-	{ "SAMSUNG ELECTRONICS CO., LTD.",	"Q35/Q36",	"",	"",	S3_BIOS|S3_MODE },
-	/* Eduardo Robles Elvira <edulix@gmail.com> */
-	{ "SAMSUNG ELECTRONICS CO., LTD.",	"R40/R41",	"",	"",	VBE_SAVE },
-	/* Tim Fischer <mail0812@online.de> works with and without ATI binary driver */
-	{ "SAMSUNG ELECTRONICS CO.,LTD",	"R50/R51 *",	"",	"",	0 },
-	/* Jan 22, 2010 - Rafał Miłecki <zajec5@gmail.com> */
-	{ "SAMSUNG ELECTRONICS CO., LTD.",	"R520/R522/R620               ",	"Not Applicable",	"06LL.M026.20091029.Jay",	VBE_POST|VBE_MODE },
-	/* Daniel Koester <koester@math.uni-augsburg.de> does not yet work from text mode */
-	{ "SAMSUNG ELECTRONICS CO., LTD.",	"R55S *",	"",	"",	0 },
-	/* Pavel Machek, Samsung UMPC */
-	{ "SAMSUNG ELECTRONICS CO., LTD.",	"SQ1US",	"01ME",	"",	VBE_SAVE },
-	/* Maximilian Mehnert <maximilian.mehnert@googlemail.com> */
-	{ "SAMSUNG ELECTRONICS CO., LTD.",	"SQ35S",	"",	"",	VBE_POST },
-	/* Frank Ruell <frank@ruell.com> or J�r�mie <jeremie@lamah.info> no flags */
-	{ "SAMSUNG ELECTRONICS CO., LTD.",	"SQ45S70S",	"",	"",	S3_BIOS|S3_MODE },
-	/* Jens Ott <jo@opteamax.de> */
-	{ "SAMSUNG ELECTRONICS CO., LTD.",	"SR700",	"",	"",	0 },
-	/* Konstantin Krasnov <krkhome@gmail.com>, only with kernel 2.6.24++ */
-	{ "SAMSUNG ELECTRONICS CO., LTD.",	"SX22S",	"07AJ",	"",	VBE_SAVE },
-	/* Arnim Laeuger <arnim.laeuger@gmx.net> */
-	{ "Samsung Electronics",	"NX05S*",	"",	"",	VBE_POST|VBE_MODE },
-	/* Stephen Denham <stephen.denham@gmail.com> */
-	{ "SAMSUNG Electronics",	"SENS V25",	"",	"",	VBE_POST|VBE_MODE },
-	/* Gautier Hattenberger <ghattenb@laas.fr> */
-	{ "Samsung Electronics",	"SM40S",	"",	"",	S3_BIOS|S3_MODE },
-	/* https://bugzilla.novell.com/show_bug.cgi?id=290734 */
-	{ "Samsung Electronics",	"SX20S",	"",	"",	VBE_POST|VBE_MODE },
-	/* Mar 4, 2010 - Christoph Schäfer <cschaefer79@go...> */
-	{ "Samsung Electronics",	"SX25S",	"Revision MP",	"04ZA",	0 },
-	/* Martin Wilck <mwilck@arcor.de> */
-	{ "Samsung Electronics",	"SX50S",	"Revision MP",	"",	VBE_POST },
-	/* */
-	{ "Samsung",	"SQ10",	"",	"",	VBE_POST|VBE_SAVE },
-	/* imported from acpi-support 0.59 "half known". */
-	{ "SHARP Corporation",	"PC-MM20 Series*",	"",	"",	VBE_POST|VBE_SAVE|UNSURE },
-	/* */
-	{ "SHARP                           ",	"PC-AR10 *",	"",	"",	0 },
-	/* <gregor.willms@web.de> & Frederic Boiteux <fboiteux@free.fr> */
-	{ "Shuttle Inc",	"SD11V10",	"",	"",	S3_BIOS|S3_MODE },
-	/* Tejun Heo, https://bugzilla.novell.com/show_bug.cgi?id=390127 */
-	{ "Shuttle Inc",	"SD30V10",	"",	"",	S3_BIOS|S3_MODE },
-	/* Dave Buckler <bungalow2@sbcglobal.net> */
-	{ "Shuttle Inc",	"SD32V10",	" ",	"6.00 PG",	0 },
-	/* Rodolfo kix Garcia <kix@kix.es> */
-	{ "Shuttle Inc",	"SG33",	"V10",	"6.00 PG",	0 },
-	/* foren@nuxli.ch */
-	{ "Shuttle Inc",	"SN41UV10",	"",	"",	VBE_POST|VBE_MODE },
-	/* Thomas Peuss <thomas@peuss.de> */
-	{ "Shuttle Inc",	"SN85V10",	"",	"",	0 },
-	/* Russ Dill <russ.dill@gmail.com> */
-	{ "Sony Corporation    ",	"PCG-F430(UC)        ",	"",	"",	0 },
-	/* Brice Mealier <mealier_brice@yahoo.fr> */
-	{ "Sony Corporation",	"PCG-FR215E*",	"",	"",	0 },
-	/* Eric Wasylishen <ewasylishen@gmail.com>, really needs VBE_SAVE */
-	{ "Sony Corporation",	"PCG-FX340*",	"",	"",	VBE_SAVE },
-	/* Sitsofe Wheeler <sitsofe@yahoo.com> */
-	{ "Sony Corporation",	"PCG-FX405*",	"",	"",	S3_BIOS },
-	/* Stefan Nobis <stefan@snobis.de> */
-	{ "Sony Corporation",	"PCG-FX601*",	"",	"",	S3_BIOS|S3_MODE },
-	/* Loki Harfagr <l0k1@free.fr> */
-	{ "Sony Corporation",	"PCG-FX802*",	"",	"",	VBE_SAVE|VBE_MODE },
-	/* Stefan Friedrich <strfr@web.de> */
-	{ "Sony Corporation",	"PCG-FX805*",	"",	"",	VBE_POST|VBE_SAVE },
-	/* Mattia Dongili <malattia@linux.it> */
-	{ "Sony Corporation    ",	"PCG-GR7_K(J)        ",	"",	"",	0 },
-	/* Marco Nenciarini <mnencia@prato.linux.it> */
-	{ "Sony Corporation",	"PCG-GRT916Z*",	"",	"",	0 },
-	/* */
-	{ "Sony Corporation",	"PCG-GRT995MP*",	"",	"",	0 },
-	/* Jan 17, 2010 - Killua Zaoldyeck <killua.zhang@gmail.com> */
-	{ "Sony Corporation    ",	"PCG-GRX500(UC)      ",	"R2715195            ",	"R0202B0",	0 },
-	/* Bruce Perens <bruce@perens.com> */
-	{ "Sony Corporation",	"PCG-TR2A(UC)",	"",	"",	VBE_MODE },
-	/* imported from acpi-support 0.59 "half known". */
-	{ "Sony Corporation",	"PCG-U101*",	"",	"",	VBE_POST|VBE_SAVE|UNSURE },
-	/* mathieu bouillaguet <mathieu.bouillaguet@gmail.com> */
-	{ "Sony Corporation",	"PCG-Z1RMP*",	"",	"",	VBE_POST|VBE_MODE },
-	/* Tom Lear <tom@trap.mtview.ca.us> */
-	{ "Sony Corporation",	"PCG-Z505HSK(UC)",	"",	"",	0 },
-	/* jmj_sf@freenet.de */
-	{ "Sony Corporation",	"PCV-RX612*",	"",	"",	S3_BIOS|S3_MODE },
-	/* Daniel Sabanes Bove <daniel.sabanesbove@campus.lmu.de> */
-	{ "Sony Corporation",	"VGN-A115B*",	"",	"",	0 },
-	/* Dean Darlison <dean@dasco.ltd.uk>, maybe only with nvidia driver */
-	{ "Sony Corporation",	"VGN-AR31S",	"",	"",	S3_BIOS|S3_MODE },
-	/* Sony VGN-B1VP, M. Vefa Bicakci <bicave@superonline.com> */
-	{ "Sony Corporation",	"VGN-B1VP(GB)",	"J000L04A",	"R0042G9",	S3_BIOS|S3_MODE },
-	/* Daniel Morris <danielm@eCosCentric.com> */
-	{ "Sony Corporation",	"VGN-B1XP*",	"",	"",	S3_BIOS },
-	/* Dhananjaya Rao <phaze87@gmail.com> */
-	{ "Sony Corporation",	"VGN-B55G(I)",	"",	"",	0 },
-	/* Jorge Visca <xxopxe@gmail.com> */
-	{ "Sony Corporation",	"VGN-C140G",	"",	"",	S3_BIOS|S3_MODE },
-	/* May 25, 2010 - kriZ <kriz@ar...> */
-	{ "Sony Corporation",	"VGN-C210E",	"C3LNT131",	"R0080J4",	S3_BIOS },
-	/* Marc Collin https://bugzilla.novell.com/show_bug.cgi?id=410723 */
-	{ "Sony Corporation",	"VGN-C240E",	"",	"",	S3_BIOS|S3_MODE },
-	/* Tijn Schuurmans <t.schuurmans@hccnet.nl> */
-	{ "Sony Corporation",	"VGN-C2S_G",	"",	"",	S3_BIOS },
-	/* Gerhard Riener <gerhard.riener@gmail.com> */
-	{ "Sony Corporation",	"VGN-C2S_H",	"",	"",	0 },
-	/* May 29, 2010 - Duane Griffin <duaneg@dg...> */
-	{ "Sony Corporation",	"VGN-CR11Z_R",	"C10191M5",	"R0220Q0",	0 },
-	/* Apr 2, 2010 - joshua bowles <bowlesling@gm...> */
-	{ "Sony Corporation",	"VGN-CS290J",	"A222DVFY",	"R1080Q2",	0 },
-	/* David Durrleman <david.durrleman@ens.fr>, only from X :-( */
-	{ "Sony Corporation",	"VGN-FE11M",	"",	"",	0 },
-	/* Gert Huizenga <gert@hbrothers.nl> */
-	{ "Sony Corporation",	"VGN-FE21B",	"",	"",	S3_BIOS },
-	/* <lapseofreason0@gmail.com>, only from X, S3_MODE hangs the machine, all other leave the screen blank */
-	{ "Sony Corporation",	"VGN-FE31M",	"",	"",	0 },
-	/* Bernardo Freitas Paulo da Costa <bernardo.da-costa@polytechnique.edu> */
-	{ "Sony Corporation",	"VGN-FE890E",	"",	"",	0 },
-	/* */
-	{ "Sony Corporation",	"VGN-FS115B",	"",	"",	S3_BIOS|S3_MODE },
-	/* Olivier Saier <osaier@gmail.com>, apparently S3_BIOS locks the machine hard */
-	{ "Sony Corporation",	"VGN-FS115Z",	"",	"",	S3_MODE },
-	/* S.Çağlar Onur <caglar@pardus.org.tr> */
-	{ "Sony Corporation",	"VGN-FS215B",	"",	"",	0 },
-	/* Chris deLuXCios <deluxcios@hotmail.com> */
-	{ "Sony Corporation",	"VGN-FS215M",	"",	"",	0 },
-	/* Tim Felgentreff <timfelgentreff@gmail.com> */
-	{ "Sony Corporation",	"VGN-FS485B",	"",	"",	S3_BIOS|S3_MODE },
-	/* Joseph Smith <joe@uwcreations.com> */
-	{ "Sony Corporation",	"VGN-FS660_W",	"",	"",	0 },
-	/* phantomlrrp@gmail.com */
-	{ "Sony Corporation",	"VGN-FS920",	"",	"",	S3_BIOS|S3_MODE },
-	/* Rafal Milecki <zajec5@gmail.com> and Thomas Bayen <tbayen@bayen.de> */
-	{ "Sony Corporation",	"VGN-FW11*",	"",	"",	VBE_POST|VBE_MODE },
-	/* Jan 18, 2010 - Michael Bunk <michael.bunk@gmail.com> */
-	{ "Sony Corporation",	"VGN-FW31J",	"C601640W",	"R2060Y0",	VBE_POST|VBE_MODE },
-	/* Stefano Avallone <stavallo@unina.it> */
-	{ "Sony Corporation",	"VGN-FZ39VN",	"",	"",	0 },
-	/* 03/08/2009, Sony Vaio VGN-N21Z_W, Raphael Scholer <raphael@scholer-online.de> */
-	{ "Sony Corporation",	"VGN-N21Z_W",	"",	"",	0 },
-	/* Fredrik Roubert <roubert@df.lth.se> */
-	{ "Sony Corporation",	"VGN-N320E",	"",	"",	0 },
-	/* 26/12/2009 Adriano Vilela Barbosa <adriano.vilela@gmail.com> */
-	{ "Sony Corporation",	"VGN-NW130D",	"",	"",	0 },
-	/* Martin Hamilton <m@mar.....net> */
-	{ "Sony Corporation",	"VGN-P11Z_Q",	"J003NNCC",	"R2073U3",	S3_MODE },
-	/* Feb 2, 2010 - Thom Siragusa <tsiragusa@gm...> */
-	{ "Sony Corporation",	"VGN-S150(UC)",	"J0007XLN",	"R0041G4",	0 },
-	/* daryl@mail.bg */
-	{ "Sony Corporation",	"VGN-SZ340P",	"",	"",	0 },
-	/* Jan 9, 2010 - neo <neo14515@gmail.com> */
-	{ "Sony Corporation",	"VGN-SZ38GP_C",	"J0022RTD",	"R0091N0",	0 },
-	/* Pedro M. S. Oliveira <pmsoliveira@gmail.com>, machine has two gfx cards, works only well with the intel, not with the nvidia */
-	{ "Sony Corporation",	"VGN-SZ5XN_C",	"",	"",	0 },
-	/* Michal Bozek <michal.bozek@gmail.com> */
-	{ "Sony Corporation",	"VGN-SZ61XN_C",	"",	"",	S3_BIOS|S3_MODE },
-	/* Apr 3, 2010 - Konstantin Starodubtsev <ks@in...> */
-	{ "Sony Corporation",	"VGN-SZ770N",	"J0035SEN",	"R0122S5",	S3_BIOS|S3_MODE },
-	/* Anton Zahlheimer <anton.zahlheimer@landshut.org> */
-	{ "Sony Corporation",	"VGN-T250P",	"",	"",	S3_BIOS|S3_MODE },
-	/* Timo Hoenig <thoenig@suse.de> VGN-TX3HP */
-	{ "Sony Corporation",	"VGN-TX3HP",	"",	"",	0 },
-	/* Stephan Martin <stephan.martin@open-xchange.com> */
-	{ "Sony Corporation",	"VGN-TX3XP_L",	"",	"",	S3_BIOS|S3_MODE },
-	/* Danny Kukawka <dkukawka@suse.de>, TX5MN from Michael Matz <matz@novell.com> */
-	{ "Sony Corporation",	"VGN-TX5MN_W",	"",	"",	VBE_MODE },
-	/* rbm@math.mit.edu */
-	{ "Sony Corporation",	"VGN-TX670P",	"",	"",	VBE_POST|VBE_MODE },
-	/* */
-	{ "Sony Corporation",	"VGN-TX770P",	"",	"",	VBE_POST|VBE_MODE },
-	/* Pier Paolo Pittavino <pittavin@studenti.ph.unito.it>, Timo Hoenig <thoenig@suse.de> */
-	{ "Sony Corporation",	"VGN-TZ11*",	"",	"",	0 },
-	/* Raymond Russell <raymond@corvil.com> */
-	{ "Sony Corporation",	"VGN-TZ170N",	"",	"",	S3_BIOS|S3_MODE },
-	/* Hans Gunnarsson <hans.gunnarsson@gmail.com> */
-	{ "Sony Corporation",	"VGN-TZ21XN_B",	"",	"",	0 },
-	/* matt@thewaffleproject.com */
-	{ "Sony Corporation",	"VGN-TZ37*",	"",	"",	S3_BIOS|S3_MODE },
-	/* Jan P. O. Schuemann" <jan@hep1.phys.ntu.edu.tw> */
-	{ "Sony Corporation",	"VGN-TZ91HS",	"",	"",	0 },
-	/* Mattia Dongili <malattia@linux.it> */
-	{ "Sony Corporation",	"VGN-UX50",	"",	"",	VBE_MODE },
-	/* ISHIKAWA Mutsumi <ishikawa@hanzubon.jp> */
-	{ "Sony Corporation",	"VGN-Z90S",	"",	"",	0 },
-	/* Oct 28, 2010 - Benoit Vidis <contact@ben....com> */
-	{ "Sony Corporation",	"VPCF11E4E",	"C603V8KU",	"R0280Y6",	S3_BIOS },
-	/* Stephan Mueller <smueller@chr....de> */
-	{ "Sony Corporation",	"VPCP111KX",	"C606NMD8",	"R0110U5",	VBE_POST|VBE_SAVE },
-	/* Oct, 2010 - Jason O'Neil <jason.oneil@g....com> */
-	{ "Sony Corporation",	"VPCZ128GG",	"J0049W8Q",	"R2074C3",	S3_BIOS|S3_MODE },
-	/* ASUS Mainboard, also broken DMI strings... Luis Valino <valino@litec.csic.es> */
-	{ "System manufacturer",	"P5KR",	"System Version",	"",	0 },
-	/* ASUS Mainboard, Gary Andrew https://bugzilla.novell.com/show_bug.cgi?id=419813 */
-	{ "System manufacturer",	"P5Q DELUXE",	"System Version",	"",	S3_BIOS|S3_MODE },
-	/* May 3, 2010 - <deben@al...> */
-	{ "System manufacturer",	"System name",	"1.XX    ",	"ASUS A8N-SLI ACPI BIOS Revision 1001",	0 },
-	/* Asus P4B266, s2ram -f -a 3 Olivier Berger <oberger@ouvaton.org> */
-	{ "System Manufacturer",	"System Name",	"System Version",	"ASUS P4B266 ACPI BIOS Revision 1010",	S3_BIOS|S3_MODE },
-	/* June 12, 2010 - Donald Jenkins <d...@gm....com> */
-	{ "System manufacturer",	"System Product Name",	"System Version",	"0208   ",	0 },
-	/* Mar 1, 2010 - ali mofasa <ali_mofasa@ho...> */
-	{ "System manufacturer",	"System Product Name",	"System Version",	"0705   ",	0 },
-	/* Feb 28, 2010 - Christian Hammers <ch@la...> */
-	{ "System manufacturer",	"System Product Name",	"System Version",	"ASUS M2A-VM HDMI ACPI BIOS Revision 0902",	0 },
-	/* Pavol Otcenas <Pavol.Otcenas@2c.cz>, "Prestigio Nobile 159W" */
-	{ "To Be Filled By O.E.M.",	"259IA1",	"To Be Filled By O.E.M.",	"080010 ",	S3_MODE },
-	/* Petr Pudlak <naradapuri@gmail.com> */
-	{ "To Be Filled By O.E.M.",	"MS-7210",	"100",	"",	0 },
-	/* Kevin Fullerton <kevin.fullerton@shotgun-suicide.co.uk> */
-	{ "TOSHIBA",	"EQUIUM A100",	"",	"",	S3_BIOS|S3_MODE },
-	/* */
-	{ "TOSHIBA",	"Libretto L5/TNK",	"",	"",	0 },
-	/* */
-	{ "TOSHIBA",	"Libretto L5/TNKW",	"",	"",	0 },
-	/* imported from acpi-support 0.59 "half known". */
-	{ "TOSHIBA",	"libretto U100*",	"",	"",	VBE_POST|VBE_SAVE|UNSURE },
-	/* Pavel Borzenkov <pavel.borzenkov@gmail.com>, Toshiba Portege 3490CT, works correctly for me */
-	{ "TOSHIBA",	"P3490",	"",	"",	VBE_SAVE },
-	/* imported from acpi-support 0.59 "half known". */
-	{ "TOSHIBA",	"P4000*",	"",	"",	VBE_POST|VBE_SAVE|UNSURE },
-	/* Hans-Hermann Jopski <hans@jopski.de> Tecra A2 PTA20E-4M301VGR */
-	{ "TOSHIBA",	"Portable PC",	"Version 1.0",	"Version 1.20",	0 },
-	/* a PORTEGE 100 :-( mykhal@centrum.cz */
-	{ "TOSHIBA",	"Portable PC",	"Version 1.0",	"Version 1.60",	S3_MODE },
-	/* this is a Toshiba Satellite 4080XCDT, believe it or not :-( */
-	{ "TOSHIBA",	"Portable PC",	"Version 1.0",	"Version 7.80",	S3_MODE },
-	/* Toshiba Portege 3500, James Le Cuirot <chewi@aura-online.co.uk> */
-	{ "TOSHIBA",	"PORTEGE 3500",	"PP350E-002F6-EN",	"Version 1.40",	0 },
-	/* imported from acpi-support 0.59 "half known". */
-	{ "TOSHIBA",	"PORTEGE A100*",	"",	"",	VBE_POST|VBE_SAVE|UNSURE },
-	/* imported from acpi-support 0.59 "half known". */
-	{ "TOSHIBA",	"PORTEGE A200*",	"",	"",	VBE_POST|VBE_SAVE|UNSURE },
-	/* Toshiba Portege A600-13Y, Gregor Zattler <grfz@gmx.de> */
-	{ "TOSHIBA",	"PORTEGE A600",	"PPA61E-01700EGR",	"Version 1.50",	0 },
-	/* imported from acpi-support 0.59 "half known". */
-	{ "TOSHIBA",	"PORTEGE M200*",	"",	"",	VBE_POST|VBE_SAVE|UNSURE },
-	/* Alan Mycroft <Alan.Mycroft@cl.cam.ac.uk> */
-	{ "TOSHIBA",	"PORTEGE M300",	"",	"",	S3_MODE },
-	/* Oct 26, 2010 - Alexander Gehrke <me@crater....de> */
-	{ "TOSHIBA",	"Portege M400",	"000000",	"Version 3.80",	0 },
-	/* Mathieu Lacage <mathieu.lacage@sophia.inria.fr> */
-	{ "TOSHIBA",	"PORTEGE R100",	"",	"",	0 },
-	/* hole@gmx.li */
-	{ "TOSHIBA",	"PORTEGE R200",	"",	"",	S3_BIOS|S3_MODE },
-	/* Bernhard Kausler <uabdc@stud.uni-karlsruhe.de> */
-	{ "TOSHIBA",	"PORTEGE R500",	"",	"",	S3_BIOS|S3_MODE },
-	/* Nov 15, 2010 - Didier Marion <didier.marion@....fr> */
-	{ "TOSHIBA",	"Qosmio G40",	"PQG40E-01G019FR",	"Version 2.20",	0 },
-	/* Kai-Ove Pietsch <kai-ove.pietsch@web.de> */
-	{ "TOSHIBA",	"Satellite 1130",	"",	"",	VBE_SAVE },
-	/* imported from acpi-support 0.59 "half known". */
-	{ "TOSHIBA",	"Satellite 1900*",	"",	"",	VBE_POST|VBE_SAVE|UNSURE },
-	/* From: a.maurizi@isac.cnr.it */
-	{ "TOSHIBA",	"Satellite A100",	"",	"",	S3_BIOS|S3_MODE },
-	/* Eric Siegel <nticompass@gmail.com>, intel chipset, sys_version="PSAA8U-0MD02K" */
-	{ "TOSHIBA",	"Satellite A105",	"",	"",	S3_BIOS|S3_MODE },
-	/* Fabio Olivares <fabio.olivares@alice.it> sys_version  = "PSA10E-018EZ-6A" */
-	{ "TOSHIBA",	"Satellite A10",	"",	"",	S3_BIOS|S3_MODE },
-	/*  Jan Urbanski <j.urbanski@students.mimuw.edu.pl>, sys_version="PSAE0E-04600TPL" */
-	{ "TOSHIBA",	"Satellite A200",	"",	"",	S3_BIOS|S3_MODE },
-	/* Brian Conn <Brian_Conn@Brown.edu> sys_version="PSAE3U-087023" Andrew Barilla <andrew@exit66.com> "PSAE3U-07R025" */
-	{ "TOSHIBA",	"Satellite A205",	"",	"",	S3_BIOS|S3_MODE },
-	/* Gavin Kinsey <gavin.kinsey@gmail.com> */
-	{ "TOSHIBA",	"Satellite A210",	"",	"",	S3_BIOS|S3_MODE },
-	/* David Picella <dpicella@gmail.com> sys_version  = "PSAFGU-048002" */
-	{ "TOSHIBA",	"Satellite A215",	"",	"",	S3_BIOS|S3_MODE|PCI_SAVE },
-	/* Grzegorz Konopko <kolodko1@gmail.com> sys_version = "PSAK0E-00600GPL" */
-	{ "TOSHIBA",	"Satellite A300D",	"",	"",	VBE_POST|VBE_SAVE },
-	/* Jan 10, 2010 - Chris Olin <chris.olin2@gmail.com> */
-	{ "TOSHIBA",	"Satellite A305D",	"PSAH0U-00Q009",	"1.90   ",	S3_MODE },
-	/* */
-	{ "TOSHIBA",	"Satellite A30",	"",	"",	VBE_SAVE },
-	/* TOSHIBA Satellite A45, Shawn A. Wilson <shawn@lannocc.com> */
-	{ "TOSHIBA",	"Satellite A45",	"PSA40U-000HNV",	"Version 1.30",	0 },
-	/* Diego Ocampo <diegoocampo8@gmail.com> */
-	{ "TOSHIBA",	"Satellite A80",	"",	"",	0 },
-	/* Christian Schneeman <cschneemann@suse.de> */
-	{ "TOSHIBA",	"Satellite L10",	"",	"",	VBE_POST|VBE_MODE },
-	/* Jesse Taylor <jtayloriit@gmail.com> */
-	{ "TOSHIBA",	"Satellite L300",	"PSLB8U-0NQ069",	"1.80",	0 },
-	/* Toshiba Satellite L305-S5955, Dan <daniel.kneezel@gmail.com> */
-	{ "TOSHIBA",	"Satellite L305",	"PSLB8U-13T038",	"1.80",	VBE_POST|VBE_MODE },
-	/* Gijs van Gemert <g.v.gemert@inter.nl.net> */
-	{ "TOSHIBA",	"Satellite L30",	"",	"",	S3_BIOS|S3_MODE },
-	/* Andrey Petrov <apetrov87@gmail.com> */
-	{ "TOSHIBA",	"Satellite L655D",	"PSK2LU-00G001",	"1.70",	0 },
-	/* Toshiba Satellite M100, Ji.� Appl <j.appl@seznam.cz> */
-	{ "TOSHIBA",	"SATELLITE M100",	"PSMA0E-030014CZ",	"V1.60",	0 },
-	/* Krzysztof Lubanski <luban@nerdshack.com>, sys_version = "PSMA0U-0F301U" */
-	{ "TOSHIBA",	"Satellite M105",	"",	"",	S3_BIOS|S3_MODE },
-	/* tnt.rocket@freenet.de, need to verify if S3_MODE is needed too */
-	{ "TOSHIBA",	"Satellite M30X",	"",	"",	S3_BIOS },
-	/* Michaell Gurski */
-	{ "TOSHIBA",	"Satellite M35X",	"",	"",	S3_BIOS|S3_MODE },
-	/* Feng.Charles@inventec.com */
-	{ "TOSHIBA",	"Satellite M40",	"PSM43U-*",	"Version 1.50",	0 },
-	/* Mike Gilliam <mike.tx@suddenlink.net> */
-	{ "TOSHIBA",	"Satellite M55",	"",	"",	VBE_POST|VBE_MODE },
-	/* Peter Ingold <webmaster@peter-ingold.de> */
-	{ "TOSHIBA",	"Satellite M60",	"PSM60E-0C801GGR",	"V1.40",	VBE_POST|VBE_MODE },
-	/* Oct 29, 2010 - Ulrich Englich <ulrichenglich16@gm....com> */
-	{ "TOSHIBA",	"Satellite M645",	"PSMPMU-00G001",	"1.10",	S3_MODE },
-	/* (BAD: clist@uah.es S3_BIOS|S3_MODE) */
-	{ "TOSHIBA",	"Satellite M70",	"",	"",	0 },
-	/* zu@ten.ch sys_version  = "PSPAGE-00H00RS4" */
-	{ "TOSHIBA",	"Satellite P100",	"",	"",	0 },
-	/* Antonis Tsolomitis <atsol@aegean.gr> */
-	{ "TOSHIBA",	"Satellite P10",	"",	"",	S3_BIOS|S3_MODE },
-	/* From: mire <mire@osadmin.com> */
-	{ "TOSHIBA",	"Satellite P200",	"",	"",	S3_BIOS|S3_MODE },
-	/* cl.kerr@gmail.com */
-	{ "TOSHIBA",	"Satellite P205D",	"",	"",	S3_BIOS|S3_MODE },
-	/* From: deap <dpernot@gmail.com> */
-	{ "TOSHIBA",	"Satellite P300",	"PSPCCE-02C006FR",	"V2.40   ",	VBE_POST|VBE_SAVE },
-	/* From: Jim <jim.t@vertigo.net.au> */
-	{ "TOSHIBA",	"SatellitePro4600",	"",	"",	0 },
-	/* Stephen Jarrett-Sprague <sjarrettsprague@googlemail.com> sys_version="PSAC1E-0J3021EN" */
-	{ "TOSHIBA",	"Satellite Pro A120",	"",	"",	S3_BIOS|S3_MODE },
-	/* Toshiba Satellite Pro M15, Mark Chace <markcha@chacefamily.org> */
-	{ "TOSHIBA",	"Satellite Pro M15",	"PS630U-G205HV",	"Version 1.50",	0 },
-	/* Francisco Palomo Lozano <francisco.palomo@uca.es> sys_version="PSM75E-00G00TSP" */
-	{ "TOSHIBA",	"Satellite Pro M70",	"",	"",	S3_BIOS|S3_MODE },
-	/* Neil Symington, https://bugzilla.novell.com/show_bug.cgi?id=386505, kernel 2.6.25-x86_64 */
-	{ "TOSHIBA",	"Satellite Pro U300",	"",	"",	0 },
-	/* Luis Nieto Piña <freieschaf@gmail.com> */
-	{ "TOSHIBA",	"Satellite R630",	"PT31LE_00V006CE",	"Version1.60  ",	0 },
-	/* Jean-Pierre Bergamin <james@ractive.ch>, kernel 2.6.25.3, sys_version "PLUA0E-01C007S4" */
-	{ "TOSHIBA",	"SATELLITE U200",	"",	"",	0 },
-	/* Robin James, <robin.james@gmail.com> sys_version="PSU30E-04L02QKS" */
-	{ "TOSHIBA",	"SATELLITE U300",	"",	"",	0 },
-	/* Romano Giannetti <romanol@upcomillas.es> sys_version "PSU34U-00L003" */
-	{ "TOSHIBA",	"Satellite U305",	"",	"",	VBE_POST|VBE_MODE },
-	/* Bram Senders <bram@luon.net> */
-	{ "TOSHIBA",	"SP4600",	"Version 1.0",	"",	0 },
-	/* Silverio Santos <SSantos@web.de>, Tecra 9000 */
-	{ "TOSHIBA",	"T9000",	"",	"",	VBE_MODE },
-	/* From: a v <adam_6515@hotmail.com> */
-	{ "TOSHIBA",	"TECRA8100",	"",	"",	S3_MODE },
-	/* Stefan Seyfried has one of those :-) S3_BIOS leads to "melting screen" */
-	{ "TOSHIBA",	"TECRA 8200",	"",	"",	S3_MODE },
-	/* imported from acpi-support 0.59 "half known". */
-	{ "TOSHIBA",	"TECRA A2*",	"",	"",	VBE_POST|VBE_SAVE|UNSURE },
-	/* imported from acpi-support 0.59 "half known". */
-	{ "TOSHIBA",	"TECRA A5*",	"",	"",	VBE_POST|VBE_SAVE|UNSURE },
-	/* Thomas Zander <zander@kde.org> sys_version "PTA83E-0E303LDU" */
-	{ "TOSHIBA",	"TECRA A8",	"",	"",	0 },
-	/* Arne Salveter <arne.salveter@googlemail.com> sys_version "PTS52E-00X00GGR" */
-	{ "TOSHIBA",	"TECRA A9",	"",	"",	0 },
-	/* imported from acpi-support 0.59 "half known". */
-	{ "TOSHIBA",	"TECRA M2*",	"",	"",	VBE_POST|VBE_SAVE|UNSURE },
-	/* Alexandru Romanescu https://bugzilla.novell.com/show_bug.cgi?id=398270 */
-	{ "TOSHIBA",	"TECRA M4",	"",	"",	VBE_POST|VBE_MODE },
-	/* Dr. Stephan Buehne <stephan.buehne@oracle.com> */
-	{ "TOSHIBA",	"TECRA M9",	"",	"",	S3_MODE },
-	/* Jad Naous <jnaous@stanford.edu> */
-	{ "TOSHIBA",	"TECRA S1",	"",	"",	0 },
-	/* Arjen Dragt <arjen_dragt@yahoo.ca> sys_version="PTS20C-SX501E" */
-	{ "TOSHIBA",	"TECRA S2",	"",	"",	VBE_POST|VBE_SAVE },
-	/* */
-	{ "TOSHIBA",	"TECRA S3",	"",	"",	0 },
-	/* Joachim Gleissner */
-	{ "transtec AG",	"MS-1034",	"",	"",	S3_BIOS|S3_MODE },
-	/* Gregory Colpart <reg@evolix.fr> 'Transtec Levio 210' */
-	{ "transtec AG",	"MS-1057",	"",	"",	S3_BIOS|S3_MODE },
-	/* Clevo D410J, Márton Németh <nm127@freemail.hu> */
-	{ "VIA",	"K8N800",	"VT8204B ",	"",	VBE_POST|VBE_SAVE },
-	/* Clevo D470K, Jasper Mackenzie <scarletpimpernal@hotmail.com> */
-	{ "VIA",	"K8T400",	"VT8204B ",	"",	S3_BIOS|S3_MODE },
-	/* Dolezal Lukas <dolezallukas@sssvt.cz> */
-	{ "VIA Technologies, Inc.",	"KT400-8235",	"",	"",	S3_BIOS|S3_MODE },
-	/* <dev_temp@ukr.net> */
-	{ "VIA Technologies, Inc.",	"KT400A-8235",	"",	"",	S3_BIOS|S3_MODE },
-	/* VIA EPIA M Mini-ITX Motherboard with onboard gfx, reported by Monica Schilling */
-	{ "VIA Technologies, Inc.",	"VT8623-8235",	"",	"",	S3_MODE },
-	/* Feb 15, 2010 - Jonas Schwabe <jonas.schwabe@go...> */
-	{ "wortmann",	"M7x0S                           ",	"Rev. A1                         ",	"6.00",	VBE_SAVE },
-	/* May 18, 2010 - Damien Thébault <damien.thebault@g...com */
-	{ "Zepto",	"Nox",	"A14H",	"A14H",	0 },
-	/* Rene Seindal <rene@seindal.dk> */
-	{ "ZEPTO",	"ZNOTE *",	"3215W *",	"",	0 },
-	{ NULL, NULL, NULL, NULL, 0 }
-};
diff -Nru uswsusp-1.0/wlcsv2c.pl uswsusp-1.0+20110509/wlcsv2c.pl
--- uswsusp-1.0/wlcsv2c.pl	1970-01-01 01:00:00.000000000 +0100
+++ uswsusp-1.0+20110509/wlcsv2c.pl	2011-05-04 11:46:39.000000000 +0200
@@ -0,0 +1,79 @@
+#!/usr/bin/perl
+# Rodolfo Garcia kix_at_kix.es
+# suspend database management v1.0
+
+use Switch;
+
+switch ($#ARGV) {
+  case 0 {
+    my $fin = $ARGV[0];
+    open(INF, "<$fin") or die "Could not open input file\n";
+    open(OUF, ">&STDOUT") or die "Could not open output file\n";
+  }
+  case 1 {
+    my $fin = $ARGV[0];
+    my $fout = $ARGV[1];
+    open(INF, "<$fin") or die "Could not open input file\n";
+    open(OUF, ">$fout") or die "Could not open output file\n";
+  }
+  else {
+    my $msg = $0 . " <input-file> [output-file]";
+    die $msg;
+  }
+}
+
+&print_c_header;
+
+my $sys_vendor = "";
+my $sys_product = "";
+my $sys_version = "";
+my $bios_version = "";
+my $flags = "";
+my $comments = "";
+
+while(<INF>) {
+  if (/"([^"]*)",\s*"([^"]*)",\s*"([^"]*)",\s*"([^"]*)",\s*([^,]*),\s*(.*)/) {
+    $sys_vendor = $1;
+    $sys_product = $2;
+    $sys_version = $3;
+    $bios_version = $4;
+    $flags = $5;
+    $comments = $6;
+
+    printf OUF "\t$comments\n";
+    printf OUF "\t{ \"" . $sys_vendor . "\",\t\"" . $sys_product . "\",\t\"" . $sys_version . "\",\t\"" . $bios_version . "\",\t" . $flags . " },\n";
+  }
+}
+
+&print_c_footer;
+
+close(INF);
+close(OUF);
+
+sub print_c_header
+{
+  ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst)=localtime(time);
+
+  printf OUF "/* whitelist.c\n";
+  printf OUF " * whitelist of machines that are known to work somehow\n";
+  printf OUF " * and all the workarounds\n";
+  printf OUF " * Script generated file, please do not edit by hand\n";
+  printf OUF " */\n";
+  printf OUF "\n";
+  printf OUF "\#include \"config.h\"\n";
+  printf OUF "\#include \<stdlib.h\>\n";
+  printf OUF "\#include \"whitelist.h\"\n";
+  printf OUF "\n";
+
+  printf OUF "char *whitelist_version = \"\$Id: whitelist.c ver. ";
+  printf OUF "%4d%02d%02d %02d:%02d:%02d",$year+1900,$mon+1,$mday,$hour,$min,$sec;
+  printf OUF " automatic generation - kix - Exp \$\";\n";
+  printf OUF "\n";
+  printf OUF "struct machine_entry whitelist[] = {\n";
+}
+
+sub print_c_footer
+{
+  print OUF "\t{ NULL, NULL, NULL, NULL, 0 }\n";
+  print OUF "};\n";
+}