--- brltty-3.3.1.orig/aux/config.guess
+++ brltty-3.3.1/aux/config.guess
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-#   Free Software Foundation, Inc.
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 
-timestamp='2001-08-21'
+timestamp='2003-01-10'
 
 # 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
@@ -24,8 +24,9 @@
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 
-# Written by Per Bothner <bothner@cygnus.com>.
-# Please send patches to <config-patches@gnu.org>.
+# Originally written by Per Bothner <per@bothner.com>.
+# Please send patches to <config-patches@gnu.org>.  Submit a context
+# diff and a properly formatted ChangeLog entry.
 #
 # This script attempts to guess a canonical system name similar to
 # config.sub.  If it succeeds, it prints the system name on stdout, and
@@ -87,30 +88,41 @@
   exit 1
 fi
 
+trap 'exit 1' 1 2 15
 
-dummy=dummy-$$
-trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; 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.
 
-# CC_FOR_BUILD -- compiler used by this script.
 # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
 # use `HOST_CC' if defined, but it is deprecated.
 
-set_cc_for_build='case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,)    echo "int dummy(){}" > $dummy.c ;
-	for c in cc gcc c89 ; do
-	  ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 ;
-	  if test $? = 0 ; then
+# Portable tmp directory creation inspired by the Autoconf team.
+
+set_cc_for_build='
+trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
+trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
+: ${TMPDIR=/tmp} ;
+ { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
+ { 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 ;
-	rm -f $dummy.c $dummy.o $dummy.rel ;
 	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'
+esac ;'
 
 # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
 # (ghazi@noc.rutgers.edu 1994-08-24)
@@ -127,29 +139,30 @@
 
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     *:NetBSD:*:*)
-	# Netbsd (nbsd) targets should (where applicable) match one or
+	# 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.
-	# Determine the machine/vendor (is the vendor relevant).
-	case "${UNAME_MACHINE}" in
-	    amiga) machine=m68k-unknown ;;
-	    arm32) machine=arm-unknown ;;
-	    atari*) machine=m68k-atari ;;
-	    sun3*) machine=m68k-sun ;;
-	    mac68k) machine=m68k-apple ;;
-	    macppc) machine=powerpc-apple ;;
-	    hp3[0-9][05]) machine=m68k-hp ;;
-	    ibmrt|romp-ibm) machine=romp-ibm ;;
-	    *) machine=${UNAME_MACHINE}-unknown ;;
+	#
+	# 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 ;;
+	    *) 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}" in
-	    i386|sparc|amiga|arm*|hp300|mvme68k|vax|atari|luna68k|mac68k|news68k|next68k|pc532|sun3*|x68k)
+	case "${UNAME_MACHINE_ARCH}" in
+	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
 		eval $set_cc_for_build
 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
 			| grep __ELF__ >/dev/null
@@ -166,12 +179,65 @@
 		;;
 	esac
 	# The OS release
-	release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+	# 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 0 ;;
+    amiga:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    arc:OpenBSD:*:*)
+	echo mipsel-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    hp300:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mac68k:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    macppc:OpenBSD:*:*)
+	echo powerpc-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mvme68k:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mvme88k:OpenBSD:*:*)
+	echo m88k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mvmeppc:OpenBSD:*:*)
+	echo powerpc-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    pmax:OpenBSD:*:*)
+	echo mipsel-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    sgi:OpenBSD:*:*)
+	echo mipseb-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    sun3:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    wgrisc:OpenBSD:*:*)
+	echo mipsel-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    *:OpenBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    *:MicroBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-microbsd${UNAME_RELEASE}
+	exit 0 ;;
     alpha:OSF1:*:*)
 	if test $UNAME_RELEASE = "V4.0"; then
 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
@@ -180,6 +246,7 @@
 	# 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.
+	eval $set_cc_for_build
 	cat <<EOF >$dummy.s
 	.data
 \$Lformat:
@@ -205,10 +272,9 @@
 	jsr \$26,exit
 	.end main
 EOF
-	eval $set_cc_for_build
-	$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
+	$CC_FOR_BUILD -o $dummy $dummy.s 2>/dev/null
 	if test "$?" = 0 ; then
-		case `./$dummy` in
+		case `$dummy` in
 			0-0)
 				UNAME_MACHINE="alpha"
 				;;
@@ -230,9 +296,11 @@
 			2-1307)
 				UNAME_MACHINE="alphaev68"
 				;;
+			3-1307)
+				UNAME_MACHINE="alphaev7"
+				;;
 		esac
 	fi
-	rm -f $dummy.s $dummy
 	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
 	exit 0 ;;
     Alpha\ *:Windows_NT*:*)
@@ -247,29 +315,11 @@
     Amiga*:UNIX_System_V:4.0:*)
 	echo m68k-unknown-sysv4
 	exit 0;;
-    amiga:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
     *:[Aa]miga[Oo][Ss]:*:*)
 	echo ${UNAME_MACHINE}-unknown-amigaos
 	exit 0 ;;
-    arc64:OpenBSD:*:*)
-	echo mips64el-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    arc:OpenBSD:*:*)
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    hkmips:OpenBSD:*:*)
-	echo mips-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    pmax:OpenBSD:*:*)
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    sgi:OpenBSD:*:*)
-	echo mips-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    wgrisc:OpenBSD:*:*)
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
+    *:[Mm]orph[Oo][Ss]:*:*)
+	echo ${UNAME_MACHINE}-unknown-morphos
 	exit 0 ;;
     *:OS/390:*:*)
 	echo i370-ibm-openedition
@@ -291,6 +341,10 @@
     NILE*:*:*:dcosx)
 	echo pyramid-pyramid-svr4
 	exit 0 ;;
+    DRS?6000:UNIX_SV:4.2*:7*)
+	case `/usr/bin/uname -p` in
+	    sparc) echo sparc-icl-nx7 && exit 0 ;;
+	esac ;;
     sun4H:SunOS:5.*:*)
 	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit 0 ;;
@@ -319,7 +373,7 @@
 	echo m68k-sun-sunos${UNAME_RELEASE}
 	exit 0 ;;
     sun*:*:4.2BSD:*)
-	UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
+	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)
@@ -333,12 +387,6 @@
     aushp:SunOS:*:*)
 	echo sparc-auspex-sunos${UNAME_RELEASE}
 	exit 0 ;;
-    sparc*:NetBSD:*)
-	echo `uname -p`-unknown-netbsd${UNAME_RELEASE}
-	exit 0 ;;
-    atari*:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
     # 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
@@ -365,18 +413,6 @@
     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
         echo m68k-unknown-mint${UNAME_RELEASE}
         exit 0 ;;
-    sun3*:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mac68k:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvme68k:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvme88k:OpenBSD:*:*)
-	echo m88k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
     powerpc:machten:*:*)
 	echo powerpc-apple-machten${UNAME_RELEASE}
 	exit 0 ;;
@@ -393,6 +429,7 @@
 	echo clipper-intergraph-clix${UNAME_RELEASE}
 	exit 0 ;;
     mips:*:*:UMIPS | mips:*:*:RISCos)
+	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
 #ifdef __cplusplus
 #include <stdio.h>  /* for printf() prototype */
@@ -414,16 +451,20 @@
 	  exit (-1);
 	}
 EOF
-	eval $set_cc_for_build
-	$CC_FOR_BUILD $dummy.c -o $dummy \
-	  && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
-	  && rm -f $dummy.c $dummy && exit 0
-	rm -f $dummy.c $dummy
+	$CC_FOR_BUILD -o $dummy $dummy.c \
+	  && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
+	  && exit 0
 	echo mips-mips-riscos${UNAME_RELEASE}
 	exit 0 ;;
     Motorola:PowerMAX_OS:*:*)
 	echo powerpc-motorola-powermax
 	exit 0 ;;
+    Motorola:*:4.3:PL8-*)
+	echo powerpc-harris-powermax
+	exit 0 ;;
+    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
+	echo powerpc-harris-powermax
+	exit 0 ;;
     Night_Hawk:Power_UNIX:*:*)
 	echo powerpc-harris-powerunix
 	exit 0 ;;
@@ -484,6 +525,7 @@
 	exit 0 ;;
     *: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>
 
@@ -495,9 +537,7 @@
 			exit(0);
 			}
 EOF
-		eval $set_cc_for_build
-		$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
-		rm -f $dummy.c $dummy
+		$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
 		echo rs6000-ibm-aix3.2.5
 	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
 		echo rs6000-ibm-aix3.2.4
@@ -506,7 +546,7 @@
 	fi
 	exit 0 ;;
     *:AIX:*:[45])
-	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'`
+	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
@@ -546,10 +586,8 @@
 	    9000/31? )            HP_ARCH=m68000 ;;
 	    9000/[34]?? )         HP_ARCH=m68k ;;
 	    9000/[678][0-9][0-9])
-              case "${HPUX_REV}" in
-                11.[0-9][0-9])
-                  if [ -x /usr/bin/getconf ]; then
-                    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
+		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
@@ -558,12 +596,13 @@
                         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 ;;
-              esac
-              if [ "${HP_ARCH}" = "" ]; then
-              sed 's/^              //' << EOF >$dummy.c
+		fi
+		if [ "${HP_ARCH}" = "" ]; then
+		    eval $set_cc_for_build
+		    sed 's/^              //' << EOF >$dummy.c
 
               #define _HPUX_SOURCE
               #include <stdlib.h>
@@ -596,12 +635,21 @@
                   exit (0);
               }
 EOF
-	eval $set_cc_for_build
-	(CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
-	if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
-	rm -f $dummy.c $dummy
-	fi ;;
+		    (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
+	    # avoid double evaluation of $set_cc_for_build
+	    test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
+	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
+	    then
+		HP_ARCH="hppa2.0w"
+	    else
+		HP_ARCH="hppa64"
+	    fi
+	fi
 	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
 	exit 0 ;;
     ia64:HP-UX:*:*)
@@ -609,6 +657,7 @@
 	echo ia64-hp-hpux${HPUX_REV}
 	exit 0 ;;
     3050*:HI-UX:*:*)
+	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
 	#include <unistd.h>
 	int
@@ -634,9 +683,7 @@
 	  exit (0);
 	}
 EOF
-	eval $set_cc_for_build
-	$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
-	rm -f $dummy.c $dummy
+	$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
 	echo unknown-hitachi-hiuxwe2
 	exit 0 ;;
     9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
@@ -664,9 +711,6 @@
     parisc*:Lites*:*:*)
 	echo hppa1.1-hp-lites
 	exit 0 ;;
-    hppa*:OpenBSD:*:*)
-	echo hppa-unknown-openbsd
-	exit 0 ;;
     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
 	echo c1-convex-bsd
         exit 0 ;;
@@ -685,9 +729,6 @@
     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
 	echo c4-convex-bsd
         exit 0 ;;
-    CRAY*X-MP:*:*:*)
-	echo xmp-cray-unicos
-        exit 0 ;;
     CRAY*Y-MP:*:*:*)
 	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit 0 ;;
@@ -700,27 +741,21 @@
     CRAY*TS:*:*:*)
 	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit 0 ;;
-    CRAY*T3D:*:*:*)
-	echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
     CRAY*T3E:*:*:*)
 	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit 0 ;;
     CRAY*SV1:*:*:*)
 	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit 0 ;;
-    CRAY-2:*:*:*)
-	echo cray2-cray-unicos
-        exit 0 ;;
+    *:UNICOS/mp:*:*)
+	echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' 
+	exit 0 ;;
     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 0 ;;
-    hp300:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
 	exit 0 ;;
