--- brltty-4.1.orig/acdir/config.sub +++ brltty-4.1/acdir/config.sub @@ -1,10 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, -# Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 +# Free Software Foundation, Inc. -timestamp='2006-09-20' +timestamp='2009-04-17' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -72,8 +72,8 @@ version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, +2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -122,6 +122,7 @@ case $maybe_os in nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ + kopensolaris*-gnu* | \ storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` @@ -245,17 +246,20 @@ | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ - | fr30 | frv \ + | fido | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ + | lm32 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | mcore \ + | maxq | mb | microblaze | mcore | mep | metag \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ - | mips64vr | mips64vrel \ + | mips64octeon | mips64octeonel \ | mips64orion | mips64orionel \ + | mips64r5900 | mips64r5900el \ + | mips64vr | mips64vrel \ | mips64vr4100 | mips64vr4100el \ | mips64vr4300 | mips64vr4300el \ | mips64vr5000 | mips64vr5000el \ @@ -268,6 +272,7 @@ | mipsisa64sr71k | mipsisa64sr71kel \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ + | moxie \ | mt \ | msp430 \ | nios | nios2 \ @@ -277,7 +282,7 @@ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ | score \ - | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ + | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ @@ -286,7 +291,7 @@ | v850 | v850e \ | we32k \ | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ - | z8k) + | z8k | z80) basic_machine=$basic_machine-unknown ;; m6811 | m68hc11 | m6812 | m68hc12) @@ -324,19 +329,22 @@ | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ - | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ + | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ + | lm32-* \ | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | maxq-* | mcore-* \ + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \ - | mips64vr-* | mips64vrel-* \ + | mips64octeon-* | mips64octeonel-* \ | mips64orion-* | mips64orionel-* \ + | mips64r5900-* | mips64r5900el-* \ + | mips64vr-* | mips64vrel-* \ | mips64vr4100-* | mips64vr4100el-* \ | mips64vr4300-* | mips64vr4300el-* \ | mips64vr5000-* | mips64vr5000el-* \ @@ -358,20 +366,24 @@ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ | pyramid-* \ | romp-* | rs6000-* \ - | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ + | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ | sparclite-* \ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ | tahoe-* | thumb-* \ - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \ | tron-* \ | v850-* | v850e-* | vax-* \ | we32k-* \ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ - | xstormy16-* | xtensa-* \ + | xstormy16-* | xtensa*-* \ | ymp-* \ - | z8k-*) + | z8k-* | z80-*) + ;; + # Recognize the basic CPU types without company name, with glob match. + xtensa*) + basic_machine=$basic_machine-unknown ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. @@ -435,6 +447,10 @@ basic_machine=m68k-apollo os=-bsd ;; + aros) + basic_machine=i386-pc + os=-aros + ;; aux) basic_machine=m68k-apple os=-aux @@ -443,10 +459,22 @@ basic_machine=ns32k-sequent os=-dynix ;; + blackfin) + basic_machine=bfin-unknown + os=-linux + ;; + blackfin-*) + basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; c90) basic_machine=c90-cray os=-unicos ;; + cegcc) + basic_machine=arm-unknown + os=-cegcc + ;; convex-c1) basic_machine=c1-convex os=-bsd @@ -475,8 +503,8 @@ basic_machine=craynv-cray os=-unicosmp ;; - cr16c) - basic_machine=cr16c-unknown + cr16) + basic_machine=cr16-unknown os=-elf ;; crds | unos) @@ -514,6 +542,10 @@ basic_machine=m88k-motorola os=-sysv3 ;; + dicos) + basic_machine=i686-pc + os=-dicos + ;; djgpp) basic_machine=i586-pc os=-msdosdjgpp @@ -668,6 +700,14 @@ basic_machine=m68k-isi os=-sysv ;; + m68knommu) + basic_machine=m68k-unknown + os=-linux + ;; + m68knommu-*) + basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; m88k-omron*) basic_machine=m88k-omron ;; @@ -683,6 +723,10 @@ basic_machine=i386-pc os=-mingw32 ;; + mingw32ce) + basic_machine=arm-unknown + os=-mingw32ce + ;; miniframe) basic_machine=m68000-convergent ;; @@ -809,6 +853,14 @@ basic_machine=i860-intel os=-osf ;; + parisc) + basic_machine=hppa-unknown + os=-linux + ;; + parisc-*) + basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; pbd) basic_machine=sparc-tti ;; @@ -925,6 +977,9 @@ basic_machine=sh-hitachi os=-hms ;; + sh5el) + basic_machine=sh5le-unknown + ;; sh64) basic_machine=sh64-unknown ;; @@ -1014,6 +1069,10 @@ basic_machine=tic6x-unknown os=-coff ;; + tile*) + basic_machine=tile-unknown + os=-linux-gnu + ;; tx39) basic_machine=mipstx39-unknown ;; @@ -1089,6 +1148,10 @@ basic_machine=z8k-unknown os=-sim ;; + z80-*-coff) + basic_machine=z80-unknown + os=-sim + ;; none) basic_machine=none-none os=-none @@ -1127,7 +1190,7 @@ we32k) basic_machine=we32k-att ;; - sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele) + sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) basic_machine=sh-unknown ;; sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) @@ -1199,8 +1262,9 @@ -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ + | -kopensolaris* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ - | -aos* \ + | -aos* | -aros* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ @@ -1209,7 +1273,7 @@ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -chorusos* | -chorusrdb* \ + | -chorusos* | -chorusrdb* | -cegcc* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* \ @@ -1219,7 +1283,7 @@ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers*) + | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1349,6 +1413,9 @@ -zvmoe) os=-zvmoe ;; + -dicos*) + os=-dicos + ;; -none) ;; *) @@ -1414,6 +1481,9 @@ m68*-cisco) os=-aout ;; + mep-*) + os=-elf + ;; mips*-cisco) os=-elf ;; --- brltty-4.1.orig/acdir/config.guess +++ brltty-4.1/acdir/config.guess @@ -1,10 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, -# Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 +# Free Software Foundation, Inc. -timestamp='2006-07-02' +timestamp='2009-04-27' # 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 @@ -56,8 +56,8 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, +2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -161,6 +161,7 @@ arm*) machine=arm-unknown ;; sh3el) machine=shl-unknown ;; sh3eb) machine=sh-unknown ;; + sh5el) machine=sh5le-unknown ;; *) machine=${UNAME_MACHINE_ARCH}-unknown ;; esac # The Operating System including object format, if it has switched @@ -323,14 +324,30 @@ case `/usr/bin/uname -p` in sparc) echo sparc-icl-nx7; exit ;; esac ;; + s390x:SunOS:*:*) + echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; sun4H:SunOS:5.*:*) echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; - i86pc:SunOS:5.*:*) - echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) + eval $set_cc_for_build + SUN_ARCH="i386" + # If there is a compiler, see if it is configured for 64-bit objects. + # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. + # This test works for both compilers. + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + SUN_ARCH="x86_64" + fi + fi + echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; sun4*:SunOS:6*:*) # According to config.sub, this is the proper way to canonicalize @@ -531,7 +548,7 @@ echo rs6000-ibm-aix3.2 fi exit ;; - *:AIX:*:[45]) + *:AIX:*:[456]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 @@ -780,7 +797,7 @@ i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin exit ;; - i*:MINGW*:*) + *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; i*:windows32*:*) @@ -790,12 +807,18 @@ i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit ;; - x86:Interix*:[3456]*) - echo i586-pc-interix${UNAME_RELEASE} - exit ;; - EM64T:Interix*:[3456]*) - echo x86_64-unknown-interix${UNAME_RELEASE} - exit ;; + *:Interix*:[3456]*) + case ${UNAME_MACHINE} in + x86) + echo i586-pc-interix${UNAME_RELEASE} + exit ;; + EM64T | authenticamd | genuineintel) + echo x86_64-unknown-interix${UNAME_RELEASE} + exit ;; + IA64) + echo ia64-unknown-interix${UNAME_RELEASE} + exit ;; + esac ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks exit ;; @@ -829,7 +852,14 @@ echo ${UNAME_MACHINE}-pc-minix exit ;; arm*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + eval $set_cc_for_build + if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_EABI__ + then + echo ${UNAME_MACHINE}-unknown-linux-gnu + else + echo ${UNAME_MACHINE}-unknown-linux-gnueabi + fi exit ;; avr32*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu @@ -921,6 +951,9 @@ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} exit ;; + padre:Linux:*:*) + echo sparc-unknown-linux-gnu + exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in @@ -950,6 +983,9 @@ x86_64:Linux:*:*) echo x86_64-unknown-linux-gnu exit ;; + xtensa*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; i*86:Linux:*:*) # The BFD linker knows what the default object file format is, so # first see if it will tell us. cd to the root directory to prevent @@ -968,9 +1004,6 @@ a.out-i386-linux) echo "${UNAME_MACHINE}-pc-linux-gnuaout" exit ;; - coff-i386) - echo "${UNAME_MACHINE}-pc-linux-gnucoff" - exit ;; "") # Either a pre-BFD a.out linker (linux-gnuoldld) or # one that does not give us useful --help. @@ -1085,8 +1118,11 @@ pc:*:*:*) # Left here for compatibility: # uname -m prints for DJGPP always 'pc', but it prints nothing about - # the processor, so we play safe by assuming i386. - echo i386-pc-msdosdjgpp + # the processor, so we play safe by assuming i586. + # Note: whatever this is, it MUST be the same as what config.sub + # prints for the "djgpp" host, or else GDB configury will decide that + # this is a cross-build. + echo i586-pc-msdosdjgpp exit ;; Intel:Mach:3*:*) echo i386-pc-mach3 @@ -1124,6 +1160,16 @@ 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ && { echo i486-ncr-sysv4; exit; } ;; + NCR*:*:4.2:* | MPRAS*:*:4.2:*) + OS_REL='.3' + test -r /etc/.relid \ + && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4.3${OS_REL}; exit; } + /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } + /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) echo m68k-unknown-lynxos${UNAME_RELEASE} exit ;; @@ -1199,6 +1245,9 @@ BePC:BeOS:*:*) # BeOS running on Intel PC compatible. echo i586-pc-beos exit ;; + BePC:Haiku:*:*) # Haiku running on Intel PC compatible. + echo i586-pc-haiku + exit ;; SX-4:SUPER-UX:*:*) echo sx4-nec-superux${UNAME_RELEASE} exit ;; @@ -1208,6 +1257,15 @@ SX-6:SUPER-UX:*:*) echo sx6-nec-superux${UNAME_RELEASE} exit ;; + SX-7:SUPER-UX:*:*) + echo sx7-nec-superux${UNAME_RELEASE} + exit ;; + SX-8:SUPER-UX:*:*) + echo sx8-nec-superux${UNAME_RELEASE} + exit ;; + SX-8R:SUPER-UX:*:*) + echo sx8r-nec-superux${UNAME_RELEASE} + exit ;; Power*:Rhapsody:*:*) echo powerpc-apple-rhapsody${UNAME_RELEASE} exit ;; @@ -1298,6 +1356,9 @@ i*86:rdos:*:*) echo ${UNAME_MACHINE}-pc-rdos exit ;; + i*86:AROS:*:*) + echo ${UNAME_MACHINE}-pc-aros + exit ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 @@ -1458,9 +1519,9 @@ the operating system you are using. It is advised that you download the most up to date version of the config scripts from - http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess + http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD and - http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub + http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD If the version you run ($0) is already up to date, please send the following data and any information you think might be --- brltty-4.1.orig/Drivers/Braille/EuroBraille/eu_clio.c +++ brltty-4.1/Drivers/Braille/EuroBraille/eu_clio.c @@ -80,7 +80,7 @@ { enum clioModelType type; char modelCode[3]; - char modelDesc[30]; + const char *modelDesc; } t_clioModelType; /** Static Local Variables */ @@ -91,7 +91,7 @@ static unsigned char brlFirmwareVersion[21]; static int routingMode = BRL_BLK_ROUTE; static int refreshDisplay = 0; -static struct s_clioModelType clioModels[] = +static const struct s_clioModelType clioModels[] = { {UNKNOWN, "", ""}, {CE2, "CE2", "Clio-EuroBraille 20"}, --- brltty-4.1.orig/Drivers/Braille/VisioBraille/braille.c +++ brltty-4.1/Drivers/Braille/VisioBraille/braille.c @@ -258,10 +258,10 @@ static int brl_writeWindow(BrailleDisplay *brl, const wchar_t *text) { /* The following table defines how internal brltty format is converted to */ - /* VisioBraille format. Do *NOT* modify this table. */ + /* VisioBraille format. */ /* The table is declared static so that it is in data segment and not */ /* in the stack */ - static TranslationTable outputTable = { + static const TranslationTable outputTable = { [0] = 0X20, [BRL_DOT1] = 0X41, [BRL_DOT1 | BRL_DOT2] = 0X42, --- brltty-4.1.orig/Drivers/Braille/HandyTech/braille.c +++ brltty-4.1/Drivers/Braille/HandyTech/braille.c @@ -709,11 +709,7 @@ static int writeEvolutionCells (BrailleDisplay *brl) { - unsigned char buffer[model->textCells]; - - memcpy(buffer, rawData, model->textCells); - - return writeExtendedPacket(brl, HT_EXTPKT_Braille, buffer, sizeof(buffer)); + return writeExtendedPacket(brl, HT_EXTPKT_Braille, rawData, model->textCells); } static int --- brltty-4.1.orig/Hotplug/udev.rules +++ brltty-4.1/Hotplug/udev.rules @@ -93,7 +93,7 @@ LABEL="brltty_add" SYMLINK+="brltty/$env{BRLTTY_DRIVER}-$env{BRLTTY_DEVICE}" -RUN+="/bin/brltty -E -P$env{BRLTTY_PID_FILE}" +RUN+="/sbin/brltty -E -P$env{BRLTTY_PID_FILE}" GOTO="brltty_end" LABEL="brltty_remove" --- brltty-4.1.orig/Hotplug/upstart.job +++ brltty-4.1/Hotplug/upstart.job @@ -13,4 +13,4 @@ start on startup console output respawn -exec /bin/brltty -n +exec /sbin/brltty -n --- brltty-4.1.orig/debian/cl-brlapi.install +++ brltty-4.1/debian/cl-brlapi.install @@ -0,0 +1 @@ +Bindings/Lisp/brlapi.* usr/share/common-lisp/source/cl-brlapi/ --- brltty-4.1.orig/debian/compat +++ brltty-4.1/debian/compat @@ -0,0 +1 @@ +5 --- brltty-4.1.orig/debian/watch +++ brltty-4.1/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://mielke.cc/brltty/releases/ brltty-([0-9.]+)\.tar\.gz debian uupdate --- brltty-4.1.orig/debian/libbrlapi-dev.manpages +++ brltty-4.1/debian/libbrlapi-dev.manpages @@ -0,0 +1,2 @@ +debian/tmp/usr/share/man/man3/* + --- brltty-4.1.orig/debian/brltty.install +++ brltty-4.1/debian/brltty.install @@ -0,0 +1,5 @@ +debian/tmp/etc/brltty etc +debian/tmp/sbin/{brltty,vstp} sbin +debian/tmp/lib/brltty lib +debian/initramfs/hooks/brltty usr/share/initramfs-tools/hooks +debian/initramfs/scripts/init-premount/brltty usr/share/initramfs-tools/scripts/init-premount --- brltty-4.1.orig/debian/brltty.initramfs-top +++ brltty-4.1/debian/brltty.initramfs-top @@ -0,0 +1,22 @@ +#! /bin/sh +set -e + +OPTION=FRAMEBUFFER +PREREQ="framebuffer console_setup" + +prereqs () { + echo "$PREREQ" +} + +case $1 in + prereqs) + prereqs + exit 0 + ;; +esac + +if grep -q braille=ask /proc/cmdline; then + brltty-setup || true +fi + +exit 0 --- brltty-4.1.orig/debian/libbrlapi0.5.install +++ brltty-4.1/debian/libbrlapi0.5.install @@ -0,0 +1 @@ +debian/tmp/lib/lib*.so.* lib --- brltty-4.1.orig/debian/brltty.default +++ brltty-4.1/debian/brltty.default @@ -0,0 +1,13 @@ +# This is a configuration file for /etc/init.d/brltty; it allows you to +# perform common modifications to the behavior of the brltty daemon +# startup. + +# Arguments to pass to BRLTTY +ARGUMENTS="-q" + +# If true (or yes) BRLTTY will be started during initramfs execution. +# If you change this setting, you have to run "update-initramfs -u" to have it +# take effect. If this setting is on, "update-initramfs -u" also needs to be +# run if /etc/brltty.conf gets changed. +START_IN_INITRAMFS=false + --- brltty-4.1.orig/debian/brltty.postrm +++ brltty-4.1/debian/brltty.postrm @@ -0,0 +1,12 @@ +#!/bin/sh + +set -e + +if test "$1" = "purge" +then + rm -f /etc/brlapi.key +fi + +#update-rc.d brltty remove > /dev/null + +#DEBHELPER# --- brltty-4.1.orig/debian/rules +++ brltty-4.1/debian/rules @@ -0,0 +1,220 @@ +#!/usr/bin/make -f + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +export JHOME=/usr/lib/jvm/default-java + +PACKAGE=brltty +VERSION=$(shell dpkg-parsechangelog | grep ^Version: | cut -d ' ' -f 2) +DEB_HOST_ARCH=$(shell dpkg-architecture -qDEB_HOST_ARCH) +# gcj does not work on alpha +ifeq ($(DEB_HOST_ARCH),alpha) +export DH_OPTIONS=-Nlibbrlapi-jni -Nlibbrlapi-java +DISABLE_JAVA_SUPPORT=1 +endif +# gcj does not work on arm +ifeq ($(DEB_HOST_ARCH),arm) +export DH_OPTIONS=-Nlibbrlapi-jni -Nlibbrlapi-java +DISABLE_JAVA_SUPPORT=1 +endif +# gcj does not work on hppa +ifeq ($(DEB_HOST_ARCH),hppa) +export DH_OPTIONS=-Nlibbrlapi-jni -Nlibbrlapi-java +DISABLE_JAVA_SUPPORT=1 +endif +# the same seems to hold for m68k (200712) +ifeq ($(DEB_HOST_ARCH),m68k) +export DH_OPTIONS=-Nlibbrlapi-jni -Nlibbrlapi-java +DISABLE_JAVA_SUPPORT=1 +endif +# hurd-i386 as well(200803) +ifeq ($(DEB_HOST_ARCH),hurd-i386) +export DH_OPTIONS=-Nlibbrlapi-jni -Nlibbrlapi-java +DISABLE_JAVA_SUPPORT=1 +endif + +PATH := $(JHOME)/bin:$(PATH) + +DEB_CFLAGS= -I$(JHOME)/include -I$(JHOME)/include/linux +UDEB_CFLAGS=-Os -fomit-frame-pointer $(DEB_CFLAGS) +UDEB_DISABLE=speech-support pcm-support midi-support fm-support contracted-braille \ + api pm-configfile gpm iconv icu x +UDEB_CONFIGURE_OPTIONS=--with-braille-driver=-vr,all \ + --with-braille-device=usb: --with-screen-driver=-as,-sc,all \ + --without-init-path --without-curses \ + $(patsubst %,--disable-%,$(UDEB_DISABLE)) +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) + +PYVERS := $(shell pyversions -vr) +PYOTHERS:= $(filter-out $(shell pyversions -vd), $(PYVERS)) + +binary: binary-indep binary-arch + +clean: + dh_testdir + dh_testroot + rm -f build-*stamp + rm -rf build-brltty* build-py* + rm -f Bindings/Python/bindings.o + -test -r /usr/share/misc/config.sub && \ + cp -f /usr/share/misc/config.sub acdir/config.sub + -test -r /usr/share/misc/config.guess && \ + cp -f /usr/share/misc/config.guess acdir/config.guess + + dh_clean + +configure: build-brltty/config.status +build-brltty/config.status: + mkdir build-brltty + cd build-brltty && CFLAGS="$(DEB_CFLAGS)" ../configure --bindir=/sbin --mandir=/usr/share/man \ + --disable-stripping \ + --without-viavoice --without-theta --without-swift + +build-otherpy: $(PYOTHERS:%=build-py%-stamp) +build-py%-stamp: + mkdir -p build-py$* + cd build-py$* && PYTHON=python$* CFLAGS="$(DEB_CFLAGS)" ../configure --bindir=/sbin --mandir=/usr/share/man \ + --without-viavoice --without-theta --without-swift + $(MAKE) -C build-py$*/Bindings/Python \ + PYTHON=/usr/bin/python$* \ + PYTHON_VERSION=$* \ + PYTHON_CPPFLAGS='-I/usr/include/python$*' \ + PYTHON_LIBS='-L/usr/lib/python$*/config -lpython$*' \ + PYTHON_SITE_PKG=$(call py_libdir,$*) + touch $@ + +configure-udeb: build-brltty-udeb/config.status +build-brltty-udeb/config.status: + mkdir build-brltty-udeb + cd build-brltty-udeb && \ + CFLAGS="$(UDEB_CFLAGS)" ../configure --bindir=/sbin \ + $(UDEB_CONFIGURE_OPTIONS) + +build: build-brltty build-udeb build-otherpy + +build-brltty: build-stamp +build-stamp: configure + dh_testdir + + $(MAKE) -C build-brltty + $(MAKE) -C build-brltty/Documents + + touch $@ + +build-udeb: build-udeb-stamp +build-udeb-stamp: configure-udeb + dh_testdir + + $(MAKE) -C build-brltty-udeb + + touch $@ + +# Build architecture-independent files here. +binary-indep: ; +# We have nothing to do here. + +# Build architecture-dependent files here. +binary-arch: brltty brltty-udeb + +brltty: build-brltty build-otherpy + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + $(MAKE) -C build-brltty/Documents + $(MAKE) -C build-brltty install INSTALL_ROOT=`pwd`/debian/tmp + for pv in $(PYOTHERS); do \ + $(MAKE) -C build-py$$pv/Bindings/Python install \ + INSTALL_ROOT=`pwd`/debian/tmp \ + PYTHON=/usr/bin/python$$pv; \ + done + dh_install + dh_installdocs + dh_installexamples -p$@ + for file in Drivers/Braille/*/README*; \ + do cp $$file `pwd`/debian/$(PACKAGE)/usr/share/doc/brltty/`basename $$(dirname $$file)`.`basename $$file`; \ + done + cp debian/brltty-udeb.udev.rules debian/$@/lib/udev/rules.d/85-brltty.rules + install -m755 debian/brltty-udeb.sh debian/$@/lib/brltty/brltty.sh + install -m755 debian/brltty-setup debian/$@/sbin/brltty-setup + install -m755 debian/brltty.initramfs-sh debian/$@/usr/share/brltty/initramfs/brltty.sh + install -m755 debian/brltty.initramfs-top debian/$@/usr/share/initramfs-tools/scripts/init-top/brltty + install -m755 debian/brltty.ubiquity debian/$@/usr/lib/ubiquity/target-config/31brltty + # -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_installman + dh_pysupport -ppython-brlapi + mv debian/brltty/lib/brltty/libbrlttysfl.so \ + debian/brltty-flite/lib/brltty + mv debian/brltty/lib/brltty/libbrlttyssd.so \ + debian/brltty-speechd/lib/brltty + mv debian/brltty/lib/brltty/libbrlttybxw.so \ + debian/brltty-x11/lib/brltty + mv debian/brltty/etc/brltty/brltty-xw.hlp \ + debian/brltty-x11/etc/brltty + mv debian/brltty/usr/share/doc/brltty/XWindow.README \ + debian/brltty-x11/usr/share/doc/brltty-x11/ + mv debian/brltty/lib/brltty/libbrlttyxas.so \ + debian/brltty-x11/lib/brltty +ifneq ($(DISABLE_JAVA_SUPPORT),1) + mv debian/tmp/usr/share/java/brlapi.jar \ + debian/libbrlapi-java/usr/share/java + chmod 0644 debian/libbrlapi-java/usr/share/java/brlapi.jar +endif + dh_link -p$@ -plibbrlapi0.5 -plibbrlapi-dev + dh_strip + dh_compress + dh_fixperms + dh_makeshlibs -n -p$@ + dh_makeshlibs -a -Nbrltty-udeb + dh_installdeb -a -i -Nbrltty-udeb + dh_shlibdeps -a -Nbrltty-udeb + dh_gencontrol -a -i -Nbrltty-udeb + dh_md5sums -a -i -Nbrltty-udeb + dh_builddeb -a -i -Nbrltty-udeb + +brltty-udeb: build-udeb + dh_testdir + dh_testroot + dh_installdirs -pbrltty-udeb + + $(MAKE) -C build-brltty-udeb install INSTALL_ROOT=`pwd`/debian/brltty-udeb + + # temporary fix + rm -Rf debian/brltty-udeb/share + + cp debian/brltty-udeb.prebaseconfig debian/brltty-udeb/usr/lib/finish-install.d/05brltty + chmod 0755 debian/brltty-udeb/usr/lib/finish-install.d/05brltty + rm -f debian/brltty-udeb/sbin/brltty-* + rm -Rf debian/brltty-udeb/usr/share + # Strip comments and whitespaces from translation tables + cd debian/brltty-udeb/etc/brltty && \ + for file in *.tt? *.at? *.ktb; do \ + sed -e 's/ *#.*//' -e 's/[ ]\+/ /g' $$file | sed -n '/./p' > $$file.tmp && \ + mv $$file.tmp $$file; \ + done + # It is sad, but help files are not really essential, but they are + # fairly large. + rm debian/brltty-udeb/etc/brltty/*.hlp + #rm -Rf debian/brltty-udeb/lib + cp debian/brltty-udeb.init debian/$@/lib/debian-installer-startup.d/S37brltty + chmod +x debian/$@/lib/debian-installer-startup.d/S37brltty + cp debian/brltty-udeb.udev.rules debian/$@/lib/udev/rules.d/85-brltty.rules + install -m755 debian/brltty-setup debian/$@/sbin/brltty-setup + cp debian/brltty-udeb.sh debian/$@/lib/brltty/brltty.sh + chmod +x debian/$@/lib/brltty/brltty.sh + dh_strip -p$@ + dh_fixperms -p$@ + dh_installdeb -p$@ + dh_shlibdeps -p$@ + dh_gencontrol -p$@ + # Check that we didn't accidentally link against something outside of + # d-i world + grep Depends: debian/brltty-udeb/DEBIAN/control | perl -ne 'map {unless (/-udeb/) {print $$_; exit 1}} split /,/' + dh_builddeb -p$@ + +.PHONY: brltty brltty-udeb build build-brltty build-udeb clean binary-indep binary-arch binary --- brltty-4.1.orig/debian/brltty-udeb.udev.rules +++ brltty-4.1/debian/brltty-udeb.udev.rules @@ -0,0 +1,61 @@ +# udev rules file for brltty +# + +ACTION!="add", GOTO="brltty_rules_end" +SUBSYSTEM!="usb_device", GOTO="brltty_rules_end" + +# Alva +ATTRS{idVendor}=="06b0", ATTRS{idProduct}=="0001", RUN+="/lib/brltty/brltty.sh -b al -d usb:" +ATTRS{idVendor}=="0798", ATTRS{idProduct}=="0640", RUN+="/lib/brltty/brltty.sh -b al -d usb:" +ATTRS{idVendor}=="0798", ATTRS{idProduct}=="0680", RUN+="/lib/brltty/brltty.sh -b al -d usb:" + +# Baum +ATTRS{idVendor}=="0403", ATTRS{idProduct}=="fe70", RUN+="/lib/brltty/brltty.sh -b bm -d usb:" +ATTRS{idVendor}=="0403", ATTRS{idProduct}=="fe71", RUN+="/lib/brltty/brltty.sh -b bm -d usb:" +ATTRS{idVendor}=="0403", ATTRS{idProduct}=="fe72", RUN+="/lib/brltty/brltty.sh -b bm -d usb:" +ATTRS{idVendor}=="0403", ATTRS{idProduct}=="fe73", RUN+="/lib/brltty/brltty.sh -b bm -d usb:" +ATTRS{idVendor}=="0403", ATTRS{idProduct}=="fe74", RUN+="/lib/brltty/brltty.sh -b bm -d usb:" +ATTRS{idVendor}=="0403", ATTRS{idProduct}=="fe75", RUN+="/lib/brltty/brltty.sh -b bm -d usb:" +ATTRS{idVendor}=="0403", ATTRS{idProduct}=="fe76", RUN+="/lib/brltty/brltty.sh -b bm -d usb:" +ATTRS{idVendor}=="0403", ATTRS{idProduct}=="fe77", RUN+="/lib/brltty/brltty.sh -b bm -d usb:" +ATTRS{idVendor}=="0904", ATTRS{idProduct}=="2000", RUN+="/lib/brltty/brltty.sh -b bm -d usb:" +ATTRS{idVendor}=="0904", ATTRS{idProduct}=="2001", RUN+="/lib/brltty/brltty.sh -b bm -d usb:" +ATTRS{idVendor}=="0904", ATTRS{idProduct}=="2002", RUN+="/lib/brltty/brltty.sh -b bm -d usb:" +ATTRS{idVendor}=="0904", ATTRS{idProduct}=="2007", RUN+="/lib/brltty/brltty.sh -b bm -d usb:" +ATTRS{idVendor}=="0904", ATTRS{idProduct}=="2008", RUN+="/lib/brltty/brltty.sh -b bm -d usb:" +ATTRS{idVendor}=="0904", ATTRS{idProduct}=="2009", RUN+="/lib/brltty/brltty.sh -b bm -d usb:" +ATTRS{idVendor}=="0904", ATTRS{idProduct}=="2010", RUN+="/lib/brltty/brltty.sh -b bm -d usb:" +ATTRS{idVendor}=="0904", ATTRS{idProduct}=="2011", RUN+="/lib/brltty/brltty.sh -b bm -d usb:" +ATTRS{idVendor}=="0904", ATTRS{idProduct}=="2014", RUN+="/lib/brltty/brltty.sh -b bm -d usb:" +ATTRS{idVendor}=="0904", ATTRS{idProduct}=="2015", RUN+="/lib/brltty/brltty.sh -b bm -d usb:" +ATTRS{idVendor}=="0904", ATTRS{idProduct}=="2016", RUN+="/lib/brltty/brltty.sh -b bm -d usb:" +ATTRS{idVendor}=="0904", ATTRS{idProduct}=="3000", RUN+="/lib/brltty/brltty.sh -b bm -d usb:" + +# EuroBraille +ATTRS{idVendor}=="c251", ATTRS{idProduct}=="1122", RUN+="/lib/brltty/brltty.sh -b eu -d usb:" +ATTRS{idVendor}=="c251", ATTRS{idProduct}=="1124", RUN+="/lib/brltty/brltty.sh -b eu -d usb:" + +# FreedomScientific +ATTRS{idVendor}=="0f4e", ATTRS{idProduct}=="0100", RUN+="/lib/brltty/brltty.sh -b fs -d usb:" +ATTRS{idVendor}=="0f4e", ATTRS{idProduct}=="0111", RUN+="/lib/brltty/brltty.sh -b fs -d usb:" +ATTRS{idVendor}=="0f4e", ATTRS{idProduct}=="0112", RUN+="/lib/brltty/brltty.sh -b fs -d usb:" + +# HandyTech +ATTRS{idVendor}=="0921", ATTRS{idProduct}=="1200", RUN+="/lib/brltty/brltty.sh -b ht -d usb:" + +# HIMS +ATTRS{idVendor}=="045e", ATTRS{idProduct}=="930a", RUN+="/lib/brltty/brltty.sh -b hm -d usb:" + +# Papenmeier +ATTRS{idVendor}=="0403", ATTRS{idProduct}=="f208", RUN+="/lib/brltty/brltty.sh -b pm -d usb:" + +# Pegasus +ATTRS{idVendor}=="4242", ATTRS{idProduct}=="0001", RUN+="/lib/brltty/brltty.sh -b pg -d usb:" + +# Seika +ATTRS{idVendor}=="10c4", ATTRS{idProduct}=="ea60", RUN+="/lib/brltty/brltty.sh -b sk -d usb:" + +# Voyager +ATTRS{idVendor}=="0798", ATTRS{idProduct}=="0001", RUN+="/lib/brltty/brltty.sh -b vo -d usb:" + +LABEL="brltty_rules_end" --- brltty-4.1.orig/debian/brltty.manpages +++ brltty-4.1/debian/brltty.manpages @@ -0,0 +1,2 @@ +debian/tmp/usr/share/man/man1/*.1 +Drivers/Braille/VisioBraille/vstp.1 --- brltty-4.1.orig/debian/brltty.examples +++ brltty-4.1/debian/brltty.examples @@ -0,0 +1,2 @@ +Hotplug/udev.rules +Hotplug/upstart.job --- brltty-4.1.orig/debian/libbrlapi0.5.postinst +++ brltty-4.1/debian/libbrlapi0.5.postinst @@ -0,0 +1,6 @@ +#! /bin/sh + +set -e + +#DEBHELPER# + --- brltty-4.1.orig/debian/libbrlapi-dev.docs +++ brltty-4.1/debian/libbrlapi-dev.docs @@ -0,0 +1,2 @@ +build-brltty/Documents/Manual-BrlAPI/* + --- brltty-4.1.orig/debian/brltty.dirs +++ brltty-4.1/debian/brltty.dirs @@ -0,0 +1,10 @@ +etc/brltty +etc/default +lib/brltty +lib/udev/rules.d +sbin +usr/lib/ubiquity/target-config +usr/share/brltty/initramfs +usr/share/initramfs-tools/hooks +usr/share/initramfs-tools/scripts/init-top +usr/share/initramfs-tools/scripts/init-premount --- brltty-4.1.orig/debian/brltty.ubiquity +++ brltty-4.1/debian/brltty.ubiquity @@ -0,0 +1,16 @@ +#! /bin/sh +set -e + +[ ! -f /etc/default/brltty ] || . /etc/default/brltty + +if egrep -q 'braille=ask|brltty' /proc/cmdline && [ -f /etc/brltty.conf ] && \ + [ -e /target/etc/default/brltty ] && [ "$RUN_BRLTTY" = yes ]; then + mkdir -p /target/etc/default + if [ -e /target/etc/brltty.conf ]; then + mv /target/etc/brltty.conf /target/etc/brltty.conf.orig + fi + cp -a /etc/brltty.conf /target/etc/brltty.conf + sed -i -e 's/^RUN_BRLTTY=.*/RUN_BRLTTY=yes/' /target/etc/default/brltty +fi + +exit 0 --- brltty-4.1.orig/debian/cl-brlapi.prerm +++ brltty-4.1/debian/cl-brlapi.prerm @@ -0,0 +1,6 @@ +#! /bin/sh + +set -e + +#DEBHELPER# + --- brltty-4.1.orig/debian/brltty-udeb.prebaseconfig +++ brltty-4.1/debian/brltty-udeb.prebaseconfig @@ -0,0 +1,80 @@ +#! /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} + ;; + 3) + textTable="${parameter}" + ;; + esac + fi + + number="`expr ${number} + 1`" + done + ;; + esac + + shift + done + + if "${found}" + then + echo "# Created by ${0}" + [ -z "${brailleDriver}" ] && brailleDriver=auto + echo "braille-driver ${brailleDriver}" + [ -z "${brailleDevice}" ] && brailleDevice=usb: + echo "braille-device ${brailleDevice}" + [ -n "${textTable}" ] && echo "text-table ${textTable}" + fi +} + +unset DEBIAN_HAS_FRONTEND +unset DEBIAN_FRONTEND +unset DEBCONF_FRONTEND +unset DEBCONF_REDIR + +pid=/var/run/brltty + +if [ -r $pid ] && kill -0 `cat $pid`; then + if apt-install brltty 1>&2; then + file="/proc/cmdline" + if [ -f $file ]; then + if grep brltty= $file >/dev/null ; then + parse `cat "${file}"` >/target/etc/brltty.conf + sed -i -e 's/^RUN_BRLTTY=.*/RUN_BRLTTY=yes/' /target/etc/default/brltty + fi + fi + fi +fi + +exit 0 --- brltty-4.1.orig/debian/changelog +++ brltty-4.1/debian/changelog @@ -0,0 +1,1293 @@ +brltty (4.1-2ubuntu3) lucid; urgency=low + + * debian/brltty.initramfs-top: Missed one. + + -- Scott James Remnant Tue, 15 Dec 2009 18:15:09 +0000 + +brltty (4.1-2ubuntu2) lucid; urgency=low + + * debian/initramfs/scripts/init-premount/brltty, + debian/initramfs/hooks/brltty: Only install if we have a framebuffer + and splash screen. + + -- Scott James Remnant Tue, 15 Dec 2009 15:05:10 +0000 + +brltty (4.1-2ubuntu1) lucid; urgency=low + + * Merge from Debian testing, remaining changes: + - Add brltty-setup, installed in both the udeb and the normal system. + - Add initramfs integration to run brltty-setup if necessary before + usplash starts. + - Add ubiquity integration to propagate any brltty configuration to the + target system. + - Put udev rules file in /lib/udev/rules.d. + - Add udev rules and /lib/brltty/brltty.sh to the normal (non-udeb) + package as well. + - Enable brltty if /etc/default/brltty has RUN_BRLTTY=yes, which is set + by the installer if brltty is configured; add a NEWS entry for + upgraders. + - Don't install /etc/brltty.conf in the package + - Install udev rules with the same name (85-brltty.rules) in the udeb as + in the deb. + - Disable BrlTTY grabbing devices that use the FTDI USB-to-serial chip. + - Remove the dh-lisp build-dependency, remove the cl-brlapi package, and + adjust the brltty package description accordingly. dh-lisp is not + in main. + - Build for all python versions (python 2.6), not just the current + version. + - Build against openjdk in Ubuntu. + - Enable brltty at startup on the target system if the alternate installer + is used. + * udev rules have been switched to use ATTRS{} instead of the deprecated + SYSFS{}. LP: #491775. + + -- Steve Langasek Thu, 10 Dec 2009 02:39:03 -0800 + +brltty (4.1-2) unstable; urgency=high + + * High-urgency upload for bug fix for d-i alpha release. + * debian/brltty-udeb.udev.rules: Fix udev 148-2 warnings cluttering + debian-installer (Closes: Bug#559564). + + -- Samuel Thibault Tue, 08 Dec 2009 01:59:48 +0100 + +brltty (4.1-1ubuntu1) lucid; urgency=low + + * Merge from Debian testing. Remaining changes: + - Add brltty-setup, installed in both the udeb and the normal system. + - Add initramfs integration to run brltty-setup if necessary before + usplash starts. + - Add ubiquity integration to propagate any brltty configuration to the + target system. + - Put udev rules file in /lib/udev/rules.d. + - Add udev rules and /lib/brltty/brltty.sh to the normal (non-udeb) + package as well. + - Enable brltty if /etc/default/brltty has RUN_BRLTTY=yes, which is set + by the installer if brltty is configured; add a NEWS entry for + upgraders. + - Don't install /etc/brltty.conf in the package + - Install udev rules with the same name (85-brltty.rules) in the udeb as + in the deb. + - Disable BrlTTY grabbing devices that use the FTDI USB-to-serial chip. + - Remove the dh-lisp build-dependency, remove the cl-brlapi package, and + adjust the brltty package description accordingly. dh-lisp is not + in main. + - Build for all python versions (python 2.6), not just the current + version. + - Build against openjdk in Ubuntu. + - Enable brltty at startup on the target system if the alternate installer + is used. + * Dropped changes: + - Conflicts: libbrlapi, libbrlapi1-dev - these packages are obsolete in + hardy and above, no need to continue carrying a delta for this, and the + packages didn't have conflicting files anyway. + - brltty.preinst: drop, the udev rules path is already fixed in hardy and + above. + * Simplify debian/rules changes a bit + + -- Steve Langasek Mon, 07 Dec 2009 08:31:36 +0000 + +brltty (4.1-1) unstable; urgency=low + + * Add a debian/watch file + * Stop brltty from suggesting libbrlapi-dev. + * New upstream bugfix release + * Use the --disable-stripping configure option + * Install README.Bluetooth. + + -- Mario Lang Sat, 10 Oct 2009 13:58:31 +0200 + +brltty (4.0-9) unstable; urgency=low + + * Incorrect dependencies in init.d LSB header (Closes: Bug#548550) + * Fix weak-library-dev-dependency of libbrlapi-dev on libbrlapi0.5 + + -- Mario Lang Sun, 27 Sep 2009 14:22:55 +0200 + +brltty (4.0-8ubuntu2) lucid; urgency=low + + * debian/rules: don't install /etc/brltty.conf in the package - we're + dynamically editing this from the initramfs, so this really isn't suitable + to be a conffile. + * revert changes to check the md5sum before copying over the configuration + from the initramfs: the source file *only* exists when braille=ask is + passed on the kernel commandline, so there is simply no reason to *not* + respect the options specified and overwrite /etc/brltty.conf (especially + now that it's no longer a conffile). LP: #409802, #370728. + + -- Steve Langasek Tue, 17 Nov 2009 04:43:13 +0000 + +brltty (4.0-8ubuntu1) lucid; urgency=low + + * Merge from debian testing, remaining changes: + - Conflicts: libbrlapi, libbrlapi-dev, libbrlapi1-dev. + - Add brltty-setup, installed in both the udeb and the normal system. + - Add initramfs integration to run brltty-setup if necessary before + usplash starts. + - Add ubiquity integration to propagate any brltty configuration to the + target system. + - Add udev rules and /lib/brltty/brltty.sh to the normal (non-udeb) + package as well. + - Enable brltty if /etc/default/brltty has RUN_BRLTTY=yes, which is set + by the installer if brltty is configured; add a NEWS entry for + upgraders. + - Install udev rules with the same name (85-brltty.rules) in the udeb as + in the deb. + - Only copy the brltty config file from the initramfs if the md5sum differs. + - Change maintainer to Ubuntu Accessibility Developers + + - Disable BrlTTY grabbing devices that use the FTDI USB to serial chip. + - Remove the dh-lisp build-dependency, remove the cl-brlapi package, and + adjust the brltty package description accordingly. dh-lisp is not + in main. + - Build for python 2.6. + - Build against openjdk in Ubuntu. + - Put udev rules file in /lib/udev/rules.d. + - Enable brltty at startup on the target system if the alternate installer + is used. + + -- Luke Yelavich Tue, 10 Nov 2009 10:47:14 +1100 + +brltty (4.0-8) unstable; urgency=low + + [ Dave Mielke ] + * Change the "braille display offline/online" logs to DEBUG (from + NOTICE). + + [ Lee Maschmeyer ] + * en-us-g2 fixes. + + [ Mario Lang ] + * /etc/brltty.conf is not generated during installation anymore. + * Move the EuroBraille driver's clio model table into constant memory. + * Remove an unnecessary memcpy(). + * The VisioBraille driver's output translation table should be const. + + [ Samuel Thibault ] + * debian/control: Bump Standards-Version to 3.8.3 + + [ Mario Lang ] + * Support for startup during initramfs + + -- Mario Lang Wed, 09 Sep 2009 11:55:49 +0200 + +brltty (4.0-7ubuntu2) karmic; urgency=low + + * Fixes cherry-picked from debian: + - debian/brltty.init: Fix incorrect LSB header, cherry-picked from Debian. + (LP: #450176) + - debian/brltty.postinst: Recover from previous init script LSB errors. + + -- Luke Yelavich Wed, 14 Oct 2009 10:19:16 +1100 + +brltty (4.0-7ubuntu1) karmic; urgency=low + + * Merge from debian unstable, remaining changes: + - Conflicts: libbrlapi, libbrlapi-dev, libbrlapi1-dev. + - Add brltty-setup, installed in both the udeb and the normal system. + - Add initramfs integration to run brltty-setup if necessary before + usplash starts. + - Add ubiquity integration to propagate any brltty configuration to the + target system. + - Add udev rules and /lib/brltty/brltty.sh to the normal (non-udeb) + package as well. + - Enable brltty if /etc/default/brltty has RUN_BRLTTY=yes, which is set + by the installer if brltty is configured; add a NEWS entry for + upgraders. + - Install udev rules with the same name (85-brltty.rules) in the udeb as + in the deb. + - Only copy the brltty config file from the initramfs if the md5sum differs. + - Change maintainer to Ubuntu Accessibility Developers + + - Disable BrlTTY grabbing devices that use the FTDI USB to serial chip. + - Remove the dh-lisp build-dependency, remove the cl-brlapi package, and + adjust the brltty package description accordingly. dh-lisp is not + in main. + - Do not build the speechd package, speech-dispatcher is not in main. + - Build for python 2.6. + - Build against openjdk in Ubuntu. + - Put udev rules file in /lib/udev/rules.d. + - Enable brltty at startup on the target system if the alternate installer + is used. + + -- Luke Yelavich Mon, 20 Jul 2009 11:20:14 +1000 + +brltty (4.0-7) unstable; urgency=low + + [ Samuel Thibault ] + * debian/rules: also strip whitespaces in brltty-udeb's tables, strip + attribute and keyboard tables too. + * Cherry-pick upstream r4506: "JNI fixes for Sun-based jvms. (sm)" + * Cherry-pick upstream r4687: "Pyrex doesn't convert NULL to None. (st)" + * debian/control: + - Bump build-depend debhelper to >= 5. + - Bump Standards-Version to 3.8.2 (no change needed). + - Add ${misc:Depends} dependency to libbrlapi-{java,dev,jni} + - Remove libc6-dev dependency of libbrlapi-dev, as build-essential already + depends on it and some ports do not have it. + + [ Mario Lang ] + * debian/brltty.docs: Add Documents/HISTORY. + * debian/control: Add Samuel Thibault to Uploaders. + * debian/libbrlapi-dev.install: Install libbrlapi.a in /usr/lib + (Closes: Bug#411671). + + -- Mario Lang Sat, 18 Jul 2009 18:09:33 +0200 + +brltty (4.0-6ubuntu2) karmic; urgency=low + + * Restore change from 4.0~svn4301-0ubuntu3, since otherwise brltty builds + only with python2.5: + - Bindings/Python/Makefile.in: Don't build with --quiet, call install + with --install-layout=deb. + + -- Colin Watson Thu, 28 May 2009 14:58:27 +0200 + +brltty (4.0-6ubuntu1) karmic; urgency=low + + * Merge from debian unstable, remaining changes: + - Conflicts: libbrlapi, libbrlapi-dev, libbrlapi1-dev. + - Add brltty-setup, installed in both the udeb and the normal system. + - Add initramfs integration to run brltty-setup if necessary before + usplash starts. + - Add ubiquity integration to propagate any brltty configuration to the + target system. + - Add udev rules and /lib/brltty/brltty.sh to the normal (non-udeb) + package as well. + - Enable brltty if /etc/default/brltty has RUN_BRLTTY=yes, which is set + by the installer if brltty is configured; add a NEWS entry for + upgraders. + - Install udev rules with the same name (85-brltty.rules) in the udeb as + in the deb. + - Only copy the brltty config file from the initramfs if the md5sum differs. + - Change maintainer to Ubuntu Accessibility Developers + + - Disable BrlTTY grabbing devices that use the FTDI USB to serial chip. + - Remove the dh-lisp build-dependency, remove the cl-brlapi package, and + adjust the brltty package description accordingly. dh-lisp is not + in main. + - Do not build the speechd package, speech-dispatcher is not in main. + - Build for python 2.6. + - Build against openjdk in Ubuntu. + - Put udev rules file in /lib/udev/rules.d. + - Enable brltty at startup on the target system if the alternate installer + is used. + + -- Luke Yelavich Thu, 28 May 2009 09:56:12 +0200 + +brltty (4.0-6) unstable; urgency=low + + [ Mario Lang ] + * debian/control: + - Remove libbluetooth2-dev from Build-Depends. (Closes: 530355) + - Add Vcs-Git and Vcs-Browser fields. + + [ Samuel Thibault ] + * Add Homepage field. + + [ Mario Lang ] + * debian/control: + - Set Maintainer to "Debian Accessibility Team". + - Update package description to mention newly supported displays. + * Fix from upstream SVN: + r4495: The Java bindings should load the JNI part automatically. + + -- Mario Lang Mon, 25 May 2009 00:41:02 +0200 + +brltty (4.0-5) unstable; urgency=low + + * Fix "X11 is left enabled" by changing --without-x to --disable-x + during udeb configure (Closes: #529526) + + -- Mario Lang Wed, 20 May 2009 15:36:48 +0200 + +brltty (4.0-4) unstable; urgency=low + + * debian/brltty-udeb.udev.rules: Add new USB IDs. + * debian/brltty.docs: Install Tables/README-* which + fixes "Should provide the tables documentation". (Closes: #522702) + * debian/brltty.examples: Install Hotplug/udev.rules and + Hotplug/upstart.job. + * debian/libbrlapi0.5.copyright: Update copyright years and mention + LGPL version. + + -- Mario Lang Mon, 18 May 2009 11:49:26 +0200 + +brltty (4.0-3) unstable; urgency=low + + * Fix Build-Depends to actually include libspeechd-dev. + A comma was missing, argh! + + -- Mario Lang Sun, 17 May 2009 19:11:42 +0200 + +brltty (4.0-2) unstable; urgency=low + + * debian/control: Move cl-brlapi from section admin to lisp. + * Enable speech-dispatcher support via new binary package + brltty-speechd. (Closes: #486291) + * Update debian/copyright: + - Update copyright years. + - Mention /usr/share/doc/brltty/CONTRIBUTORS. + - Add info about license version. + - Mention that tables are now licensed LGPL. + * debian/brltty.docs: Install Documents/CONTRIBUTORS. + * Merge from Ubuntu: "Add 'status' action to init script": + - debian/control: brltty: Depend on lsb-base >= 3.2-14, providing + status_of_proc(). + - debian/brltty.init: Add the 'status' action. + + -- Mario Lang Sun, 17 May 2009 16:55:20 +0200 + +brltty (4.0-1) unstable; urgency=low + + * New upstream release: + - Fixes "causes excessive resume of USB" (Closes: #497155). + * Fix "Bus specifiers are mistakenly interpreted as relative paths" + by removing not so clever code from debian/brltty-udeb.prebaseconfig + (Closes: #516091) + * Fix "Use libncursew5-dev". (Closes: #488993) + * debian/control: Move libbrlapi-java from section libs to java. + * Upgrade Standards-Version from 3.7.3 to 3.8.1 (no changes). + * debian/brltty.examples: Remove, unused. + + -- Mario Lang Fri, 15 May 2009 13:49:14 +0200 + +brltty (4.0~svn4301-0ubuntu5) karmic; urgency=low + + * No change rebuild to transition to libicu40 + + -- Luke Yelavich Tue, 12 May 2009 08:13:22 +1000 + +brltty (4.0~svn4301-0ubuntu4) jaunty; urgency=low + + * debian/brltty.init: Only replace brltty.conf if the md5sum of the existing + file is the same as what was shipped with the package. + * debian/rules: Put the md5sum of brltty.conf into the newly installed init + file. + * debian/brltty-udeb.prebaseconfig: Enable BrlTTY at startup on the target + system. (LP: #299989) + + -- Luke Yelavich Wed, 18 Mar 2009 13:59:20 +1100 + +brltty (4.0~svn4301-0ubuntu3) jaunty; urgency=low + + * Build for python2.6. + * Bindings/Python/Makefile.in: Don't build with --quiet, call install + with --install-layout=deb. + + -- Matthias Klose Tue, 24 Feb 2009 21:37:10 +0100 + +brltty (4.0~svn4301-0ubuntu2) jaunty; urgency=low + + * debian/brltty-udeb.udev.rules: Use the hm driver for the BrailleSense + + -- Luke Yelavich Tue, 17 Feb 2009 09:58:49 +1100 + +brltty (4.0~svn4301-0ubuntu1) jaunty; urgency=low + + * New upstream svn snapshot to fix a few bugs, and to add support for + a new Braille display. + + -- Luke Yelavich Tue, 17 Feb 2009 09:31:50 +1100 + +brltty (4.0~svn4289-0ubuntu1) jaunty; urgency=low + + * New upstream svn snapshot + * debian/rules: + - Point to new location for README files for braille drivers. + - Table data files have a different extension, so point to new files + for processing for the udeb. + * debian/control: Refer explicitly to libbluetooth-dev. + * debian/brltty-udeb.udev.rules: Updated to match the IDs in upstream's + rules file. + + -- Luke Yelavich Fri, 13 Feb 2009 16:52:05 +1100 + +brltty (3.10-0ubuntu3) jaunty; urgency=low + + * debian/rules: Install udev rules into /lib/udev/rules.d + * debian/brltty.dirs: Create new path instead + * debian/brltty-udeb.dirs: Create new path instead + * debian/brltty.preinst: Remove the old rules if unmodified + * debian/control: Add Breaks to ensure the right version of udev is used. + + -- Scott James Remnant Fri, 09 Jan 2009 16:44:58 +0000 + +brltty (3.10-0ubuntu2) intrepid; urgency=low + + * Configure the udeb with --disable-x rather than --without-x. + + -- Colin Watson Wed, 06 Aug 2008 01:45:07 +0100 + +brltty (3.10-0ubuntu1) intrepid; urgency=low + + * New upstream release. + * debian/brltty.manpages: Adjust location of vstp manpage. + + -- Luke Yelavich Tue, 05 Aug 2008 10:57:34 +1000 + +brltty (3.10~r3724-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Apply patch from Samuel Thibault to fix FTBFS in unstable. + (Closes: #516240) + + -- Adeodato Simó Sat, 14 Mar 2009 11:09:53 +0100 + +brltty (3.10~r3724-1ubuntu5) intrepid; urgency=low + + * Set java include directory and java path. + + -- Matthias Klose Thu, 31 Jul 2008 07:27:33 +0000 + +brltty (3.10~r3724-1ubuntu4) intrepid; urgency=low + + * (Build-)depend on default-jre/-jdk. + + -- Matthias Klose Thu, 31 Jul 2008 06:36:12 +0000 + +brltty (3.10~r3724-1ubuntu3) intrepid; urgency=low + + * debian/control + - Depend on lsb-base >= 3.2-14, providing status_of_proc() + - Bump Standards-Version to 3.8.0 + * debian/brltty.init + - Add the 'status' action (LP: #251626) + + -- Nathan Handler Thu, 24 Jul 2008 16:15:45 -0500 + +brltty (3.10~r3724-1ubuntu2) intrepid; urgency=low + + * Rebuild for libgpmg1 -> libgpm2 transistion. + + -- Steve Kowalik Sun, 20 Jul 2008 05:24:35 +1000 + +brltty (3.10~r3724-1ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, remaining changes: + - Conflicts: libbrlapi, libbrlapi-dev, libbrlapi1-dev. + - Add brltty-setup, installed in both the udeb and the normal system. + - Add initramfs integration to run brltty-setup if necessary before + usplash starts. + - Add ubiquity integration to propagate any brltty configuration to the + target system. + - Add udev rules and /lib/brltty/brltty.sh to the normal (non-udeb) + package as well. + - Enable brltty if /etc/default/brltty has RUN_BRLTTY=yes, which is set + by the installer if brltty is configured; add a NEWS entry for + upgraders. + - Install udev rules with the same name (85-brltty.rules) in the udeb as + in the deb. + - Change maintainer to Ubuntu Accessibility Developers + + - Disable BrlTTY grabbing devices that use the FTDI USB to serial chip. + - Remove the dh-lisp build-dependency, remove the cl-brlapi package, and + adjust the brltty package description accordingly. dh-lisp is not + in main. + + -- Luke Yelavich Wed, 04 Jun 2008 14:53:31 +1000 + +brltty (3.10~r3724-1) unstable; urgency=low + + * New subversion snapshot, fixing FTBFS (Closes: Bug#482205). + + -- Mario Lang Thu, 22 May 2008 18:37:09 +0200 + +brltty (3.10~r3715-1) unstable; urgency=low + + * New subversion snapshot with minor fixes. + * Clean up the multi binary package handling a bit, now installing + non-udeb build to debian/tmp. + * debian/brlapi0.5-dev.copyright: Renamed to libbrlapi-dev.copyright so + that it gets installed. + * Use upstream rules to install man3 manpages (Closes: Bug#479754). + * No longer ship brltty-config, it used to be wrong and I don't + see a single use-case for it. + * debian/brltty.conf: Deleted, unused. + + -- Mario Lang Fri, 09 May 2008 16:51:16 +0200 + +brltty (3.10~r3710-1) unstable; urgency=low + + * New subversion snapshot, target for unstable after good test results. + * Disable the Java bindings on alpha and hppa (in addition to the + already disabled archs) (Closes: Bug#477848). + + -- Mario Lang Sun, 04 May 2008 22:06:34 +0200 + +brltty (3.10~r3666-1) experimental; urgency=low + + * New subversion snapshot. + * Build-Depend on libicu-dev but disable icu in the udeb build + (Closes: Bug#475604). + + -- Mario Lang Tue, 15 Apr 2008 23:27:18 +0200 + +brltty (3.10~r3662-2) experimental; urgency=low + + * Add --disable-iconv to udeb configure options (Closes: Bug#475612). + + -- Mario Lang Sun, 13 Apr 2008 20:18:31 +0200 + +brltty (3.10~r3662-1) experimental; urgency=low + + * New subversion snapshot. + - Fix to Java building outside of sourcedir and Lisp bindings + merged upstream. + * Fix libbrlapi-dev header installation (Closes: Bug#475015). + + -- Mario Lang Sat, 12 Apr 2008 14:53:51 +0200 + +brltty (3.10~r3654-1) experimental; urgency=low + + * New upstream subversion snapshot. + - This adds unicode support. Please test it so that we can evaluate + if it can be used for Lenny. + * Fix library name in Lisp bindings. + + -- Mario Lang Fri, 11 Apr 2008 20:32:29 +0200 + +brltty (3.9-7ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, remaining changes: + - Conflicts: libbrlapi, libbrlapi-dev, libbrlapi1-dev. + - Add brltty-setup, installed in both the udeb and the normal system. + - Add initramfs integration to run brltty-setup if necessary before + usplash starts. + - Add ubiquity integration to propagate any brltty configuration to the + target system. + - Add udev rules and /lib/brltty/brltty.sh to the normal (non-udeb) + package as well. + - Enable brltty if /etc/default/brltty has RUN_BRLTTY=yes, which is set + by the installer if brltty is configured; add a NEWS entry for + upgraders. + - Install udev rules with the same name (85-brltty.rules) in the udeb as + in the deb. + - Change maintainer to Ubuntu Accessibility Developers + + - Disable BrlTTY grabbing devices that use the FTDI USB to serial chip. + - Remove the dh-lisp build-dependency, remove the cl-brlapi package, and + adjust the brltty package description accordingly. dh-lisp is not + in main. + + -- Luke Yelavich Sat, 03 May 2008 11:49:31 +1000 + +brltty (3.9-7) unstable; urgency=low + + * Fix missing include files in libbrlapi-dev (Closes: Bug#475015). + * Build-Depend on python-dev >= 2.5.2 and rebuild for python transition. + + -- Mario Lang Mon, 14 Apr 2008 01:43:18 +0200 + +brltty (3.9-6ubuntu1) hardy; urgency=low + + * Merge from debian unstable, remaining changes: + - Conflicts: libbrlapi, libbrlapi-dev, libbrlapi1-dev. + - Add brltty-setup, installed in both the udeb and the normal system. + - Add initramfs integration to run brltty-setup if necessary before + usplash starts. + - Add ubiquity integration to propagate any brltty configuration to the + target system. + - Add udev rules and /lib/brltty/brltty.sh to the normal (non-udeb) + package as well. + - Enable brltty if /etc/default/brltty has RUN_BRLTTY=yes, which is set + by the installer if brltty is configured; add a NEWS entry for + upgraders. + - Install udev rules with the same name (85-brltty.rules) in the udeb as + in the deb. + - Change maintainer to Ubuntu Accessibility Developers + + - Disable BrlTTY grabbing devices that use the FTDI USB to serial chip. + - Remove the dh-lisp build-dependency, remove the cl-brlapi package, and + adjust the brltty package description accordingly. dh-lisp is not + in main. + + -- Luke Yelavich Fri, 28 Mar 2008 09:28:17 +1100 + +brltty (3.9-6) unstable; urgency=low + + * Add patch to fix vcsa reading on big-endian architectures + (Closes: Bug#467269). + * Disable Java bindings on hurd-i386 (Closes: Bug#469984). + * Fix the TTY driver (Closes: Bug#467192). + * Rework the init script: + - Use --exec for start-stop-daemon to finally resolve long standing + "double-started brltty on upgrade" problems. + - Use lsb/init-functions for output. + + -- Mario Lang Tue, 25 Mar 2008 19:16:53 +0100 + +brltty (3.9-5ubuntu2) hardy; urgency=low + + * debian/rules: Copy the ubiquity script after debian/brltty/usr/lib is cleaned + out. + * debian/brltty.initramfs-hook: Do not copy udev rules to the initramfs. + + -- Luke Yelavich Fri, 29 Feb 2008 11:34:43 +1100 + +brltty (3.9-5ubuntu1) hardy; urgency=low + + * Merge from debian unstable, (LP: #176477) remaining changes: + - Conflicts: libbrlapi, libbrlapi-dev, libbrlapi1-dev. + - Add brltty-setup, installed in both the udeb and the normal system. + - Add initramfs integration to run brltty-setup if necessary before + usplash starts. + - Add ubiquity integration to propagate any brltty configuration to the + target system. + - Add udev rules and /lib/brltty/brltty.sh to the normal (non-udeb) + package as well. + - Enable brltty if /etc/default/brltty has RUN_BRLTTY=yes, which is set + by the installer if brltty is configured; add a NEWS entry for + upgraders. + - Install udev rules with the same name (85-brltty.rules) in the udeb as + in the deb. + - Change maintainer to Ubuntu Accessibility Developers + + * Disable BrlTTY grabbing devices that use the FTDI USB to serial chip. + (LP: #84139) + * Remove the dh-lisp build-dependency, remove the cl-brlapi package, and + adjust the brltty package description accordingly. dh-lisp is not + in main. + + -- Luke Yelavich Sat, 15 Dec 2007 11:44:23 +1100 + +brltty (3.9-5) unstable; urgency=low + + * Hopefully fix disabling Java support on ARM for real this time. + * Disable Java on m68k as well. + * Revisit debhelper calls and simplify. + * Convert debian/copyright and debian/libbrlapi0.5.copyright to UTF-8. + * Update Standards-Version to 3.7.3 (no changes). + * Fix debian/rules so that "dpkg-buildpackage -j2" does not fail. + * Make python-brlapi part of section python. + + -- Mario Lang Fri, 14 Dec 2007 00:35:44 +0100 + +brltty (3.9-4ubuntu1) hardy; urgency=low + + * Merge from debian unstable, (LP: #172310) remaining changes: + - Conflicts: libbrlapi, libbrlapi-dev, libbrlapi1-dev. + - Add brltty-setup, installed in both the udeb and the normal system. + - Add initramfs integration to run brltty-setup if necessary before + usplash starts. + - Add ubiquity integration to propagate any brltty configuration to the + target system. + - Add udev rules and /lib/brltty/brltty.sh to the normal (non-udeb) + package as well. + - Enable brltty if /etc/default/brltty has RUN_BRLTTY=yes, which is set + by the installer if brltty is configured; add a NEWS entry for + upgraders. + - Install udev rules with the same name (85-brltty.rules) in the udeb as + in the deb. + * Ubuntu changes dropped: + - Remove compiler.h include in Programs/usb_linux.c. + * Change maintainer to Ubuntu Accessibility Developers + + + -- Luke Yelavich Tue, 27 Nov 2007 21:47:44 +1100 + +brltty (3.9-4) unstable; urgency=low + + * Disable Java support on ARM. + + -- Mario Lang Tue, 20 Nov 2007 19:47:01 +0100 + +brltty (3.9-3) unstable; urgency=low + + * Set $JAVA_HOME to /usr/lib/jvm/java-gcj. + + -- Mario Lang Tue, 20 Nov 2007 18:23:02 +0100 + +brltty (3.9-2) unstable; urgency=low + + * Only Build-Depend on libgpmg1-dev on Linux archs (Closes: Bug#450795). + + -- Mario Lang Sun, 11 Nov 2007 21:42:25 +0100 + +brltty (3.9-1) unstable; urgency=low + + * New upstream release. + * Build-depend on libgpmg1-dev. + + -- Mario Lang Wed, 17 Oct 2007 18:02:18 +0200 + +brltty (3.8-8) unstable; urgency=low + + * Disable GPM in udeb build (Closes: Bug#440731, Bug#441782). + + -- Mario Lang Tue, 11 Sep 2007 14:10:07 +0200 + +brltty (3.8-7) unstable; urgency=low + + * Add --mandir to configure call. Upstream added GNU/kFreeBSD support + so this should finally (Closes: Bug#414068). + + -- Mario Lang Sun, 09 Sep 2007 17:37:50 +0200 + +brltty (3.8-6) unstable; urgency=low + + * Fix typo in libbrlapi-dev Conflicts line. + * Build-Depend on java-gcj-compat-dev. + * Uniformly refer to hardware we support as "braille display" and remove + references to "soft" and "refreshable" from package description. + Hopefully this makes things a little more consistent and clearer. + * Initial upload to unstable. + + -- Mario Lang Sun, 02 Sep 2007 12:40:05 +0200 + +brltty (3.8-5) experimental; urgency=low + + * libbrlapi-dev should conflict with libbrlapi1-dev (<< 3.8). + * Pull changes from r3208 to fix up Lisp bindings. + + -- Mario Lang Sun, 26 Aug 2007 13:23:47 +0200 + +brltty (3.8-4) experimental; urgency=low + + * Let cl-brlapi depend on cl-cffi. + * Fix "Wrong permissions of brlapi.so" (Closes: Bug#439343). + + -- Mario Lang Fri, 24 Aug 2007 15:32:57 +0200 + +brltty (3.8-3) experimental; urgency=low + + * Add python-dev to Build-Depends (Closes: Bug#434858). + * Stop config.mk.in from stripping binaries by default on install + (Closes: Bug#436606). + * Package Java bindings as libbrlapi-jni and libbrlapi-java: + - Add gcj to Build-Depends. + * Temporarily disable speech dispatcher support. + + -- Mario Lang Thu, 09 Aug 2007 15:00:53 +0200 + +brltty (3.8-2) experimental; urgency=low + + * Add python-pyrex and dh-lisp to Build-Depends. + * Merge r3167 and r3168 to kill two lintian warnings. + + -- Mario Lang Wed, 01 Aug 2007 11:42:06 +0200 + +brltty (3.8-1) experimental; urgency=low + + * New upstream release: (Closes: Bug#414068, Bug#428920). + - New SONAME for brlapi, use the opportunity to make the package + name match the SONAME: libbrlapi1 -> libbrlapi0.5. + - New binding packages cl-brlapi and python-brlapi + (tcl, caml and java are not yet done). + * Include the TTY driver (for testing purposes) in the + udeb build. (Closes: Bug#357887). + * Cleanup: Remove lintian overrides. + * Add LSB init info section to init script. + * Pull changes to support Handy Tech Easy Braille from r3089. + * First upload to experimental to make it easy to time the transition + of depending packages. + + -- Mario Lang Sun, 22 Jul 2007 15:54:50 +0200 + +brltty (3.7.2-7.2) unstable; urgency=high + + * Non-maintainer upload. + * High-urgency upload for RC bug fix. + * Fix FTBFS with linux-libc-dev (closes: #414068). + * libbluetooth2-dev build-dep doesn't apply to non-linux architectures. + + -- Julien Cristau Wed, 18 Jul 2007 16:50:34 +0200 + +brltty (3.7.2-7.1ubuntu1) gutsy; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Remove compiler.h include in Programs/usb_linux.c. + - Conflicts: libbrlapi, libbrlapi-dev. + - Add brltty-setup, installed in both the udeb and the normal system. + - Add initramfs integration to run brltty-setup if necessary before + usplash starts. + - Add ubiquity integration to propagate any brltty configuration to the + target system. + - Add udev rules and /lib/brltty/brltty.sh to the normal (non-udeb) + package as well. + - Enable brltty if /etc/default/brltty has RUN_BRLTTY=yes, which is set + by the installer if brltty is configured; add a NEWS entry for + upgraders. + * Install udev rules with the same name (85-brltty.rules) in the udeb as + in the deb. + + -- Colin Watson Fri, 18 May 2007 15:27:52 +0100 + +brltty (3.7.2-7.1) unstable; urgency=high + + * Non-maintainer upload. + * Move xbrlapi to package brltty-x11 and libbrlttybba.so to package brltty + (closes: #411426), because libbrlapi1 should only contain the shared + library. Move xbrlapi from /bin to /usr/bin in the process. Thanks, + Samuel Thibault! + * Urgency high to hopefully get this into etch. + + -- Julien Cristau Sun, 01 Apr 2007 17:03:27 +0200 + +brltty (3.7.2-7ubuntu3) feisty; urgency=low + + * Rename brltty=ask to braille=ask (LP: #91894). + * Set Ubuntu maintainer field. + + -- Colin Watson Tue, 27 Mar 2007 12:45:10 +0100 + +brltty (3.7.2-7ubuntu2) feisty; urgency=low + + * add missing Replaces in libbrlapi1 (LP#86694) + + -- Michael Vogt Mon, 26 Feb 2007 15:15:37 +0100 + +brltty (3.7.2-7ubuntu1) feisty; urgency=low + + * Resynchronise with Debian. Remaining changes: + - remove compiler.h include in Programs/usb_linux.c + - conflicts to libbrlapi, libbrlapi-dev + * Add brltty-setup based on example code in + https://blueprints.launchpad.net/ubuntu/+spec/braille-support, installed + in both the udeb and the normal system. + * Add initramfs integration to run brltty-setup if necessary before + usplash starts. + * Add ubiquity integration to propagate any brltty configuration to the + target system. + * Add udev rules and /lib/brltty/brltty.sh to the normal (non-udeb) + package as well. + * Enable brltty if /etc/default/brltty has RUN_BRLTTY=yes, which is set by + the installer if brltty is configured; added a NEWS entry for upgraders. + + -- Colin Watson Wed, 7 Feb 2007 17:16:31 +0000 + +brltty (3.7.2-7) unstable; urgency=medium + + * The "hopefully final for Etch" release. + * Fix out-dated reference to text-table fr in default config + (Closes: Bug#406610). + * Use 'usb:' and 'auto' as defaults for braille-device and braille-driver + in finish-install. This results in a correct brltty.conf + file if the user uses the shortcut "brltty=,,de" to + activate brltty in the installer with a different translation + table then the default (german in this example). Thanks to Simon for + triggereing this and to Samuel for providing the patch + (Closes: Bug#406257). + * Urgency medium because this should ideally make it for etch. + + -- Mario Lang Sun, 21 Jan 2007 18:48:29 +0100 + +brltty (3.7.2-6ubuntu1) feisty; urgency=low + + * Merge from debian unstable, remaining changes: + - remove compiler.h include in Programs/usb_linux.c + - debian/brltty.init: not enable by default + - conflicts to libbrlapi, libbrlapi-dev + + -- Michael Vogt Mon, 18 Dec 2006 13:39:18 +0100 + +brltty (3.7.2-6) unstable; urgency=medium + + * Backport Handy Tech Modular Evolution 64/88 support from upstream + repository. This change is harmless, adds support for new hardware + that I will need in stable and only affects *one* driver module that + I have the hardware for to test if it still works. + This would be very nice to have in etch. + + -- Mario Lang Thu, 14 Dec 2006 18:13:27 +0100 + +brltty (3.7.2-5ubuntu1) feisty; urgency=low + + * Merge from debian unstable. Remaining changes: + - remove compiler.h include in Programs/usb_linux.c + - debian/brltty.init: not enable by default + - conflicts to libbrlapi, libbrlapi-dev + + -- Michael Vogt Tue, 12 Dec 2006 19:16:13 +0100 + +brltty (3.7.2-5) unstable; urgency=low + + * Fix startup error during early startup in d-i (Closes: Bug#371458). + * Rename finish-install.d script to 05brltty (from 50brltty) (Closes + Bug#400538). + * Enable the preference menu in the udeb build (Closes: Bug#374556). + + -- Mario Lang Mon, 27 Nov 2006 14:07:01 +0100 + +brltty (3.7.2-4ubuntu1) feisty; urgency=low + + * Merge from debian unstable. + + -- Michael Vogt Wed, 22 Nov 2006 11:13:04 +0100 + +brltty (3.7.2-4) unstable; urgency=low + + * Acknowledge NMU for libbluetooth2-dev Build-Depends, thanks! + (Closes: Bug#376863). + * Fix FTBFS "'MAX_NR_CONSOLES' undeclared" (Closes: Bug#392135). + * Move 50brltty from prebaseconfig.d to finish-install.d + (Closes: Bug#373118). + * Move libbrlttybba.so to package libbrlapi1 (Closes: Bug#384254). + * Upgrade Standards-Version to 3.7.2. + + -- Mario Lang Tue, 10 Oct 2006 19:09:25 +0200 + +brltty (3.7.2-3.1ubuntu3) edgy; urgency=low + + * Backport from trunk (Mario Lang): + - Move 50brltty from prebaseconfig.d to finish-install.d + (Closes: Bug#373118). + + -- Colin Watson Thu, 12 Oct 2006 00:03:10 +0100 + +brltty (3.7.2-3.1ubuntu2) edgy; urgency=low + + * Move libbrlapi.so symlink back to its correct package. + + -- Luke Yelavich Thu, 17 Aug 2006 15:14:21 +1000 + +brltty (3.7.2-3.1ubuntu1) edgy; urgency=low + + * Merge from Debian unstable. + * Move /lib/libbrlapi.so symbolic link from libbrlapi1-dev to + libbrlapi1 to make sure that gnome-orca can work with braille + support. + * Commented out the include for linux/compiler.h in + Programs/usb_linux.c. + + -- Luke Yelavich Wed, 16 Aug 2006 22:57:14 +1000 + +brltty (3.7.2-3.1) unstable; urgency=low + + * Non-maintainer upload. + * changing build-depends from libbluetooth1-dev to libbluetooth2-dev | + libbluetooth-dev as suggested by Felipe Augusto van de Wiel and Rudy + Godoy. (Closes: #376863) + Thanks! + + -- Alexander Schmehl Thu, 27 Jul 2006 13:54:51 +0200 + +brltty (3.7.2-3ubuntu1) edgy; urgency=low + + * Resynchronized with Debian, only Ubuntu changes are: + - debian/brltty.init: not enabled by default. + + -- Daniel Holbach Fri, 7 Jul 2006 16:02:42 +0200 + +brltty (3.7.2-3) unstable; urgency=low + + * Add libbluetooth1-dev to Build-Depends. + * Patch from SVN to fix Papenmeier memory leaks. + * Go back to libxaw7-dev (on request from the XSF). + * Remove brltty.1 from udeb (Closes: Bug#359326). + * Patch frm SVN to eliminate rpath usage (Closes: Bug#360252). + * Really purge brlapi.key (Closes: Bug#327238). + * Reshuffle misplaced files (Closes: Bug#357860). + * Samuel Thibault : + * Autostart brltty only if the user set some "brltty=" parameters at the + kernel command line. + * Add udev rules for autostarting brltty when USB devices are probed. + * Disable framebuffer and install brltty when brltty got auto-started. + + -- Mario Lang Wed, 19 Apr 2006 13:04:54 +0200 + +brltty (3.7.2-2) unstable; urgency=low + + * Move xbrlapi to libbrlapi1-dev. + + -- Mario Lang Wed, 22 Feb 2006 10:48:29 +0100 + +brltty (3.7.2-1) unstable; urgency=low + + * New upstream release (Closes: Bug#343122). + * Use debhelper's new udeb capabilities instead of hacking around + the issue. Updated Build-Depends to >= 4.2. + * Drop debconf /etc/brltty.conf management support (sorry to the + translators) (Closes: Bug#313182, Bug#314146, Bug#341029). + * Add --retry 5 to init script stop/restart targets (Closes: Bug#313262). + + -- Mario Lang Wed, 22 Feb 2006 09:39:36 +0100 + +brltty (3.4.1-2) unstable; urgency=low + + * Include Czech debconf translation (Closes: Bug#237678). + * debian/brltty.postinst: erm, it is /etc/brltty.key, not -key. + + -- Mario Lang Fri, 12 Mar 2004 19:30:59 +0100 + +brltty (3.4.1-1) unstable; urgency=low + + * New upstream bugfix release. + * Fix the regexp in brltty.postinst so that config files where + a tab immediately follows the option name are edited properly. + + -- Mario Lang Tue, 20 Jan 2004 10:48:26 +0100 + +brltty (3.4-1) unstable; urgency=low + + * New upstream version: + * "Fixes" my blunder with makePath since what I backported + to 3.3.1-7 is now integrated (Closes: Bug#226656). + + -- Mario Lang Sun, 4 Jan 2004 20:19:23 +0100 + +brltty (3.3.1-7) unstable; urgency=low + + * Massive patch to enable inclusion of all driver modules in the + executable for brltty-udeb (this saves more space, and fixes the problem + that driver modules were referencing symbols defined in the executable): + - Programs/{spk,brl}_driver.h: Rename the {Braille,Speech}Driver structs + from {brl,spk}_driver to {brl,spk}_driver_XX where XX is the two-letter + driver code. This change went already into upstream's subversion + repository, and is how 3.4 will do it. However, backporting this + change into 3.3.1 means that you can not use this version of BRLTTY + with driver modules compiled for a standard 3.3.1 + (upstream doesn't support any kind of versioning anyway, and expects + that the executable and driver modules are in sync at all times, so this + will only beat those who already try to do unsupported things.) + - configure.in: Add --enable-all-builtin. (This is not how + 3.4 will do it, but upstream doesn't have this in subversion yet, + so I had to go ahead and implement it myself (somehow ugly, but still + working). + - config.mk: Add BUILTIN_DRIVERS and DRIVER_LIST variables for conditional + linking of all driver modules into the executable. + - Drivers/*/braille.c: Make various private globals static. + - Drivers/*/speech.c: Make #include "Programs/misc.h" appear before + #include "Programs/brl_driver.h" to make macros available. + - Documents/{brltty.{conf,1},Manual.sgml}: Document the fact that + specifying drivers by full shared object path is no longer supported. + - debian/rules: Use --enable-all-builtin if building the udeb. + (Closes: Bug#211092, Bug#219928) + + -- Mario Lang Sat, 15 Nov 2003 13:04:39 +0100 + +brltty (3.3.1-6) unstable; urgency=low + + * Add package groff to Build-Depends (closes: #219364) + + -- Mario Lang Thu, 6 Nov 2003 12:18:43 +0100 + +brltty (3.3.1-5) unstable; urgency=low + + * Add linuxdoc-tools to Build-Depends (closes: #218815) + * Upgrade to Standards-Version 3.6.1. + + -- Mario Lang Sun, 2 Nov 2003 20:38:47 +0100 + +brltty (3.3.1-4) unstable; urgency=low + + * Patch from 3.4-branch: Support for HandyTech Braillino. + * debian/control: Added Braillino to list of HandyTech devices + * debian/po/nl.po: Updated (Closes: Bug#215363). + * debian/rules: + - Install Drivers/*/README* in /usr/share/doc/brltty/. + - Remove the vh driver from brltty-udeb since it is redundant and + currently broken. Vario users should use Emulation 3 (PB1) or + Emulation 4 (PB2) with the TSI (ts) driver. + + -- Mario Lang Wed, 29 Oct 2003 18:00:45 +0100 + +brltty (3.3.1-3) unstable; urgency=low + + * Programs/scr_linux.c: + - Patch from 3.4-branch: Assume a direct-through mapping if + ioctl GET_UNIMAP returns a zero-element map. + * New Japanese debconf translation (Closes: Bug#210711). + + -- Mario Lang Thu, 11 Sep 2003 15:09:00 +0200 + +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 Tue, 9 Sep 2003 18:04:45 +0200 + +brltty (3.3.1-1) unstable; urgency=low + + * New upstream release. + + -- Mario Lang 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 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 Fri, 4 Apr 2003 14:12:56 +0200 + +brltty (3.2-4) unstable; urgency=low + + * Fix doc-base.brltty (Closes: Bug#183230) + + -- Mario Lang 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 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 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 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 Mon, 9 Dec 2002 13:45:23 +0100 + +brltty (3.1-3) unstable; urgency=low + + * Use gcc instead of ld to link. + + -- Mario Lang 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 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 Wed, 13 Nov 2002 22:18:20 +0100 + +brltty (3.0-1) unstable; urgency=low + + * New upstream release. + + -- Mario Lang 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 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 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 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 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 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 Mon, 29 Oct 2001 15:05:57 +0100 + +brltty (2.98-1) unstable; urgency=low + + * Initial Release. + + -- Mario Lang Thu, 4 Jan 2001 16:22:12 +0100 + --- brltty-4.1.orig/debian/brltty.postinst +++ brltty-4.1/debian/brltty.postinst @@ -0,0 +1,33 @@ +#! /bin/sh + +set -e + +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 + +if [ ! -f /etc/default/brltty ]; then + cat >>/etc/default/brltty </dev/null 2>&1; then + update-initramfs -u +fi + +# Recover from incorrect init.d script headers in version 4.0-8 and earlier +if [ "$1" = "configure" ] && dpkg --compare-versions "$2" le "4.0-8" \ + && [ -f /etc/rcS.d/S[0-9][0-9]brltty ] \ + && [ -f /etc/rc0.d/K[0-9][0-9]brltty ] \ + && [ -f /etc/rc6.d/K[0-9][0-9]brltty ] ; then + update-rc.d -f brltty remove +fi + +#DEBHELPER# + --- brltty-4.1.orig/debian/control +++ brltty-4.1/debian/control @@ -0,0 +1,144 @@ +Source: brltty +Section: admin +Priority: extra +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Accessibility Team +Uploaders: Mario Lang , Samuel Thibault +Vcs-Browser: http://git.debian.org/?p=pkg-a11y/brltty.git;a=summary +Vcs-Git: git://git.debian.org/git/pkg-a11y/brltty.git +Homepage: http://mielke.cc/brltty/ +Build-Depends: debhelper (>= 5), + python-support, + python-all-dev (>= 2.5.2), + python-pyrex, + libgpmg1-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], + libicu-dev, + default-jdk [!alpha !arm !hppa !hurd-i386 !m68k], + bison, doxygen, linuxdoc-tools, groff, + flite1-dev, libncursesw5-dev, libxaw7-dev, libatspi-dev, + libbluetooth-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], + libspeechd-dev +Standards-Version: 3.8.3 + +Package: brltty +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, initramfs-tools (>= 0.40ubuntu30), lsb-base (>= 3.2-14) +Replaces: libbrlapi1 (<< 3.7.2-7.1) +Suggests: brltty-speechd, brltty-x11 +Breaks: udev (<< 136-1) +Description: Access software for a blind person using a braille display + BRLTTY is a daemon which provides access to the console (text mode) + for a blind person using a braille display. It drives the braille + display and provides complete screen review functionality. + The following display models are supported: + * Alva (ABT3xx, Delphi, Satellite, Braille System 40, BC 640/680) + * Baum + * BrailleLite (18, 40, M20/M40) + * BrailleNote (18/32) + * EcoBraille displays + * EuroBraille displays + * Freedom Scientific (Focus and PacMate) + * HandyTech displays + * HIMS (Braille Sense, SyncBraille) + * LogText 32 + * MDV braille displays + * Papenmeier + * Pegasus (20/27/40/80) + * Seika 40 + * Tieman (Voyager 44/70, CombiBraille, MiniBraille and MultiBraille) + * Tivomatic (Albatross) + * TSI (PowerBraille/Navigator) + * 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 libbrlapi0.5. A static library, header files and + documentation is provided in package libbrlapi-dev. Bindings to other + programming languages can be found in libbrlapi-java (Java) and + python-brlapi (Python). + +Package: libbrlapi0.5 +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 + need to communicate with a braille display. + +Package: libbrlapi-dev +Architecture: any +Section: libdevel +Depends: libbrlapi0.5 (= ${binary:Version}), ${misc:Depends} +Conflicts: libbrlapi1-dev (<< 3.8) +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: libbrlapi-jni +Architecture: any +Section: libs +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Java bindings for BrlAPI (native library) + This package provides the architecture-dependant files required to + access a braille terminal via BrlAPI from Java. + +Package: libbrlapi-java +Architecture: all +Section: java +Depends: libbrlapi-jni (>= ${source:Version}), + default-jre | java2-runtime, ${misc:Depends} +Description: Java bindings for BrlAPI + This package provides java classes to access a braille display via BrlAPI. + +Package: brltty-flite +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, brltty (= ${binary:Version}) +Description: Access software for a blind person using a braille display + BRLTTY is a daemon which provides access to the Linux console (text mode) + for a blind person using a braille display. It drives the braille + display and provides complete screen review functionality. + . + This package contains an optional speech driver for the Festival Lite + speech synthesis engine. + +Package: brltty-speechd +Architecture: any +Recommends: speech-dispatcher +Depends: ${shlibs:Depends}, ${misc:Depends}, brltty (= ${binary:Version}) +Description: Access software for a blind person using a braille display + BRLTTY is a daemon which provides access to the Linux console (text mode) + for a blind person using a braille display. It drives the braille + display and provides complete screen review functionality. + . + This package contains an optional speech driver for the speech-dispatcher + speech synthesis server. + +Package: brltty-udeb +Architecture: any +XC-Package-Type: udeb +Section: debian-installer +Priority: extra +Depends: ${shlibs:Depends} +Description: Access software for a blind person using a braille display + This is a small version of brltty, optimized for use on install media. + +Package: brltty-x11 +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, brltty (= ${binary:Version}) +Description: Access software for a blind person using a braille display + BRLTTY is a daemon which provides access to the Linux console (text mode) + for a blind person using a braille display. It drives the braille + display and provides complete screen review functionality. + . + This package contains optional drivers which require X11 or GNOME. + +Package: python-brlapi +Architecture: any +Section: python +Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends} +Description: Python bindings for BrlAPI + This package provides a Python module to access a braille display. + --- brltty-4.1.orig/debian/copyright +++ brltty-4.1/debian/copyright @@ -0,0 +1,57 @@ +This package was debianized by Mario Lang on +Thu, 4 Jan 2001 16:22:12 +0100. + +It was downloaded from + +Upstream Authors: + Nicolas Pitre + Current maintainer; author of the drivers for the Alva B.V. + series and for the EuroBraille family of displays. + + Stéphane Doyon : + Active developer; author of the driver for Telesensory + Systems's PowerBraille and Navigator models. + + Nikhil Nair : + Original author; author of the drivers for the Tieman B.V. + CombiBraille and Blazie Engineering's BrailleLite. + + James Bowden : + Acted in an advisory capacity; contributed some braille + translation tables. + + August Hörandl : + 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 : + Contributor of the driver for the EcoBraille from La O.N.C.E. + + A more complete list of contributors can be found in + `/usr/share/doc/brltty/CONTRIBUTORS'. + +Copyright: + +Copyright (C) 1995-2009 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; either version 2 of the License, or (at your option) any +later version. + +On Debian GNU/Linux systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL-2'. + +Text, attribute and contraction tables in /etc/brltty/ are placed under +the terms of the GNU Lesser General Public License, as published by the +Free Software Foundation; either version 2.1 of the License, or (at your +option) any later version. + +On Debian GNU/Linux systems, the complete text of the GNU Lesser General +Public License can be found in `/usr/share/common-licenses/LGPL-2.1'. + --- brltty-4.1.orig/debian/NEWS +++ brltty-4.1/debian/NEWS @@ -0,0 +1,32 @@ +brltty (3.10~r3654M-1) experimental; urgency=low + + * Support for Unicode (UTF-8) has been added. + + -- Mario Lang Fri, 11 Apr 2008 19:39:06 +0200 + +brltty (3.7.2-7ubuntu1) feisty; urgency=low + + * In order for brltty to run from the init script, you must now set + RUN_BRLTTY=yes in /etc/default/brltty. (This is not required for + non-serial USB devices, for which brltty is started automatically by + udev.) + + -- Colin Watson Wed, 7 Feb 2007 17:16:31 +0000 + +brltty (3.7.2-1) unstable; urgency=low + + * Prior to this version, braille driver/device + selection was done via a configuration dialog (debconf). + Support for this method of configuring /etc/brltty.conf was + dropped in this version since the configuration file format + changed significantly. + The new default configuration supports all + USB capable displays out of the box. If you are using + a display which is connected to your computer by USB, + you will not need to tweak the configuration. + Otherwise, please edit /etc/brltty.conf accordingly after + upgrading this package, and manually restart brltty + to make the new version active. + + -- Mario Lang Wed, 22 Feb 2006 09:39:36 +0100 + --- brltty-4.1.orig/debian/brltty-speechd.dirs +++ brltty-4.1/debian/brltty-speechd.dirs @@ -0,0 +1,2 @@ +lib/brltty + --- brltty-4.1.orig/debian/python-brlapi.prerm +++ brltty-4.1/debian/python-brlapi.prerm @@ -0,0 +1,6 @@ +#! /bin/sh + +set -e + +#DEBHELPER# + --- brltty-4.1.orig/debian/brltty.initramfs-sh +++ brltty-4.1/debian/brltty.initramfs-sh @@ -0,0 +1,38 @@ +#! /bin/sh +set -e + +# A fake /lib/brltty/brltty.sh for the initramfs. Rather than actually +# starting brltty (which is problematic because brltty would have to be shut +# down and restarted when switching out of early userspace), we just write +# out a brltty.conf which will be copied over to the real root filesystem +# later. + +brailleDriver=auto +brailleDevice=usb: + +while [ "$1" ]; do + case $1 in + -b) + brailleDriver="$2" + shift 2 + ;; + -d) + brailleDevice="$2" + shift 2 + ;; + -*) + shift 2 + ;; + *) + shift + ;; + esac +done + +cat >/dev/.initramfs/brltty.conf <, Wed May 19 09:41:09 2004 --- brltty-4.1.orig/debian/libbrlapi-dev.install +++ brltty-4.1/debian/libbrlapi-dev.install @@ -0,0 +1,3 @@ +debian/tmp/lib/*.a usr/lib +debian/tmp/lib/*.so /lib +debian/tmp/usr/include/* usr/include --- brltty-4.1.orig/debian/brltty-udeb.sh +++ brltty-4.1/debian/brltty-udeb.sh @@ -0,0 +1,5 @@ +#!/bin/sh +pid=/var/run/brltty +[ -r $pid ] && kill -0 `cat $pid` && exit 0 +exec /sbin/brltty -P $pid "$@" + --- brltty-4.1.orig/debian/brltty-flite.dirs +++ brltty-4.1/debian/brltty-flite.dirs @@ -0,0 +1,2 @@ +lib/brltty + --- brltty-4.1.orig/debian/python-brlapi.install +++ brltty-4.1/debian/python-brlapi.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/python* usr/lib --- brltty-4.1.orig/debian/brltty-udeb.init +++ brltty-4.1/debian/brltty-udeb.init @@ -0,0 +1,9 @@ +#!/bin/sh +if grep -q braille=ask /proc/cmdline; then + brltty-setup || true +elif grep -q brltty /proc/cmdline; then + /lib/brltty/brltty.sh -E +fi +pid=/var/run/brltty +[ -r $pid ] && kill -0 `cat $pid` && debconf-set debian-installer/framebuffer false + --- brltty-4.1.orig/debian/libbrlapi-jni.install +++ brltty-4.1/debian/libbrlapi-jni.install @@ -0,0 +1,2 @@ +build-brltty/Bindings/Java/libbrlapi_java.so usr/lib/jni + --- brltty-4.1.orig/debian/brltty.init +++ brltty-4.1/debian/brltty.init @@ -0,0 +1,89 @@ +#! /bin/sh +### BEGIN INIT INFO +# Provides: brltty +# Required-Start: mountkernfs +# Required-Stop: +# Should-Start: udev +# Should-Stop: +# Default-Start: S +# Default-Stop: +# Short-Description: Braille terminal driver +# Description: Used to provide access to refreshable braille terminals. +### END INIT INFO + +set -e + +PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin +DAEMON=/sbin/brltty +NAME=brltty +DESC='Braille terminal driver' + +test -f $DAEMON || exit 0 + +# /etc/brltty.conf may need to be propagated from the initramfs. (This is a +# pretty awful hack.) +if [ -e /dev/.initramfs/brltty.conf ] && [ -e /etc/default/brltty ]; then + mv /dev/.initramfs/brltty.conf /etc/brltty.conf + sed -i -e 's/^RUN_BRLTTY=.*/RUN_BRLTTY=yes/' /etc/default/brltty +fi + +[ -r /etc/default/brltty ] && . /etc/default/brltty + +# Edit /etc/default/brltty and set RUN_BRLTTY=yes to allow brltty to be +# started. +if [ "$RUN_BRLTTY" != yes ]; then + exit 0 +fi + +set -e + +[ -r /etc/default/locale ] && . /etc/default/locale +[ -n "$LANG" ] && export LANG + +. /lib/lsb/init-functions + +case "$1" in + start) + if [ "$RUNLEVEL" = "S" -a "$PREVLEVEL" = "N" ]; then + if [ "$START_IN_INITRAMFS" = "true" -o "$START_IN_INITRAMFS" = "yes" ]; then + if $0 status >/dev/null; then + $0 stop + else + log_warning_msg 'BRLTTY was not running, did you forget to invoke "update-initramfs -u"?' + fi + fi + fi + log_daemon_msg "Starting $DESC" "$NAME" + if start-stop-daemon --start --oknodo --exec $DAEMON -- $ARGUMENTS; then + log_end_msg 0 + else + log_end_msg 1 + fi + ;; + stop) + log_daemon_msg "Stopping $DESC" "$NAME" + if start-stop-daemon --stop --quiet --oknodo --retry 5 --exec $DAEMON; then + log_end_msg 0 + else + log_end_msg 1 + fi + ;; + restart|force-reload) + log_daemon_msg "Restarting $DESC" "$NAME" + start-stop-daemon --stop --quiet --retry 5 --exec $DAEMON + if start-stop-daemon --start --quiet --exec $DAEMON -- $ARGUMENTS; then + log_end_msg 0 + else + log_end_msg 1 + fi + ;; + status) + status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $? + ;; + *) + echo "Usage: /etc/init.d/$NAME {start|stop|restart|force-reload|status}" >&2 + exit 1 + ;; +esac + +exit 0 --- brltty-4.1.orig/debian/libbrlapi0.5.copyright +++ brltty-4.1/debian/libbrlapi0.5.copyright @@ -0,0 +1,48 @@ +This package was debianized by Mario Lang on +Thu, 4 Jan 2001 16:22:12 +0100. + +It was downloaded from + +Upstream Authors: + Nicolas Pitre + Current maintainer; author of the drivers for the Alva B.V. + series and for the EuroBraille family of displays. + + Stéphane Doyon : + Active developer; author of the driver for Telesensory + Systems's PowerBraille and Navigator models. + + Nikhil Nair : + Original author; author of the drivers for the Tieman B.V. + CombiBraille and Blazie Engineering's BrailleLite. + + James Bowden : + Acted in an advisory capacity; contributed some braille + translation tables. + + August Hörandl : + 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 : + Contributor of the driver for the EcoBraille from La O.N.C.E. + + And some others. + +Copyright: + +Copyright (C) 1995-2009 by The BRLTTY Team, All rights reserved. + +BRLTTY comes with ABSOLUTELY NO WARRANTY. + +This is free software, placed under the terms of the +GNU Lesser General Public License, as published by the Free Software +Foundation; either version 2.1 of the License, or (at your option) any +later version. + +On Debian GNU/Linux systems, the complete text of the GNU Lesser General +Public License can be found in `/usr/share/common-licenses/LGPL-2.1'. + --- brltty-4.1.orig/debian/brltty.docs +++ brltty-4.1/debian/brltty.docs @@ -0,0 +1,6 @@ +README +Documents/CONTRIBUTORS +Documents/HISTORY +Documents/README.Bluetooth +Tables/README-* +build-brltty/Documents/Manual-BRLTTY/* --- brltty-4.1.orig/debian/libbrlapi-dev.copyright +++ brltty-4.1/debian/libbrlapi-dev.copyright @@ -0,0 +1,47 @@ +This package was debianized by Mario Lang on +Thu, 4 Jan 2001 16:22:12 +0100. + +It was downloaded from + +Upstream Authors: + Nicolas Pitre + Current maintainer; author of the drivers for the Alva B.V. + series and for the EuroBraille family of displays. + + Stéphane Doyon : + Active developer; author of the driver for Telesensory + Systems's PowerBraille and Navigator models. + + Nikhil Nair : + Original author; author of the drivers for the Tieman B.V. + CombiBraille and Blazie Engineering's BrailleLite. + + James Bowden : + Acted in an advisory capacity; contributed some braille + translation tables. + + August Hörandl : + 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 : + 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 Library General Public License, as published by the Free Software +Foundation. + +On Debian GNU/Linux systems, the complete text of the GNU Library General +Public License can be found in `/usr/share/common-licenses/LGPL'. + --- brltty-4.1.orig/debian/brltty-setup +++ brltty-4.1/debian/brltty-setup @@ -0,0 +1,60 @@ +#! /bin/sh +set -e + +# Exits zero if a device was configured, otherwise non-zero. + +cat </dev/tty2 +fi --- brltty-4.1.orig/debian/initramfs/hooks/brltty +++ brltty-4.1/debian/initramfs/hooks/brltty @@ -0,0 +1,43 @@ +#!/bin/sh -e + +OPTION=FRAMEBUFFER +PREREQS="" + +prereqs() { echo "$PREREQS"; } + +case "$1" in + prereqs) + prereqs + exit 0 + ;; +esac + +. /usr/share/initramfs-tools/hook-functions + +[ -r /etc/default/brltty ] && . /etc/default/brltty + +[ -x /sbin/brltty ] || exit 0 + +if [ "$START_IN_INITRAMFS" = "true" -o "$START_IN_INITRAMFS" = "yes" ]; then + echo -n "Installing BRLTTY into initramfs..." + + cp -a /etc/brltty/ $DESTDIR/etc/ + cp /etc/brltty.conf $DESTDIR/etc/ + + cp -a /lib/brltty/ $DESTDIR/lib/ + + mkdir -p $DESTDIR/usr/lib + cp -a /usr/lib/gconv $DESTDIR/usr/lib + + copy_exec /sbin/brltty /sbin/ + + manual_add_modules pcspkr + manual_add_modules uinput + + echo "done" +else + mkdir -p $DESTDIR/lib/brltty + copy_exec /usr/share/brltty/initramfs/brltty.sh /lib/brltty + mkdir -p $DESTDIR/sbin + copy_exec /sbin/brltty-setup /sbin +fi --- brltty-4.1.orig/Bindings/Python/Makefile.in +++ brltty-4.1/Bindings/Python/Makefile.in @@ -38,13 +38,13 @@ all: $(PYTHON_API) $(PYTHON_API): brlapi.auto.c $(API_HDRS) brlapi - set -- --quiet build --build-temp .; \ + set -- build --build-temp .; \ [ "@host_os@" != "mingw32" ] || set -- "$${@}" --compiler mingw32; \ $(PYTHON) ./setup.py "$${@}" - [ "@host_os@" != "mingw32" ] || $(PYTHON) ./setup.py --quiet bdist_wininst --skip-build + [ "@host_os@" != "mingw32" ] || $(PYTHON) ./setup.py bdist_wininst --skip-build brlapi.auto.c: $(SRC_DIR)/brlapi.pyx $(SRC_DIR)/c_brlapi.pxd constants.auto.pyx - $(PYREXC) -I. -o $@ $(SRC_DIR)/brlapi.pyx + $(PYTHON) $(PYREXC) -I. -o $@ $(SRC_DIR)/brlapi.pyx constants.auto.pyx: $(CONSTANTS_SCRIPTS) $(CONSTANTS_SOURCES) $(AWK) $(CONSTANTS_OPTIONS) $(CONSTANTS_SOURCES) >$@ @@ -55,7 +55,7 @@ INSTALLED_FILES = installed-files install: all - set -- --quiet install --skip-build --record "$(INSTALLED_FILES)"; \ + set -- install --install-layout=deb --skip-build --record "$(INSTALLED_FILES)"; \ [ -z "$(PYTHON_DESTDIR)" ] || set -- "$${@}" --root "$(PYTHON_DESTDIR)"; \ $(PYTHON) ./setup.py "$${@}"