@@ -731,10 +766,18 @@
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
 	exit 0 ;;
     *:FreeBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-	exit 0 ;;
-    *:OpenBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+	# Determine whether the default compiler uses glibc.
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#include <features.h>
+	#if __GLIBC__ >= 2
+	LIBC=gnu
+	#else
+	LIBC=
+	#endif
+EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
+	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
 	exit 0 ;;
     i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
@@ -745,11 +788,17 @@
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit 0 ;;
+    x86:Interix*:3*)
+	echo i586-pc-interix3
+	exit 0 ;;
+    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
+	echo i${UNAME_MACHINE}-pc-mks
+	exit 0 ;;
     i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
 	# UNAME_MACHINE based on the output of uname instead of i386?
-	echo i386-pc-interix
+	echo i586-pc-interix
 	exit 0 ;;
     i*:UWIN*:*)
 	echo ${UNAME_MACHINE}-pc-uwin
@@ -770,16 +819,48 @@
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit 0 ;;
     ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit 0 ;;
     m68*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit 0 ;;
     mips:Linux:*:*)
-	case `sed -n '/^byte/s/^.*: \(.*\) endian/\1/p' < /proc/cpuinfo` in
-	  big)    echo mips-unknown-linux-gnu && exit 0 ;;
-	  little) echo mipsel-unknown-linux-gnu && exit 0 ;;
-	esac
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#undef CPU
+	#undef mips
+	#undef mipsel
+	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+	CPU=mipsel
+	#else
+	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+	CPU=mips
+	#else
+	CPU=
+	#endif
+	#endif
+EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
+	;;
+    mips64:Linux:*:*)
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#undef CPU
+	#undef mips64
+	#undef mips64el
+	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+	CPU=mips64el
+	#else
+	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+	CPU=mips64
+	#else
+	CPU=
+	#endif
+	#endif
+EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
 	;;
     ppc:Linux:*:*)
 	echo powerpc-unknown-linux-gnu
@@ -828,7 +909,8 @@
 	# The BFD linker knows what the default object file format is, so
 	# first see if it will tell us. cd to the root directory to prevent
 	# problems with other programs or directories called `ld' in the path.
-	ld_supported_targets=`cd /; ld --help 2>&1 \
+	# Set LC_ALL=C to ensure ld outputs messages in English.
+	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
 			 | sed -ne '/supported targets:/!d
 				    s/[ 	][ 	]*/ /g
 				    s/.*supported targets: *//
@@ -840,7 +922,7 @@
 		;;
 	  a.out-i386-linux)
 		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-		exit 0 ;;		
+		exit 0 ;;
 	  coff-i386)
 		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
 		exit 0 ;;
@@ -851,33 +933,29 @@
 		exit 0 ;;
 	esac
 	# Determine whether the default compiler is a.out or elf
-	cat >$dummy.c <<EOF
-#include <features.h>
-#ifdef __cplusplus
-#include <stdio.h>  /* for printf() prototype */
-	int main (int argc, char *argv[]) {
-#else
-	int main (argc, argv) int argc; char *argv[]; {
-#endif
-#ifdef __ELF__
-# ifdef __GLIBC__
-#  if __GLIBC__ >= 2
-    printf ("%s-pc-linux-gnu\n", argv[1]);
-#  else
-    printf ("%s-pc-linux-gnulibc1\n", argv[1]);
-#  endif
-# else
-   printf ("%s-pc-linux-gnulibc1\n", argv[1]);
-# endif
-#else
-  printf ("%s-pc-linux-gnuaout\n", argv[1]);
-#endif
-  return 0;
-}
-EOF
 	eval $set_cc_for_build
-	$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0
-	rm -f $dummy.c $dummy
+	sed 's/^	//' << EOF >$dummy.c
+	#include <features.h>
+	#ifdef __ELF__
+	# ifdef __GLIBC__
+	#  if __GLIBC__ >= 2
+	LIBC=gnu
+	#  else
+	LIBC=gnulibc1
+	#  endif
+	# else
+	LIBC=gnulibc1
+	# endif
+	#else
+	#ifdef __INTEL_COMPILER
+	LIBC=gnu
+	#else
+	LIBC=gnuaout
+	#endif
+	#endif
+EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
+	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
 	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
 	;;
     i*86:DYNIX/ptx:4*:*)
@@ -894,6 +972,23 @@
         # Use sysv4.2uw... so that sysv4* matches it.
 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
 	exit 0 ;;
+    i*86:OS/2:*:*)
+	# If we were able to find `uname', then EMX Unix compatibility
+	# is probably installed.
+	echo ${UNAME_MACHINE}-pc-os2-emx
+	exit 0 ;;
+    i*86:XTS-300:*:STOP)
+	echo ${UNAME_MACHINE}-unknown-stop
+	exit 0 ;;
+    i*86:atheos:*:*)
+	echo ${UNAME_MACHINE}-unknown-atheos
+	exit 0 ;;
+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
+	echo i386-unknown-lynxos${UNAME_RELEASE}
+	exit 0 ;;
+    i*86:*DOS:*:*)
+	echo ${UNAME_MACHINE}-pc-msdosdjgpp
+	exit 0 ;;
     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
@@ -915,22 +1010,19 @@
 		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|egrep Release|sed -e 's/.*= //')`
-		(/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
-		(/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
+		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|egrep '^Machine.*Pent ?II' >/dev/null) \
+		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
 			&& UNAME_MACHINE=i686
-		(/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \
+		(/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 0 ;;
-    i*86:*DOS:*:*)
-	echo ${UNAME_MACHINE}-pc-msdosdjgpp
-	exit 0 ;;
     pc:*:*:*)
 	# Left here for compatibility:
         # uname -m prints for DJGPP always 'pc', but it prints nothing about
@@ -954,9 +1046,15 @@
 	# "miniframe"
 	echo m68010-convergent-sysv
 	exit 0 ;;
+    mc68k:UNIX:SYSTEM5:3.51m)
+	echo m68k-convergent-sysv
+	exit 0 ;;
+    M680?0:D-NIX:5.3:*)
+	echo m68k-diab-dnix
+	exit 0 ;;
     M68*:*:R3V[567]*:*)
 	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
-    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0)
+    3[34]??:*: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)
 	OS_REL=''
 	test -r /etc/.relid \
 	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
@@ -973,9 +1071,6 @@
     mc68030:UNIX_System_V:4.*:*)
 	echo m68k-atari-sysv4
 	exit 0 ;;
-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
-	echo i386-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
     TSUNAMI:LynxOS:2.*:*)
 	echo sparc-unknown-lynxos${UNAME_RELEASE}
 	exit 0 ;;
@@ -1047,6 +1142,9 @@
     SX-5:SUPER-UX:*:*)
 	echo sx5-nec-superux${UNAME_RELEASE}
 	exit 0 ;;
+    SX-6:SUPER-UX:*:*)
+	echo sx6-nec-superux${UNAME_RELEASE}
+	exit 0 ;;
     Power*:Rhapsody:*:*)
 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
 	exit 0 ;;
@@ -1054,18 +1152,24 @@
 	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
 	exit 0 ;;
     *:Darwin:*:*)
-	echo `uname -p`-apple-darwin${UNAME_RELEASE}
+	case `uname -p` in
+	    *86) UNAME_PROCESSOR=i686 ;;
+	    powerpc) UNAME_PROCESSOR=powerpc ;;
+	esac
+	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
 	exit 0 ;;
     *:procnto*:*:* | *:QNX:[0123456789]*:*)
-	if test "${UNAME_MACHINE}" = "x86pc"; then
+	UNAME_PROCESSOR=`uname -p`
+	if test "$UNAME_PROCESSOR" = "x86"; then
+		UNAME_PROCESSOR=i386
 		UNAME_MACHINE=pc
 	fi
-	echo `uname -p`-${UNAME_MACHINE}-nto-qnx
+	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
 	exit 0 ;;
     *:QNX:*:4*)
 	echo i386-pc-qnx
 	exit 0 ;;
-    NSR-[KW]:NONSTOP_KERNEL:*:*)
+    NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*)
 	echo nsr-tandem-nsk${UNAME_RELEASE}
 	exit 0 ;;
     *:NonStop-UX:*:*)
@@ -1088,11 +1192,6 @@
 	fi
 	echo ${UNAME_MACHINE}-unknown-plan9
 	exit 0 ;;
-    i*86:OS/2:*:*)
-	# If we were able to find `uname', then EMX Unix compatibility
-	# is probably installed.
-	echo ${UNAME_MACHINE}-pc-os2-emx
-	exit 0 ;;
     *:TOPS-10:*:*)
 	echo pdp10-unknown-tops10
 	exit 0 ;;
@@ -1111,14 +1210,12 @@
     *:ITS:*:*)
 	echo pdp10-unknown-its
 	exit 0 ;;
-    i*86:XTS-300:*:STOP)
-	echo ${UNAME_MACHINE}-unknown-stop
-	exit 0 ;;
 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>
@@ -1233,9 +1330,7 @@
 }
 EOF
 
-eval $set_cc_for_build
-$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c $dummy && exit 0
-rm -f $dummy.c $dummy
+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
 
 # Apollos put the system type in the environment.
 
--- brltty-3.3.1.orig/aux/config.sub
+++ brltty-3.3.1/aux/config.sub
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-#   Free Software Foundation, Inc.
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 
-timestamp='2001-08-13'
+timestamp='2003-01-03'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -29,7 +29,8 @@
 # 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>.
+# Please send patches to <config-patches@gnu.org>.  Submit a context
+# diff and a properly formatted ChangeLog entry.
 #
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
@@ -117,7 +118,7 @@
 # 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* | storm-chaos* | os2-emx* | windows32-*)
+  nto-qnx* | linux-gnu* | freebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
@@ -226,31 +227,44 @@
 	1750a | 580 \
 	| a29k \
 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
+	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
 	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
-	| c4x | clipper \
-	| d10v | d30v | dsp16xx \
-	| fr30 \
+	| clipper \
+	| d10v | d30v | dlx | dsp16xx \
+	| fr30 | frv \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| i370 | i860 | i960 | ia64 \
+	| ip2k \
 	| m32r | m68000 | m68k | m88k | mcore \
-	| mips16 | mips64 | mips64el | mips64orion | mips64orionel \
-	| mips64vr4100 | mips64vr4100el | mips64vr4300 \
-	| mips64vr4300el | mips64vr5000 | mips64vr5000el \
-	| mipsbe | mipsel | mipsle | mipstx39 | mipstx39el \
+	| mips | mipsbe | mipseb | mipsel | mipsle \
+	| mips16 \
+	| mips64 | mips64el \
+	| mips64vr | mips64vrel \
+	| mips64orion | mips64orionel \
+	| mips64vr4100 | mips64vr4100el \
+	| mips64vr4300 | mips64vr4300el \
+	| mips64vr5000 | mips64vr5000el \
+	| mipsisa32 | mipsisa32el \
+	| mipsisa32r2 | mipsisa32r2el \
+	| mipsisa64 | mipsisa64el \
+	| mipsisa64sb1 | mipsisa64sb1el \
+	| mipsisa64sr71k | mipsisa64sr71kel \
+	| mipstx39 | mipstx39el \
 	| mn10200 | mn10300 \
+	| msp430 \
 	| ns16k | ns32k \
-	| openrisc \
+	| openrisc | or32 \
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 	| pyramid \
-	| s390 | s390x \
-	| sh | sh[34] | sh[34]eb | shbe | shle \
-	| sparc | sparc64 | sparclet | sparclite | sparcv9 | sparcv9b \
+	| sh | sh[1234] | sh3e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
+	| sh64 | sh64le \
+	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
 	| strongarm \
 	| tahoe | thumb | tic80 | tron \
-	| v850 \
+	| v850 | v850e \
 	| we32k \
-	| x86 | xscale \
+	| x86 | xscale | xstormy16 | xtensa \
 	| z8k)
 		basic_machine=$basic_machine-unknown
 		;;
@@ -277,38 +291,53 @@
 	580-* \
 	| a29k-* \
 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
-	| alphapca5[67]-* | arc-* \
-	| arm-*  | armbe-* | armle-* | armv*-* \
+	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
+	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
+	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
+	| avr-* \
 	| bs2000-* \
-	| c[123]* | c30-* | [cjt]90-* | c54x-* \
-	| clipper-* | cray2-* | cydra-* \
-	| d10v-* | d30v-* \
+	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* \
+	| clipper-* | cydra-* \
+	| d10v-* | d30v-* | dlx-* \
 	| elxsi-* \
-	| f30[01]-* | f700-* | fr30-* | fx80-* \
+	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
 	| h8300-* | h8500-* \
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
+	| ip2k-* \
 	| m32r-* \
-	| m68000-* | m680[01234]0-* | m68360-* | m683?2-* | m68k-* \
+	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
 	| m88110-* | m88k-* | mcore-* \
-	| mips-* | mips16-* | mips64-* | mips64el-* | mips64orion-* \
-	| mips64orionel-* | mips64vr4100-* | mips64vr4100el-* \
-	| mips64vr4300-* | mips64vr4300el-* | mipsbe-* | mipsel-* \
-	| mipsle-* | mipstx39-* | mipstx39el-* \
-	| none-* | np1-* | ns16k-* | ns32k-* \
+	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
+	| mips16-* \
+	| mips64-* | mips64el-* \
+	| mips64vr-* | mips64vrel-* \
+	| mips64orion-* | mips64orionel-* \
+	| mips64vr4100-* | mips64vr4100el-* \
+	| mips64vr4300-* | mips64vr4300el-* \
+	| mips64vr5000-* | mips64vr5000el-* \
+	| mipsisa32-* | mipsisa32el-* \
+	| mipsisa32r2-* | mipsisa32r2el-* \
+	| mipsisa64-* | mipsisa64el-* \
+	| mipsisa64sb1-* | mipsisa64sb1el-* \
+	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
+	| mipstx39-* | mipstx39el-* \
+	| msp430-* \
+	| none-* | np1-* | nv1-* | ns16k-* | ns32k-* \
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
 	| pyramid-* \
 	| romp-* | rs6000-* \
-	| s390-* | s390x-* \
-	| sh-* | sh[34]-* | sh[34]eb-* | shbe-* | shle-* \
-	| sparc-* | sparc64-* | sparc86x-* | sparclite-* \
-	| sparcv9-* | sparcv9b-* | strongarm-* | sv1-* \
-	| t3e-* | tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \
-	| v850-* | vax-* \
+	| sh-* | sh[1234]-* | sh3e-* | sh[34]eb-* | shbe-* \
+	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
+	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
+	| sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
+	| tahoe-* | thumb-* | tic30-* | tic4x-* | tic54x-* | tic80-* | tron-* \
+	| v850-* | v850e-* | vax-* \
 	| we32k-* \
-	| x86-* | x86_64-* | xmp-* | xps100-* | xscale-* \
+	| x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
+	| xtensa-* \
 	| ymp-* \
 	| z8k-*)
 		;;
@@ -373,6 +402,10 @@
 		basic_machine=ns32k-sequent
 		os=-dynix
 		;;
+	c90)
+		basic_machine=c90-cray
+		os=-unicos
+		;;
 	convex-c1)
 		basic_machine=c1-convex
 		os=-bsd
@@ -393,16 +426,8 @@
 		basic_machine=c38-convex
 		os=-bsd
 		;;
-	cray | ymp)
-		basic_machine=ymp-cray
-		os=-unicos
-		;;
-	cray2)
-		basic_machine=cray2-cray
-		os=-unicos
-		;;
-	[cjt]90)
-		basic_machine=${basic_machine}-cray
+	cray | j90)
+		basic_machine=j90-cray
 		os=-unicos
 		;;
 	crds | unos)
@@ -417,6 +442,14 @@
 	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
@@ -597,14 +630,6 @@
 		basic_machine=m68k-atari
 		os=-mint
 		;;
-	mipsel*-linux*)
-		basic_machine=mipsel-unknown
-		os=-linux-gnu
-		;;
-	mips*-linux*)
-		basic_machine=mips-unknown
-		os=-linux-gnu
-		;;
 	mips3*-*)
 		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
 		;;
@@ -619,6 +644,10 @@
 		basic_machine=m68k-rom68k
 		os=-coff
 		;;
+	morphos)
+		basic_machine=powerpc-unknown
+		os=-morphos
+		;;
 	msdos)
 		basic_machine=i386-pc
 		os=-msdos
@@ -691,6 +720,10 @@
 	np1)
 		basic_machine=np1-gould
 		;;
+	nv1)
+		basic_machine=nv1-cray
+		os=-unicosmp
+		;;
 	nsr-tandem)
 		basic_machine=nsr-tandem
 		;;
@@ -698,6 +731,10 @@
 		basic_machine=hppa1.1-oki
 		os=-proelf
 		;;
+	or32 | or32-*)
+		basic_machine=or32-unknown
+		os=-coff
+		;;
 	OSE68000 | ose68000)
 		basic_machine=m68000-ericsson
 		os=-ose
@@ -720,19 +757,19 @@
 	pbb)
 		basic_machine=m68k-tti
 		;;
-        pc532 | pc532-*)
+	pc532 | pc532-*)
 		basic_machine=ns32k-pc532
 		;;
-	pentium | p5 | k5 | k6 | nexgen)
+	pentium | p5 | k5 | k6 | nexgen | viac3)
 		basic_machine=i586-pc
 		;;
-	pentiumpro | p6 | 6x86 | athlon)
+	pentiumpro | p6 | 6x86 | athlon | athlon_*)
 		basic_machine=i686-pc
 		;;
 	pentiumii | pentium2)
 		basic_machine=i686-pc
 		;;
-	pentium-* | p5-* | k5-* | k6-* | nexgen-*)
+	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
 		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	pentiumpro-* | p6-* | 6x86-* | athlon-*)
@@ -747,22 +784,22 @@
 	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/^[^-]*-//'`
 		;;
@@ -783,10 +820,22 @@
 	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
+		;;
 	sequent)
 		basic_machine=i386-sequent
 		;;
@@ -794,7 +843,7 @@
 		basic_machine=sh-hitachi
 		os=-hms
 		;;
-	sparclite-wrs)
+	sparclite-wrs | simso-wrs)
 		basic_machine=sparclite-wrs
 		os=-vxworks
 		;;
@@ -861,9 +910,17 @@
 		os=-dynix
 		;;
 	t3e)
-		basic_machine=t3e-cray
+		basic_machine=alphaev5-cray
 		os=-unicos
 		;;
+	t90)
+		basic_machine=t90-cray
+		os=-unicos
+		;;
+        tic4x | c4x*)
+		basic_machine=tic4x-unknown
+		os=-coff
+		;;
 	tic54x | c54x*)
 		basic_machine=tic54x-unknown
 		os=-coff
@@ -874,6 +931,10 @@
 	tx39el)
 		basic_machine=mipstx39el-unknown
 		;;
+	toad1)
+		basic_machine=pdp10-xkl
+		os=-tops20
+		;;
 	tower | tower-32)
 		basic_machine=m68k-ncr
 		;;
@@ -898,8 +959,8 @@
 		os=-vms
 		;;
 	vpp*|vx|vx-*)
-               basic_machine=f301-fujitsu
-               ;;
+		basic_machine=f301-fujitsu
+		;;
 	vxworks960)
 		basic_machine=i960-wrs
 		os=-vxworks
@@ -920,17 +981,13 @@
 		basic_machine=hppa1.1-winbond
 		os=-proelf
 		;;
-	windows32)
-		basic_machine=i386-pc
-		os=-windows32-msvcrt
+	xps | xps100)
+		basic_machine=xps100-honeywell
 		;;
-	xmp)
-		basic_machine=xmp-cray
+	ymp)
+		basic_machine=ymp-cray
 		os=-unicos
 		;;
-        xps | xps100)
-		basic_machine=xps100-honeywell
-		;;
 	z8k-*-coff)
 		basic_machine=z8k-unknown
 		os=-sim
@@ -951,13 +1008,6 @@
 	op60c)
 		basic_machine=hppa1.1-oki
 		;;
-	mips)
-		if [ x$os = x-linux-gnu ]; then
-			basic_machine=mips-unknown
-		else
-			basic_machine=mips-mips
-		fi
-		;;
 	romp)
 		basic_machine=romp-ibm
 		;;
@@ -977,13 +1027,16 @@
 	we32k)
 		basic_machine=we32k-att
 		;;
-	sh3 | sh4 | sh3eb | sh4eb)
+	sh3 | sh4 | sh3eb | sh4eb | sh[1234]le | sh3ele)
 		basic_machine=sh-unknown
 		;;
+	sh64)
+		basic_machine=sh64-unknown
+		;;
 	sparc | sparcv9 | sparcv9b)
 		basic_machine=sparc-sun
 		;;
-        cydra)
+	cydra)
 		basic_machine=cydra-cydrome
 		;;
 	orion)
@@ -998,10 +1051,6 @@
 	pmac | pmac-mpw)
 		basic_machine=powerpc-apple
 		;;
-	c4x*)
-		basic_machine=c4x-none
-		os=-coff
-		;;
 	*-unknown)
 		# Make sure to match an already-canonicalized machine name.
 		;;
@@ -1064,10 +1113,12 @@
 	      | -chorusos* | -chorusrdb* \
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
 	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
-	      | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
+	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
-	      | -os2* | -vos*)
+	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
+	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
+	      | -powermax* | -dnix* | -microbsd*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1079,8 +1130,10 @@
 			;;
 		esac
 		;;
+	-nto-qnx*)
+		;;
 	-nto*)
-		os=-nto-qnx
+		os=`echo $os | sed -e 's|nto|nto-qnx|'`
 		;;
 	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
 	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
@@ -1119,14 +1172,20 @@
 	-acis*)
 		os=-aos
 		;;
+	-atheos*)
+		os=-atheos
+		;;
 	-386bsd)
 		os=-bsd
 		;;
 	-ctix* | -uts*)
 		os=-sysv
 		;;
+	-nova*)
+		os=-rtmk-nova
+		;;
 	-ns2 )
-	        os=-nextstep2
+		os=-nextstep2
 		;;
 	-nsk*)
 		os=-nsk
@@ -1165,8 +1224,8 @@
 	-xenix)
 		os=-xenix
 		;;
-        -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-	        os=-mint
+	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+		os=-mint
 		;;
 	-none)
 		;;
@@ -1199,10 +1258,11 @@
 	arm*-semi)
 		os=-aout
 		;;
+	# This must come before the *-dec entry.
 	pdp10-*)
 		os=-tops20
 		;;
-        pdp11-*)
+	pdp11-*)
 		os=-none
 		;;
 	*-dec | vax-*)
@@ -1229,6 +1289,9 @@
 	mips*-*)
 		os=-elf
 		;;
+	or32-*)
+		os=-coff
+		;;
 	*-tti)	# must be before sparc entry or we get the wrong os.
 		os=-sysv3
 		;;
@@ -1292,19 +1355,19 @@
 	*-next)
 		os=-nextstep3
 		;;
-        *-gould)
+	*-gould)
 		os=-sysv
 		;;
-        *-highlevel)
+	*-highlevel)
 		os=-bsd
 		;;
 	*-encore)
 		os=-bsd
 		;;
-        *-sgi)
+	*-sgi)
 		os=-irix
 		;;
-        *-siemens)
+	*-siemens)
 		os=-sysv4
 		;;
 	*-masscomp)
@@ -1376,7 +1439,7 @@
 			-ptx*)
 				vendor=sequent
 				;;
-			-vxsim* | -vxworks*)
+			-vxsim* | -vxworks* | -windiss*)
 				vendor=wrs
 				;;
 			-aux*)
--- brltty-3.3.1.orig/debian/brltty.postinst
+++ brltty-3.3.1/debian/brltty.postinst
@@ -0,0 +1,183 @@
+#! /bin/sh
+
+set -e
+
+. /usr/share/debconf/confmodule
+
+CONFFILE=/etc/brltty.conf
+examplefile=/usr/share/doc/brltty/examples/brltty.conf.gz
+
+# Taken from libpam-ldap-151/debian/postinst
+add_missing()
+{
+    parameter=$1
+    value=$2
+    echo "$parameter $value" >> $CONFFILE
+}
+
+change_value()
+{
+    parameter=$1
+    value=$2
+    commented=0; notthere=0
+    egrep -i -q "^$parameter " $CONFFILE || notthere=1
+    if [ "$notthere" = "1" ]; then
+	if ( egrep -i -q "^# *$parameter" $CONFFILE ); then
+	    notthere=0
+	    commented=1	
+	fi
+    fi
+
+    if [ "$notthere" = "1" ]; then
+	add_missing $parameter $value
+    else
+	replacestring="^$parameter .*"	
+	if [ "$commented" = "1" ]; then
+	    replacestring="^# *$parameter .*"	
+	fi
+       	# currently we replace only the first match, we need a better
+       	# way of dealing with multiple hits.
+	perl -i -p -e "s%$replacestring%$parameter $value%i 
+	               and \$match=1 if (\$match != 1)" $CONFFILE
+    fi
+}
+
+# lets create the configuration from example if it's not there.
+if [ ! -e $CONFFILE -a -e $examplefile ]; then
+    cat > $CONFFILE << EOM
+###DEBCONF###
+# the configuration of this file will be done by debconf as long as the
+# first line of the file says '###DEBCONF###'
+#
+# you should use 'dpkg-reconfigure brltty' to configure this file
+#
+EOM
+    zcat $examplefile >> $CONFFILE
+    chmod 0644 $CONFFILE
+    db_set brltty/override true
+fi
+
+db_get brltty/override
+if [ "$RET" = "true" ]; then
+    if ( head -1 $CONFFILE | grep -q -v '^###DEBCONF###$' ); then
+	mv $CONFFILE $CONFFILE.tmp
+	cat > $CONFFILE << EOM
+###DEBCONF###
+EOM
+        cat $CONFFILE.tmp >> $CONFFILE
+	rm -f $CONFFILE.tmp
+	chmod 0644 $CONFFILE
+    fi
+
+    db_get brltty/braille-driver
+    brl=xx
+    case "$RET" in
+	Alva*)
+	brl=al
+	;;
+	BrailleLite*)
+	brl=bl
+	;;
+	BrailleNote*)
+	brl=bn
+	;;
+	CombiBraille*)
+	brl=cb
+	;;
+	EcoBraille*)
+	brl=ec
+	;;
+	EuroBraille*)
+	brl=eu
+	;;
+	HandyTech*)
+	brl=ht
+	;;
+	LogText*)
+	brl=lt
+	;;
+	MultiBraille*)
+	brl=mb
+	;;
+	MDV*)
+	brl=md
+	;;
+	MiniBraille*)
+	brl=mn
+	;;
+	Papenmeier)
+	brl=pm
+	;;
+	TSI*)
+	brl=ts
+	;;
+	"Vario/RBT (emulation 1) [40/80]")
+	brl=va
+	;;
+	VideoBraille*)
+	brl=vd
+	;;
+	"Vario/RBT (emulation 2) [40/80]")
+	brl=vh
+	;;
+	Voyager*)
+	brl=vo
+	;;
+	VisioBraille*)
+	brl=vs
+	;;
+    esac
+    if [ $brl = "xx" ]; then
+	echo "Driver-type lookup error, please file a bug report"
+	exit 99
+    fi
+    change_value braille-driver "$brl"
+
+    db_get brltty/device
+    change_value braille-device "$RET"
+
+    db_get brltty/text-table
+    change_value text-table "$RET.tbl"
+
+    db_get brltty/speech-driver
+    speech=no
+    case "$RET" in
+	Alva*)
+	speech=al
+	;;
+	BrailleLite)
+	speech=bl
+	;;
+	CombiBraille)
+	speech=cb
+	;;
+	External*)
+	speech=es
+	;;
+	Festival*)
+	speech=fv
+	;;
+	Generic*)
+	speech=gs
+	;;
+	Televox)
+	speech=tv
+	;;
+	"No Speech")
+	speech=no
+	;;
+    esac
+
+    change_value speech-driver "$speech"
+fi
+
+if [ ! -e /etc/brlapi-key ]; then
+    mcookie >/etc/brlapi-key
+    chmod 0644 /etc/brlapi-key
+fi
+ 
+#update-rc.d brltty start 10 23 > /dev/null
+
+#DEBHELPER#
+
+db_stop
--- brltty-3.3.1.orig/debian/rules
+++ brltty-3.3.1/debian/rules
@@ -0,0 +1,159 @@
+#!/usr/bin/make -f
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+# This is the debhelper compatability version to use.
+export DH_COMPAT=4
+
+PACKAGE=brltty
+VERSION=$(shell dpkg-parsechangelog | grep ^Version: | cut -d ' ' -f 2)
+DEB_HOST_ARCH=$(shell dpkg-architecture -qDEB_HOST_ARCH)
+UDEB_CFLAGS=-Os -fomit-frame-pointer
+UDEB_CONFIGURE_OPTIONS=--disable-pcm-tunes --disable-midi-tunes \
+	--disable-fm-tunes --disable-contracted-braille \
+	--disable-preferences-menu --disable-learn-mode \
+	--disable-tainted-components --disable-pm-configfile \
+	--disable-speech-support --with-braille-device=/dev/tts/0 \
+	--with-init-path=no
+UDEB_FILENAME=$(PACKAGE)-udeb_$(VERSION)_$(DEB_HOST_ARCH).udeb
+PRIORITY=$(shell grep '^Package: brltty-udeb' debian/control -A 10 | grep ^Priority: | cut -d ' ' -f 2)
+
+binary: binary-indep binary-arch
+
+clean:
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp
+
+	-$(MAKE) -C Documents clean
+	-$(MAKE) distclean
+	-rm configure-stamp configure-udeb-stamp build-stamp
+	-test -r /usr/share/misc/config.sub && \
+	  cp -f /usr/share/misc/config.sub aux/config.sub
+	-test -r /usr/share/misc/config.guess && \
+	  cp -f /usr/share/misc/config.guess aux/config.guess
+
+	dh_clean
+
+configure: configure-stamp
+configure-stamp:
+	./configure --bindir=/sbin --enable-api --disable-tainted-components
+
+	rm -f configure-udeb-stamp
+	touch $@
+
+configure-udeb: configure-udeb-stamp
+configure-udeb-stamp:
+	-$(MAKE) distclean
+	CFLAGS="$(UDEB_CFLAGS)" ./configure --bindir=/sbin \
+		$(UDEB_CONFIGURE_OPTIONS)
+	rm -f configure-stamp
+	touch $@
+
+build: configure build-stamp
+build-stamp:
+	dh_testdir
+
+	$(MAKE)
+	$(MAKE) -C Documents
+
+	rm -f build-udeb-stamp
+	touch $@
+
+build-udeb: configure-udeb build-udeb-stamp
+build-udeb-stamp:
+	dh_testdir
+
+	$(MAKE)
+
+	rm -f build-stamp
+	touch $@
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+
+	$(MAKE) install INSTALL_ROOT=`pwd`/debian/$(PACKAGE)
+	dh_install	
+	dh_installman -plibbrlapi-dev Documents/man3/*.3
+	rm -Rf debian/brltty/usr/include debian/brltty/usr/lib \
+		debian/brltty/usr/share/man/man3/
+	rm -f debian/brltty/sbin/brltty-install debian/brltty/lib/libbrlapi*
+
+	# fix up permissions
+	chmod -x debian/brltty/lib/brltty/brltty-spk.lst debian/brltty/lib/brltty/brltty-brl.lst
+	cp debian/lintian.override debian/brltty/usr/share/lintian/overrides/brltty
+	gzip -9 debian/brltty/usr/share/man/man1/brltty.1
+
+install-udeb: build-udeb
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs -pbrltty-udeb
+
+	$(MAKE) install INSTALL_ROOT=`pwd`/debian/brltty-udeb
+
+	cp debian/brltty-udeb.prebaseconfig debian/brltty-udeb/usr/lib/prebaseconfig.d/50brltty
+	chmod 0755 debian/brltty-udeb/usr/lib/prebaseconfig.d/50brltty
+	rm -f debian/brltty-udeb/sbin/brltty-install
+	rm -Rf debian/brltty-udeb/usr/share
+	# It is sad, but help files are not really essential, but they are
+	# fairly large.
+	rm debian/brltty-udeb/etc/brltty/*.hlp
+	# fix up permissions
+	chmod -x debian/brltty-udeb/lib/brltty/brltty-brl.lst
+
+	# Papenmeier
+	#echo "Papenmeier support needs" `ls -l debian/brltty-udeb/etc/brltty/brltty-pm* debian/brltty-udeb/lib/brltty/libbrlttybpm.so|awk '{print $$5}'|xargs echo|tr " " +|bc` bytes
+	# 199k last time we checked...
+	#rm -f debian/brltty-udeb/etc/brltty/brltty-pm* debian/brltty-udeb/lib/brltty/libbrlttybpm.so
+
+# Build architecture-independent files here.
+binary-indep: configure build install
+# We have nothing to do here.
+
+# Build architecture-dependent files here.
+binary-arch: brltty brltty-udeb
+
+brltty: build install
+#	dh_testversion
+	dh_testdir
+	dh_testroot
+	dh_installdebconf -p$@	
+	dh_installdocs
+	dh_installexamples -p$@
+	# -r because we don't want to lose the console on an upgrade
+	dh_installinit -p$@ -r -- start 25 S .
+	dh_installchangelogs Documents/ChangeLog
+	dh_link -p$@ -plibbrlapi -plibbrlapi-dev
+	dh_strip -p$@ -plibbrlapi -plibbrlapi-dev
+	dh_compress -p$@ -plibbrlapi -plibbrlapi-dev
+	dh_fixperms -p$@ -plibbrlapi -plibbrlapi-dev
+	dh_makeshlibs -n -p$@
+	dh_makeshlibs -plibbrlapi
+	dh_installdeb -p$@ -plibbrlapi -plibbrlapi-dev
+	dh_shlibdeps -p$@ -plibbrlapi -plibbrlapi-dev
+	dh_gencontrol -p$@ -plibbrlapi -plibbrlapi-dev
+	dh_md5sums -p$@ -plibbrlapi -plibbrlapi-dev
+	dh_builddeb -p$@ -plibbrlapi -plibbrlapi-dev
+
+brltty-udeb: install-udeb
+	dh_testdir
+	dh_testroot
+	cp debian/brltty-udeb.init debian/$@/etc/rcS.d/S02brltty
+	chmod +x debian/$@/etc/rcS.d/S02brltty
+	dh_strip -p$@
+	dh_fixperms -p$@
+	# If we pack now, mklibs will not work
+#	upx-ucl -9 debian/$@/sbin/brltty
+	DH_COMPAT=2 dh_installdeb -p$@
+	dh_shlibdeps -p$@
+	dh_gencontrol -p$@ -- -fdebian/files~
+	# Register file manually.
+	dpkg-distaddfile $(UDEB_FILENAME) debian-installer $(PRIORITY)
+	dh_builddeb -p$@ --filename=$(UDEB_FILENAME)
+
+.PHONY: brltty build clean final binary-indep binary-arch binary install
--- brltty-3.3.1.orig/debian/control
+++ brltty-3.3.1/debian/control
@@ -0,0 +1,61 @@
+Source: brltty
+Section: admin
+Priority: extra
+Maintainer: Mario Lang <mlang@debian.org>
+Build-Depends: debhelper (>= 4.1.16), bison, doxygen
+Standards-Version: 3.5.8
+
+Package: brltty
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Suggests: libbrlapi-dev, festival
+Description: Access software for a blind person using a soft braille terminal
+ BRLTTY is a daemon which provides access to the Linux console (text mode)
+ for a blind person using a soft braille display.  It drives the braille
+ terminal and provides complete screen review functionality.
+ The following display models are supported:
+  * Alva (ABT3xx/Delphi)
+  * BrailleLite (18/40)
+  * BrailleNote (18/32)
+  * EcoBraille displays
+  * EuroBraille displays
+  * HandyTech (Bookworm/Braille Wave/Braille Star 40/80)
+  * LogText 32
+  * MDV braille displays
+  * Papenmeier
+  * Tieman Voyager 44/70 (USB), CombiBraille, MiniBraille and MultiBraille
+  * TSI (PowerBraille/Navigator)
+  * Vario (Emul. 1 (40/80)/Emul. 2)
+  * Videobraille
+  * VisioBraille
+ .
+ BRLTTY also provides a client/server based infrastructure for applications
+ wishing to utilize a Braille display.  The daemon process listens for incoming
+ TCP/IP connections on a certain port.  A shared object library for clients is
+ provided in the package libbrlapi.  A static library, header files and
+ documentation is provided in package libbrlapi-dev.
+
+Package: libbrlapi
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: braille display access via BRLTTY - shared library
+ This package contains the shared library necessary to run programs which
+ want to communicate with a refreshable braille display.
+
+Package: libbrlapi-dev
+Architecture: any
+Section: libdevel
+Depends: libbrlapi (>= ${Source-Version}), libc6-dev
+Description: Library for communication with BRLTTY - static libs and headers
+ This package contains the static library libbrlapi.a and header files
+ in /usr/include/brltty/ necessary to compile programs for BrlAPI, a
+ client-server based mechanism to remotely access a braille display.
+
+Package: brltty-udeb
+Architecture: any
+Section: debian-installer
+Priority: extra
+Depends: ${shlibs:Depends}
+Description: Access software for a blind person using a soft braille terminal
+ This is a small version of brltty, optimized for use on boot floppies.
--- brltty-3.3.1.orig/debian/brltty-udeb.init
+++ brltty-3.3.1/debian/brltty-udeb.init
@@ -0,0 +1,3 @@
+#!/bin/sh
+/sbin/brltty -E
+
--- brltty-3.3.1.orig/debian/changelog
+++ brltty-3.3.1/debian/changelog
@@ -0,0 +1,211 @@
+brltty (3.3.1-1jds.gnoppix1) UNOFFICIAL; urgency=low
+
+  * built on woody for gnoppix 
+
+ -- James D Strandboge <jstrand1@rochester.rr.com>  Fri, 26 Sep 2003 09:32:23 -0400
+
+brltty (3.3.1-1jds1) unstable; urgency=low
+
+  * built on woody 
+
+ -- James Strandboge <jstrand1@rochester.rr.com>  Wed, 10 Sep 2003 14:36:14 +0000
+
+brltty (3.3.1-2) unstable; urgency=low
+
+  * debian/brltty.init:
+    - Use --pidfile for start-stop-daemon to prevent starting several
+      instances of BRLTTY.  This also removes a indirect dependency on
+      a mounted /proc since start-stop-daemon requires it when used with
+      --exec or --name (Closes: Bug#208323).
+  * Change Architecutre of binary package brltty to any.
+  * Switch to po-debconf (Thanks to Christian Perrier, Closes: Bug#205806).
+  * Add French debconf translation (Closes: Bug#206732).
+  * Add Brazilian Portuguese debconf translation (Closes: Bug#187782).
+  * Update German debconf translation.
+  * Update debian/lintian.override.
+
+ -- Mario Lang <mlang@debian.org>  Tue,  9 Sep 2003 18:04:45 +0200
+
+brltty (3.3.1-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Mario Lang <mlang@debian.org>  Mon,  1 Sep 2003 17:10:49 +0200
+
+brltty (3.3-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/README.Debian:
+    - Remove obsolete notes.
+  * debian/brltty.docs:
+    - Removed Documents/Manual-ger-HTML/ and Documents/Manual-ger.txt
+      since upstream deleted the obsolete German manual.
+  * debian/brltty.post{inst,rm}:
+    - Create (only if not existing) and rm /etc/brlapi-key.
+  * debian/control:
+    - Add packages libbrlapi and libbrlapi-dev.
+
+ -- Mario Lang <mlang@debian.org>  Mon,  4 Aug 2003 18:11:16 +0200
+
+brltty (3.2-5) unstable; urgency=low
+
+  * Fix a case where upgrade failed due to init script start failing
+    (add --oknodo, and remove --quiet)
+
+ -- Mario Lang <mlang@debian.org>  Fri,  4 Apr 2003 14:12:56 +0200
+
+brltty (3.2-4) unstable; urgency=low
+
+  * Fix doc-base.brltty (Closes: Bug#183230)
+
+ -- Mario Lang <mlang@debian.org>  Sun, 16 Mar 2003 23:36:13 +0100
+
+brltty (3.2-3) unstable; urgency=low
+
+  * For udeb configure, set CXXFLAGS=-Os too, save another 608 bytes.
+  * Portability fix in config.c
+  * prebaseconfig: use apt-install, support short-hand device names, and
+    translate them into their non-devfs equivalent names.
+
+ -- Mario Lang <mlang@debian.org>  Fri, 21 Feb 2003 12:23:44 +0100
+
+brltty (3.2-2) unstable; urgency=low
+
+  * Add 50brltty to prebaseconfig.d in the -udeb variant.
+
+ -- Mario Lang <mlang@debian.org>  Tue,  4 Feb 2003 17:50:32 +0100
+
+brltty (3.2-1) unstable; urgency=low
+
+  * New upstream release (Closes: Bug#177400)
+  * Remove undocumented.7 link and replace it with a real manpage from upstream
+    (yay!)
+  * Set standard-version to 3.5.8
+  * debian/brltty.templates:
+    * texttbl: renamed to text-table and changed text.german->text.de,
+      text.sweden->text.se1 and text.swedish->text.se2 and added text.ru.
+    * speech-driver: New question. 
+    * braille-driver: Now put the full driver name in the select, and look the
+      two letter combo up in brltty.postinst.
+      brldriver: Removed.
+    * override: New question.
+  * debian/brltty.config:
+    * Added override question, copied from libpam-ldap.
+    * Added speech-driver.
+    * Changed brldriver to braille-driver
+    * Swap device and speech-driver position.
+    * Provide device and speech-driver defaults based on braille-driver
+      selection.
+  * debian/brltty.postinst:
+    * Moved /etc/brltty.conf mangling here, also partly taken from libpam-ldap.
+  * debian/brltty.init: Use -P and --pidfile.  --exec didn't work with restart
+    on upgrade.
+  * debian/brltty-udeb.init: Remove mknod again, upstream handles devfs now.
+  * debian/rules:
+    * Build brltty and -udeb with --disable-tainted-components.  This
+      prevents accidental builds with the viavoice speech module included.
+    * Build brltty-udeb with CFLAGS=-Os, --disable-speech-support and
+      --disable-pm-configfile.
+  * Update lintian.override to get rid of select-with-translated-default-field
+    and bogus partial-translated warnings.
+
+ -- Mario Lang <mlang@debian.org>  Mon,  3 Feb 2003 17:10:32 +0100
+
+brltty (3.1-4) unstable; urgency=low
+
+  * Add --with-braille-device=/dev/tts/0 to configure-udeb
+    target, because d-i is using devfsd.
+  * Add mknod /dev/tty0 call to brltty-udeb.init.
+
+ -- Mario Lang <mlang@debian.org>  Mon,  9 Dec 2002 13:45:23 +0100
+
+brltty (3.1-3) unstable; urgency=low
+
+  * Use gcc instead of ld to link.
+
+ -- Mario Lang <mlang@debian.org>  Mon, 18 Nov 2002 20:21:20 +0100
+
+brltty (3.1-2) unstable; urgency=low
+
+  * Update config.guess/sub on debian/rules clean.
+  * Set DH_COMPAT=2 while doing dh_installdeb for the
+    -udeb to prevent filenames like /etc/rcS.d/S02brltty.dpkg-new
+
+ -- Mario Lang <mlang@debian.org>  Mon, 18 Nov 2002 16:38:20 +0100
+
+brltty (3.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * New binary package brltty-udeb.
+  * Lots of changes to debian/ files were necessary because upstream
+    changed to autoconf, and also decided to rename the whole source tree!
+  * Excluded viavoice from configure.in again.
+  * Remove mknod from Programs/Makefile.
+
+ -- Mario Lang <mlang@debian.org>  Wed, 13 Nov 2002 22:18:20 +0100
+
+brltty (3.0-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Mario Lang <mlang@debian.org>  Tue, 13 Aug 2002 12:30:00 +0100
+
+brltty (2.99.5-5) unstable; urgency=low
+
+  * Added --oknodo to brltty stop
+    (Closes: Bug#149989)
+  * Added db_stop to end of postinst
+    (Closes: Bug#147776)
+
+ -- Mario Lang <mlang@delysid.org>  Mon,  8 Jul 2002 14:30:28 +0100
+
+brltty (2.99.5-4) unstable; urgency=low
+
+
+  * Created lintian override file to prevent warnings
+    which aren't relevant
+
+ -- Mario Lang <mlang@delysid.org>  Mon, 24 Jun 2002 17:31:28 +0100
+
+brltty (2.99.5-3) unstable; urgency=low
+
+  * Fixed copyright file to point to gpl
+  * Fixed upstream changelog name to changelog.gz instead of ChangeLog.gz
+  * dh_compat set to 3
+  * German debconf templates
+    (Closes: Bug#118044)
+  * Added many archs to build on too
+  * Changed runlevel to S
+
+ -- Mario Lang <mlang@delysid.org>  Wed, 22 May 2002 19:21:29 +0100
+
+brltty (2.99.5-2) unstable; urgency=medium
+
+  * Fix init script to correctly behave (hopefully this time)
+  * Added Spanish templates (Closes: Bug#136361)
+  * Added Dutch templates (Closes: Bug#134622)
+  * Urgency medium to go to woody
+
+ -- Mario Lang <mlang@delysid.org>  Thu, 11 Apr 2002 18:01:44 +0100
+
+brltty (2.99.5-1) unstable; urgency=low
+
+  * New upstream version.
+  * Fixed /etc/init.d/brltty stop bug (pidfile)
+  * Added new drivers in debconf templates.
+    (I won't install i18n templates until 3.0 is out)
+
+ -- Mario Lang <mlang@delysid.org>  Sat, 16 Feb 2002 18:40:58 +0100
+
+brltty (2.98-2) unstable; urgency=low
+
+  * Fixed control file to section extra as override file requested
+  * Added missing braille drivers to debconf template
+
+ -- Mario Lang <mlang@delysid.org>  Mon, 29 Oct 2001 15:05:57 +0100
+
+brltty (2.98-1) unstable; urgency=low
+
+  * Initial Release.
+
+ -- Mario Lang <mlang@delysid.org>  Thu,  4 Jan 2001 16:22:12 +0100
--- brltty-3.3.1.orig/debian/brltty.examples
+++ brltty-3.3.1/debian/brltty.examples
@@ -0,0 +1 @@
+Documents/brltty.conf
--- brltty-3.3.1.orig/debian/README.Debian
+++ brltty-3.3.1/debian/README.Debian
@@ -0,0 +1,15 @@
+brltty for Debian
+-----------------
+
+This version of brltty is built dynamically.  All braille driver modules
+shipped with 2.99.5 are included.
+
+The ViaVoice speech module is intentionally not included in the
+binary package due to license incompatibilities.
+
+I also removed /sbin/brltty-install because I think
+as soon as we have a .deb package, the reinstall
+method isn't necessary.
+(feel free to complain about this if you need it).
+
+ -- Mario Lang <mlang@delysid.org>, Thu, 10 Jan 2001 10:22:12 +0100
--- brltty-3.3.1.orig/debian/lintian.override
+++ brltty-3.3.1/debian/lintian.override
@@ -0,0 +1,6 @@
+brltty: select-with-translated-default-field brltty/text-table de.iso-8859-15
+brltty: select-with-translated-default-field brltty/text-table es.iso-8859-15
+brltty: select-with-translated-default-field brltty/text-table fr.iso-8859-15
+brltty: select-with-translated-default-field brltty/text-table nl.iso-8859-15
+brltty: select-with-translated-default-field brltty/text-table pt_br.iso-8859-1
+brltty: binary-or-shlib-defines-rpath ./sbin/brltty /lib/brltty
--- brltty-3.3.1.orig/debian/brltty.config
+++ brltty-3.3.1/debian/brltty.config
@@ -0,0 +1,55 @@
+#! /bin/sh -e
+
+CONFFILE=/etc/brltty.conf
+action=$1
+
+. /usr/share/debconf/confmodule
+
+db_version 2.0
+
+# taken from libpam-ldap-151/debian/config
+if [ -e $CONFFILE ]; then
+    if ( head -1 $CONFFILE | grep -q "^###DEBCONF###$" ); then
+	db_set brltty/override true
+    else
+	db_get brltty/override
+	OLDVALUE=$RET
+	db_set brltty/override false
+	if [ "$OLDVALUE" = "true" ]; then
+	    db_fset brltty/override seen false
+	fi
+	db_input high brltty/override || true
+	db_go
+    fi
+else
+    # We don't ask, just do it
+    db_set brltty/override true
+fi
+
+db_get brltty/override
+if [ "$RET" = "true" ]; then
+    # TODO: If kernel cmdline has driver info, use it as default
+    db_input critical brltty/braille-driver || true
+    db_go || true
+    db_get brltty/braille-driver
+    case "$RET" in
+	"Voyager [44/70 (USB)]")
+	db_set brltty/device "/dev/brlvger"
+	;;
+	Alva*)
+	db_set brltty/speech-driver "Alva [Delphi]"
+	;;
+	BrailleLite*)
+	db_set brltty/speech-driver BrailleLite
+	;;
+	CombiBraille*)
+	db_set brltty/speech-driver CombiBraille
+	;;
+    esac
+    db_input critical brltty/device || true
+    db_go || true
+    db_input high brltty/text-table || true
+    db_go || true
+    db_input medium brltty/speech-driver || true
+    db_go || true
+fi
--- brltty-3.3.1.orig/debian/doc-base.brltty
+++ brltty-3.3.1/debian/doc-base.brltty
@@ -0,0 +1,19 @@
+Document: brltty
+Title: Debian brltty Manual
+Author: Nikhil Nair <nn201@cus.cam.ac.uk>
+ Nicolas Pitre <nico@cam.org>
+ Stéphane Doyon <s.doyon@videotron.ca>
+Abstract: This manual describes what brltty is and how it can be used to
+ access the Linux Virtual Console using a Braille display.
+Section: unknown
+
+Format: linuxdoc-sgml
+Files: /usr/share/doc/brltty/Manual.sgml.gz
+
+Format: text
+Files: /usr/share/doc/brltty/Manual.txt.gz
+
+Format: HTML
+Index: /usr/share/doc/brltty/Manual-HTML/Manual.html
+Files: /usr/share/doc/brltty/Manual-HTML/*.html
+ 
--- brltty-3.3.1.orig/debian/copyright
+++ brltty-3.3.1/debian/copyright
@@ -0,0 +1,47 @@
+This package was debianized by Mario Lang <mlang@delysid.org> on
+Thu,  4 Jan 2001 16:22:12 +0100.
+
+It was downloaded from <URL:http://mielke.cc/brltty/>
+
+Upstream Authors:
+   Nicolas Pitre <nico@cam.org>
+          Current maintainer; author of the drivers for the Alva B.V.
+          series and for the EuroBraille family of displays.
+       
+   Stéphane Doyon <s.doyon@videotron.ca>:
+          Active developer; author of the driver for Telesensory
+          Systems's PowerBraille and Navigator models.
+					      
+   Nikhil Nair <nn201@cus.cam.ac.uk>:
+          Original author; author of the drivers for the Tieman B.V.
+          CombiBraille and Blazie Engineering's BrailleLite.
+     
+   James Bowden <jrbowden@bcs.org.uk>:
+          Acted in an advisory capacity; contributed some braille
+          translation tables.
+    
+   August Hörandl <hoerandl@elina.htlw1.ac.at>:
+          Noted contributor of the driver for the Papenmeier Screen 2D
+          Terminal. Thanks to the members of his team (Tibor Becker,
+          Michael Burger, Herbert Gruber and Heimo Schön) who worked on
+          this project at the Technical High School, Department for
+          electrical engineering, Vienna, Austria.
+ 
+   Oscar Fernandez <ofa@once.es>:
+          Contributor of the driver for the EcoBraille from La O.N.C.E.
+
+  And some others.
+
+Copyright:
+
+Copyright (C) 1995-2000 by The BRLTTY Team, All rights reserved.
+
+BRLTTY comes with ABSOLUTELY NO WARRANTY.
+
+This is free software, placed under the terms of the
+GNU General Public License, as published by the Free Software
+Foundation.
+
+On Debian GNU/Linux systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
+
--- brltty-3.3.1.orig/debian/brltty.init
+++ brltty-3.3.1/debian/brltty.init
@@ -0,0 +1,44 @@
+#! /bin/sh
+
+PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+DAEMON=/sbin/brltty
+NAME=brltty
+DESC='Braille terminal driver'
+PIDFILE=/var/run/$NAME.pid
+
+test -f $DAEMON || exit 0
+
+set -e
+
+case "$1" in
+  start)
+	echo -n "Starting $DESC: "
+	start-stop-daemon --start --oknodo \
+		--pidfile $PIDFILE --startas $DAEMON -- -P $PIDFILE
+	echo "$NAME."
+	;;
+  stop)
+	echo -n "Stopping $DESC: "
+	start-stop-daemon --stop --quiet --oknodo --pidfile $PIDFILE
+	echo "$NAME."
+	;;
+  restart|force-reload)
+	echo -n "Restarting $DESC: "
+	start-stop-daemon --stop --quiet --pidfile $PIDFILE
+	echo -n .
+	for i in 1 2 3 4 5; do
+	    sleep 1
+	    echo -n .
+	done
+	start-stop-daemon --start --quiet \
+		--pidfile $PIDFILE --startas $DAEMON -- -P $PIDFILE
+	echo "$NAME."
+	;;
+  *)
+	N=/etc/init.d/$NAME
+	echo "Usage: $N {start|stop|restart|force-reload}" >&2
+	exit 1
+	;;
+esac
+
+exit 0
--- brltty-3.3.1.orig/debian/brltty.templates
+++ brltty-3.3.1/debian/brltty.templates
@@ -0,0 +1,37 @@
+Template: brltty/override
+Type: boolean
+Default: true
+_Description: Let debconf manage brltty configuration file?
+ If you accept, debconf will ask you some essential questions required
+ to set brltty up with your hardware.  The configuration file
+ /etc/brltty.conf will then be automatically generated from the data you
+ provided.
+ .
+ You should not edit /etc/brltty.conf by hand if you accept here. You should
+ then use "dpkg-reconfigure brltty" to change the configuration.
+
+Template: brltty/device
+Type: string
+Default: /dev/ttyS0
+_Description: Which device is your Braille terminal connected to?
+
+Template: brltty/braille-driver
+Type: select
+Choices: Alva [ABT3xx/Delphi/Satellite], BrailleLite [18/40], BrailleNote [18/32], CombiBraille [25/45/85], EcoBraille [20/40/80], EuroBraille [Clio-noteBraille 40], HandyTech [Bookworm/Wave/Star/Modular], LogText [32], MultiBraille [MB125CR/MB145CR/MB185CR], MDV (protocol 5) [MB208/MB408L/MB408S], MiniBraille [20], Papenmeier, TSI [Navigator 20/40/80 / PowerBraille 40/65/80], Vario/RBT (emulation 1) [40/80], VideoBraille [40], Vario/RBT (emulation 2) [40/80], Voyager [44/70 (USB)], VisioBraille [20/40]
+Default: TSI [Navigator 20/40/80 / PowerBraille 40/65/80]
+_Description: Choose the appropriate Braille driver
+
+Template: brltty/text-table
+Type: select
+Choices: text.de, text.es, text.fr, text.no-h, text.no-p, text.se1, text.se2, text.ru, text.simple, text.uk, text.us
+_DefaultChoice: text.us [ translators : you may insert here another choice than text.us. Choices are : text.de, text.es, text.fr, text.no-h, text.no-p, text.se1, text.se2, text.ru, text.simple, text.uk, text.us. Do not put brackets and do not tranlsate what's inside brackets ]
+_Description: Choose a Braille translation table
+
+Template: brltty/speech-driver
+Type: select
+Choices: Alva [Delphi], BrailleLite, CombiBraille, External Speech, Festival Text to Speech Package, Generic Say (pipes to /usr/local/bin/say), Televox, No Speech
+Default: No Speech
+_Description: Choose a speech driver to use
+ BRLTTY can optionally interface with speech synthesis systems to read the
+ current line to you.  If you are planning to use this functionality,
+ select an appropriate speech driver now.
--- brltty-3.3.1.orig/debian/brltty.dirs
+++ brltty-3.3.1/debian/brltty.dirs
@@ -0,0 +1,4 @@
+etc/brltty
+lib/brltty
+sbin
+usr/share/lintian/overrides
--- brltty-3.3.1.orig/debian/brltty-udeb.dirs
+++ brltty-3.3.1/debian/brltty-udeb.dirs
@@ -0,0 +1,5 @@
+etc/brltty
+etc/rcS.d
+lib/brltty
+sbin
+usr/lib/prebaseconfig.d
--- brltty-3.3.1.orig/debian/brltty.docs
+++ brltty-3.3.1/debian/brltty.docs
@@ -0,0 +1,4 @@
+README
+Documents/Manual.sgml
+Documents/Manual.txt
+Documents/Manual-HTML/
--- brltty-3.3.1.orig/debian/brltty.postrm
+++ brltty-3.3.1/debian/brltty.postrm
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+set -e
+
+if test "$1" = "purge"
+then
+	rm -f /etc/brltty.conf
+	rm -f /etc/brlapi-key
+fi
+
+#update-rc.d brltty remove > /dev/null
+
+#DEBHELPER#
--- brltty-3.3.1.orig/debian/brltty-udeb.prebaseconfig
+++ brltty-3.3.1/debian/brltty-udeb.prebaseconfig
@@ -0,0 +1,79 @@
+#! /bin/sh -e
+# Boot Parameters to Configuration File
+
+# This script processes the brltty= boot parameters in /proc/cmdline and
+# writes a corresponding BRLTTY configuration file to /target/etc/brltty.conf.
+
+parse()
+{
+    brailleDriver=""
+   brailleDevice=""
+   textTable=""
+
+   found=false
+   while [ "${#}" -gt 0 ]
+   do
+      case "${1}"
+      in
+         "brltty="*)
+            found=true
+            parameters="${1#*=}"
+
+            number=1
+            while [ "${number}" -le 3 ]
+            do
+               parameter="`echo ${parameters} | cut -d, -f${number}`"
+               if [ -n "${parameter}" ]
+               then
+                  case "${number}"
+                  in
+                     1)
+                        brailleDriver="${parameter}"
+                        ;;
+                     2)
+                        brailleDevice=${parameter}
+			test "`expr "${brailleDevice}" : "/"`" -eq 0 && \
+			    brailleDevice="/dev/${brailleDevice}"
+			test "`expr "${brailleDevice}" : "/dev/tts/"`" -eq 9 && \
+			    brailleDevice="/dev/ttyS`expr substr ${brailleDevice} 10 2`"
+                        ;;
+                     3)
+                        textTable="${parameter}"
+                        ;;
+                  esac
+               fi
+
+               number="`expr ${number} + 1`"
+            done
+            ;;
+      esac
+
+      shift
+   done
+
+   if "${found}"
+   then
+      echo "# Created by ${0}"
+      [ -n "${brailleDriver}" ] && echo "braille-driver ${brailleDriver}"
+      [ -n "${brailleDevice}" ] && echo "braille-device ${brailleDevice}"
+      [ -n "${textTable}" ] && echo "text-table ${textTable}"
+   fi
+}
+
+unset DEBIAN_HAS_FRONTEND
+unset DEBIAN_FRONTEND
+unset DEBCONF_FRONTEND
+unset DEBCONF_REDIR
+
+
+file="/proc/cmdline"
+if [ -f $flie ]; then
+    if grep brltty= $file >/dev/null && \
+       ps aux | grep -v grep | grep brltty >/dev/null; then
+        if apt-install brltty 1>&2; then
+            parse `cat "${file}"` >/target/etc/brltty.conf
+        fi    
+    fi
+fi
+
+exit 0
--- brltty-3.3.1.orig/debian/libbrlapi.install
+++ brltty-3.3.1/debian/libbrlapi.install
@@ -0,0 +1,2 @@
+debian/brltty/lib/lib*.so.* lib
+
--- brltty-3.3.1.orig/debian/libbrlapi-dev.install
+++ brltty-3.3.1/debian/libbrlapi-dev.install
@@ -0,0 +1,4 @@
+debian/brltty/lib/*.a lib
+debian/brltty/lib/*.so /lib
+debian/brltty/usr/include/brltty usr/include
+
--- brltty-3.3.1.orig/debian/po/de.po
+++ brltty-3.3.1/debian/po/de.po
@@ -0,0 +1,95 @@
+#
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+#    Developers do not need to manually edit POT or PO files.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-08-09 07:50+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Mario Lang <mlan@debian.org\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-15\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Description
+#: ../brltty.templates:4
+msgid "Let debconf manage brltty configuration file?"
+msgstr "Soll debconf brltty Konfigurationsdateien verwalten?"
+
+#. Description
+#: ../brltty.templates:4
+msgid ""
+"If you accept, debconf will ask you some essential questions required to set "
+"brltty up with your hardware.  The configuration file /etc/brltty.conf will "
+"then be automatically generated from the data you provided."
+msgstr ""
+"Wenn Sie dies akzeptieren wird Ihnen debconf einige essenzielle Fragen "
+"stellen die zum konfigurieren Ihrer Hardware erforderlich sind.  Die "
+"Konfigurationsdatei /etc/brltty.conf wird dann automatisch anhand der von "
+"Ihnen eingegebenen Daten erzeug."
+
+#. Description
+#: ../brltty.templates:4
+msgid ""
+"You should not edit /etc/brltty.conf by hand if you accept here. You should "
+"then use \"dpkg-reconfigure brltty\" to change the configuration."
+msgstr ""
+"Sie sollten die Datei /etc/brltty.conf nicht selbst editieren wenn Sie dies "
+"akzeptieren.  Verwenden Sie statt dessen das Kommando \"dpkg-reconfigure "
+"brltty\" um die Konfiguration zu ändern."
+
+#. Description
+#: ../brltty.templates:16
+msgid "Which device is your Braille terminal connected to?"
+msgstr "Wo ist der Braille-Terminal angeschlossen?"
+
+#. Description
+#: ../brltty.templates:22
+msgid "Choose the appropriate Braille driver"
+msgstr "Wählen Sie den passenden Braille-Treiber"
+
+#. DefaultChoice
+#: ../brltty.templates:27
+msgid ""
+"text.us [ translators : you may insert here another choice than text.us. "
+"Choices are : text.de, text.es, text.fr, text.no-h, text.no-p, text.se1, "
+"text.se2, text.ru, text.simple, text.uk, text.us. Do not put brackets and do "
+"not tranlsate what's inside brackets ]"
+msgstr "text.de"
+
+#. Description
+#: ../brltty.templates:28
+msgid "Choose a Braille translation table"
+msgstr "Wählen Sie eine Braille-übersetzungstabelle"
+
+#. Description
+#: ../brltty.templates:34
+msgid "Choose a speech driver to use"
+msgstr "Wählen Sie einen Sprachausgaben-Treiber"
+
+#. Description
+#: ../brltty.templates:34
+msgid ""
+"BRLTTY can optionally interface with speech synthesis systems to read the "
+"current line to you.  If you are planning to use this functionality, select "
+"an appropriate speech driver now."
+msgstr ""
+"BRLTTY kann optional mit Sprachausgaben zusammenarbeiten um Ihnen die "
+"aktuelle Zeile vorzulesen.  Wenn Sie planen, diese funktionalität zu "
+"verweden, dann sollten Sie hier den passenden Treiber auswählen"
+
+#~ msgid "text.us"
+#~ msgstr "text.de"
--- brltty-3.3.1.orig/debian/po/es.po
+++ brltty-3.3.1/debian/po/es.po
@@ -0,0 +1,85 @@
+#
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+#    Developers do not need to manually edit POT or PO files.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-08-09 07:50+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"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-15\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Description
+#: ../brltty.templates:4
+msgid "Let debconf manage brltty configuration file?"
+msgstr ""
+
+#. Description
+#: ../brltty.templates:4
+msgid ""
+"If you accept, debconf will ask you some essential questions required to set "
+"brltty up with your hardware.  The configuration file /etc/brltty.conf will "
+"then be automatically generated from the data you provided."
+msgstr ""
+
+#. Description
+#: ../brltty.templates:4
+msgid ""
+"You should not edit /etc/brltty.conf by hand if you accept here. You should "
+"then use \"dpkg-reconfigure brltty\" to change the configuration."
+msgstr ""
+
+#. Description
+#: ../brltty.templates:16
+msgid "Which device is your Braille terminal connected to?"
+msgstr "¿Dónde ha conectado el terminal Braille?"
+
+#. Description
+#: ../brltty.templates:22
+msgid "Choose the appropriate Braille driver"
+msgstr "Escoja el controlador de Braille que necesite"
+
+#. DefaultChoice
+#: ../brltty.templates:27
+msgid ""
+"text.us [ translators : you may insert here another choice than text.us. "
+"Choices are : text.de, text.es, text.fr, text.no-h, text.no-p, text.se1, "
+"text.se2, text.ru, text.simple, text.uk, text.us. Do not put brackets and do "
+"not tranlsate what's inside brackets ]"
+msgstr "text.es"
+
+#. Description
+#: ../brltty.templates:28
+msgid "Choose a Braille translation table"
+msgstr "Elija una tabla de traducción a Braille"
+
+#. Description
+#: ../brltty.templates:34
+msgid "Choose a speech driver to use"
+msgstr ""
+
+#. Description
+#: ../brltty.templates:34
+msgid ""
+"BRLTTY can optionally interface with speech synthesis systems to read the "
+"current line to you.  If you are planning to use this functionality, select "
+"an appropriate speech driver now."
+msgstr ""
+
+#~ msgid "text.us"
+#~ msgstr "text.es"
--- brltty-3.3.1.orig/debian/po/nl.po
+++ brltty-3.3.1/debian/po/nl.po
@@ -0,0 +1,88 @@
+#
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+#    Developers do not need to manually edit POT or PO files.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-08-09 07:50+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"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-15\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Description
+#: ../brltty.templates:4
+msgid "Let debconf manage brltty configuration file?"
+msgstr ""
+
+#. Description
+#: ../brltty.templates:4
+msgid ""
+"If you accept, debconf will ask you some essential questions required to set "
+"brltty up with your hardware.  The configuration file /etc/brltty.conf will "
+"then be automatically generated from the data you provided."
+msgstr ""
+
+#. Description
+#: ../brltty.templates:4
+msgid ""
+"You should not edit /etc/brltty.conf by hand if you accept here. You should "
+"then use \"dpkg-reconfigure brltty\" to change the configuration."
+msgstr ""
+
+#. Description
+#: ../brltty.templates:16
+msgid "Which device is your Braille terminal connected to?"
+msgstr "Waar is uw Braille terminal mee verbonden?"
+
+#. Description
+#: ../brltty.templates:22
+msgid "Choose the appropriate Braille driver"
+msgstr "Selecteer de geschikte Braille driver"
+
+#. DefaultChoice
+#: ../brltty.templates:27
+msgid ""
+"text.us [ translators : you may insert here another choice than text.us. "
+"Choices are : text.de, text.es, text.fr, text.no-h, text.no-p, text.se1, "
+"text.se2, text.ru, text.simple, text.uk, text.us. Do not put brackets and do "
+"not tranlsate what's inside brackets ]"
+msgstr "text.de"
+
+#. Description
+#: ../brltty.templates:28
+msgid "Choose a Braille translation table"
+msgstr "Selecteer een braille-vertaaltabel"
+
+#. Description
+#: ../brltty.templates:34
+msgid "Choose a speech driver to use"
+msgstr ""
+
+#. Description
+#: ../brltty.templates:34
+msgid ""
+"BRLTTY can optionally interface with speech synthesis systems to read the "
+"current line to you.  If you are planning to use this functionality, select "
+"an appropriate speech driver now."
+msgstr ""
+
+#~ msgid "TSI [Navigator 20/40/80 / PowerBraille 40/65/80]"
+#~ msgstr "Alva [ABT3xx/Delphi/Satellite]"
+
+#~ msgid "text.us"
+#~ msgstr "text.de"
--- brltty-3.3.1.orig/debian/po/POTFILES.in
+++ brltty-3.3.1/debian/po/POTFILES.in
@@ -0,0 +1 @@
+[type: gettext/rfc822deb] brltty.templates
--- brltty-3.3.1.orig/debian/po/templates.pot
+++ brltty-3.3.1/debian/po/templates.pot
@@ -0,0 +1,82 @@
+#
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+#    Developers do not need to manually edit POT or PO files.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-08-09 07:50+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"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Description
+#: ../brltty.templates:4
+msgid "Let debconf manage brltty configuration file?"
+msgstr ""
+
+#. Description
+#: ../brltty.templates:4
+msgid ""
+"If you accept, debconf will ask you some essential questions required to set "
+"brltty up with your hardware.  The configuration file /etc/brltty.conf will "
+"then be automatically generated from the data you provided."
+msgstr ""
+
+#. Description
+#: ../brltty.templates:4
+msgid ""
+"You should not edit /etc/brltty.conf by hand if you accept here. You should "
+"then use \"dpkg-reconfigure brltty\" to change the configuration."
+msgstr ""
+
+#. Description
+#: ../brltty.templates:16
+msgid "Which device is your Braille terminal connected to?"
+msgstr ""
+
+#. Description
+#: ../brltty.templates:22
+msgid "Choose the appropriate Braille driver"
+msgstr ""
+
+#. DefaultChoice
+#: ../brltty.templates:27
+msgid ""
+"text.us [ translators : you may insert here another choice than text.us. "
+"Choices are : text.de, text.es, text.fr, text.no-h, text.no-p, text.se1, "
+"text.se2, text.ru, text.simple, text.uk, text.us. Do not put brackets and do "
+"not tranlsate what's inside brackets ]"
+msgstr ""
+
+#. Description
+#: ../brltty.templates:28
+msgid "Choose a Braille translation table"
+msgstr ""
+
+#. Description
+#: ../brltty.templates:34
+msgid "Choose a speech driver to use"
+msgstr ""
+
+#. Description
+#: ../brltty.templates:34
+msgid ""
+"BRLTTY can optionally interface with speech synthesis systems to read the "
+"current line to you.  If you are planning to use this functionality, select "
+"an appropriate speech driver now."
+msgstr ""
--- brltty-3.3.1.orig/debian/po/fr.po
+++ brltty-3.3.1/debian/po/fr.po
@@ -0,0 +1,90 @@
+#
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+#    Developers do not need to manually edit POT or PO files.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: brltty (3.2-5)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-08-09 07:50+0200\n"
+"PO-Revision-Date: 2003-08-19 21:14+0200\n"
+"Last-Translator: Christian Perrier <bubulle@debian.org>\n"
+"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=iso-8859-15\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Description
+#: ../brltty.templates:4
+msgid "Let debconf manage brltty configuration file?"
+msgstr "Faut-il gérer le fichier de configuration de brltty avec debconf ?"
+
+#. Description
+#: ../brltty.templates:4
+msgid ""
+"If you accept, debconf will ask you some essential questions required to set "
+"brltty up with your hardware.  The configuration file /etc/brltty.conf will "
+"then be automatically generated from the data you provided."
+msgstr ""
+"Si vous acceptez, debconf posera quelques questions indispensables à la "
+"configuration de brltty pour votre matériel. Le fichier de configuration /"
+"etc/brltty.conf sera alors automatiquement généré à partir de vos choix."
+
+#. Description
+#: ../brltty.templates:4
+msgid ""
+"You should not edit /etc/brltty.conf by hand if you accept here. You should "
+"then use \"dpkg-reconfigure brltty\" to change the configuration."
+msgstr ""
+"Vous ne devrez ensuite pas modifier /etc/brltty.conf vous-même si vous "
+"acceptez ici. Si cela est nécessaire, vous devrez utiliser la commande "
+"« dpkg-reconfigure brltty »."
+
+#. Description
+#: ../brltty.templates:16
+msgid "Which device is your Braille terminal connected to?"
+msgstr "À quel périphérique votre terminal Braille est-il connecté ?"
+
+#. Description
+#: ../brltty.templates:22
+msgid "Choose the appropriate Braille driver"
+msgstr "Veuillez choisir le pilote Braille adapté"
+
+#. DefaultChoice
+#: ../brltty.templates:27
+msgid ""
+"text.us [ translators : you may insert here another choice than text.us. "
+"Choices are : text.de, text.es, text.fr, text.no-h, text.no-p, text.se1, "
+"text.se2, text.ru, text.simple, text.uk, text.us. Do not put brackets and do "
+"not tranlsate what's inside brackets ]"
+msgstr "text.fr"
+
+#. Description
+#: ../brltty.templates:28
+msgid "Choose a Braille translation table"
+msgstr "Veuillez choisir une table de conversion Braille"
+
+#. Description
+#: ../brltty.templates:34
+msgid "Choose a speech driver to use"
+msgstr "Veuillez choisir le pilote de synthèse vocale qui sera utilisé"
+
+#. Description
+#: ../brltty.templates:34
+msgid ""
+"BRLTTY can optionally interface with speech synthesis systems to read the "
+"current line to you.  If you are planning to use this functionality, select "
+"an appropriate speech driver now."
+msgstr ""
+"Si vous le souhaitez, BRLTTY peut être couplé avec un système de synthèse "
+"vocale qui pourra lire la ligne en cours à votre place. Si vous souhaitez "
+"utiliser cette fonctionnalité, veuillez choisir le pilote approprié."
--- brltty-3.3.1.orig/debian/po/pt_BR.po
+++ brltty-3.3.1/debian/po/pt_BR.po
@@ -0,0 +1,129 @@
+#
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+#    Developers do not need to manually edit POT or PO files.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: brltty_3.2-5\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-08-09 07:50+0200\n"
+"PO-Revision-Date: 2003-08-21 21:15-0300\n"
+"Last-Translator: André Luís Lopes <andrelop@debian.org>\n"
+"Language-Team: Debian-BR Project <debian-l10n-portuguese@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Description
+#: ../brltty.templates:4
+msgid "Let debconf manage brltty configuration file?"
+msgstr "Permitir ao debconf gerenciar o arquivo de configuração do brltty ?"
+
+#. Description
+#: ../brltty.templates:4
+msgid ""
+"If you accept, debconf will ask you some essential questions required to set "
+"brltty up with your hardware.  The configuration file /etc/brltty.conf will "
+"then be automatically generated from the data you provided."
+msgstr ""
+"Caso você aceite, o debconf irá fazer algumas perguntas essenciais "
+"necessárias para que o brltty funcione com seu hardware. O arquivo de "
+"configuração /etc/brltty.conf irá então ser automaticamente gerado com base "
+"nos dados que você fornecer."
+
+#. Description
+#: ../brltty.templates:4
+msgid ""
+"You should not edit /etc/brltty.conf by hand if you accept here. You should "
+"then use \"dpkg-reconfigure brltty\" to change the configuration."
+msgstr ""
+"Você não deverá editar o arquivo /etc/brltty.conf manualmente caso você "
+"aceite que o debconf gerencie a configuração do brltty. Use deverá usar o "
+"comando \"dpkg-reconfigure brltty\" para mudar a configuração."
+
+#. Description
+#: ../brltty.templates:16
+msgid "Which device is your Braille terminal connected to?"
+msgstr "Em qual dispositivo seu terminal Braille está conectado ?"
+
+#. Description
+#: ../brltty.templates:22
+msgid "Choose the appropriate Braille driver"
+msgstr "Escolha o controlador Braille apropriado"
+
+#. DefaultChoice
+#: ../brltty.templates:27
+msgid ""
+"text.us [ translators : you may insert here another choice than text.us. "
+"Choices are : text.de, text.es, text.fr, text.no-h, text.no-p, text.se1, "
+"text.se2, text.ru, text.simple, text.uk, text.us. Do not put brackets and do "
+"not tranlsate what's inside brackets ]"
+msgstr "text.us"
+
+#. Description
+#: ../brltty.templates:28
+msgid "Choose a Braille translation table"
+msgstr "Escolha uma tabela de tradução braille."
+
+#. Description
+#: ../brltty.templates:34
+msgid "Choose a speech driver to use"
+msgstr "Escolha um controlar de fala para ser usado"
+
+#. Description
+#: ../brltty.templates:34
+msgid ""
+"BRLTTY can optionally interface with speech synthesis systems to read the "
+"current line to you.  If you are planning to use this functionality, select "
+"an appropriate speech driver now."
+msgstr ""
+"O BRLTTY pode opcionalmente interfacear com sistemas de síntese de voz para "
+"ler a linha atual para você. Caso você esteja planejando usar esta "
+"funcionalidade, selecione um controlador de fala aproriado agora."
+
+#~ msgid "/dev/ttyS0"
+#~ msgstr "/dev/ttyS0"
+
+#~ msgid ""
+#~ "Alva [ABT3xx/Delphi/Satellite], BrailleLite [18/40], BrailleNote [18/32], "
+#~ "CombiBraille [25/45/85], EcoBraille [20/40/80], EuroBraille [Clio-"
+#~ "noteBraille 40], HandyTech [Bookworm/Wave/Star/Modular], LogText [32], "
+#~ "MultiBraille [MB125CR/MB145CR/MB185CR], MDV (protocol 5) [MB208/MB408L/"
+#~ "MB408S], MiniBraille [20], Papenmeier, TSI [Navigator 20/40/80 / "
+#~ "PowerBraille 40/65/80], Vario/RBT (emulation 1) [40/80], VideoBraille "
+#~ "[40], Vario/RBT (emulation 2) [40/80], Voyager [44/70 (USB)], "
+#~ "VisioBraille [20/40]"
+#~ msgstr ""
+#~ "Alva [ABT3xx/Delphi/Satellite], BrailleLite [18/40], BrailleNote [18/32], "
+#~ "CombiBraille [25/45/85], EcoBraille [20/40/80], EuroBraille [Clio-"
+#~ "noteBraille 40], HandyTech [Bookworm/Wave/Star/Modular], LogText [32], "
+#~ "MultiBraille [MB125CR/MB145CR/MB185CR], MDV (protocol 5) [MB208/MB408L/"
+#~ "MB408S], MiniBraille [20], Papenmeier, TSI [Navigator 20/40/80 / "
+#~ "PowerBraille 40/65/80], Vario/RBT (emulation 1) [40/80], VideoBraille "
+#~ "[40], Vario/RBT (emulation 2) [40/80], Voyager [44/70 (USB)], "
+#~ "VisioBraille [20/40]"
+
+#~ msgid ""
+#~ "text.de, text.es, text.fr, text.no-h, text.no-p, text.se1, text.se2, text."
+#~ "ru, text.simple, text.uk, text.us"
+#~ msgstr ""
+#~ "text.de, text.es, text.fr, text.no-h, text.no-p, text.se1, text.se2, text."
+#~ "ru, text.simple, text.uk, text.us"
+
+#~ msgid ""
+#~ "Alva [Delphi], BrailleLite, CombiBraille, External Speech, Festival Text "
+#~ "to Speech Package, Generic Say (pipes to /usr/local/bin/say), Televox, No "
+#~ "Speech"
+#~ msgstr ""
+#~ "Alva [Delphi], BrailleLite, CombiBraille, External Speech, Festival Text "
+#~ "to Speech Package, Generic Say (pipes to /usr/local/bin/say), Televox, No "
+#~ "Speech"
--- brltty-3.3.1.orig/debian/brltty.prerm
+++ brltty-3.3.1/debian/brltty.prerm
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+set -e
+
+#DEBHELPER#
+
+
--- brltty-3.3.1.orig/debian/libbrlapi-dev.docs
+++ brltty-3.3.1/debian/libbrlapi-dev.docs
@@ -0,0 +1,5 @@
+Documents/BrlAPI.sgml
+Documents/BrlAPI.txt
+Documents/BrlAPI-HTML/
+Documents/BrlAPIref-HTML/
+
