Christian Perrier, le Sun 27 Aug 2006 16:49:29 +0200, a écrit :
> > +Template: brltty/driver
> > +Type: string
> > +_Description: Braille Driver
> > +Template: brltty/extra
> > +Type: string
> > +_Description: Extra BrlTTY options
>
> Isn't some extra explanation useful? I understand this will be
> available only for Braille users so they're likely to understand
> what's asked here.
These are only for preseeding. And yes, if some users need to set it, he
should know what this is.
> > +Template: brltty/table
> > +Type: select
> > +# Translators, keep the first word as is, and please try to avoid letters
> > other
> > +# than just plain a-z, because only a-z have standard braille
> > representations
> > +_Choices: cz, da, da-lt, da-1252, de, es, fi1, fi2, fr-cbifs, fr_CA,
> > fr_FR, visiob, it, no-h, no-p, pl, ru, se, se-old, simple, uk, us, vni,
> > nabcc
>
> I deeply suggest to split out these choices as "__Choices".
Ok.
> I also suggest to add an Englih "translation" so that users of the
> English language may see "Czech (cz)" "Danish (da)", etc.
There is already one in debian/po/
Here is an updated patch with proposed changes. I don't know about
the status of the word "Braille", but I guess that since it refers to
somebody, a capital letter won't hurt.
Samuel
diff -urN brltty-3.7.2/debian/brltty-udeb.dirs
brltty-3.7.2-3/debian/brltty-udeb.dirs
--- brltty-3.7.2/debian/brltty-udeb.dirs 2006-08-27 04:43:06.000000000
+0200
+++ brltty-3.7.2-3/debian/brltty-udeb.dirs 2006-08-27 04:54:08.000000000
+0200
@@ -3,4 +3,5 @@
lib/brltty
lib/debian-installer-startup.d
sbin
-usr/lib/prebaseconfig.d
+usr/lib/post-base-installer.d
+usr/lib/finish-install.d
diff -urN brltty-3.7.2/debian/brltty-udeb.finish-install
brltty-3.7.2-3/debian/brltty-udeb.finish-install
--- brltty-3.7.2/debian/brltty-udeb.finish-install 1970-01-01
01:00:00.000000000 +0100
+++ brltty-3.7.2-3/debian/brltty-udeb.finish-install 2006-08-27
05:46:56.000000000 +0200
@@ -0,0 +1,25 @@
+#! /bin/sh -e
+# This script writes a BRLTTY configuration file to /target/etc/brltty.conf.
+
+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
+ brailleDriver="`debconf-get brltty/driver`"
+ brailleDevice="`debconf-get brltty/device`"
+ textTable="`debconf-get brltty/table`"
+ (
+ echo "# Created by $0"
+ [ -n "${brailleDriver}" ] && echo "braille-driver ${brailleDriver}"
+ [ -n "${brailleDevice}" ] && echo "braille-device ${brailleDevice}"
+ [ -n "${textTable}" ] && echo "text-table ${textTable}"
+ ) >/target/etc/brltty.conf
+ fi
+fi
+
+exit 0
diff -urN brltty-3.7.2/debian/brltty-udeb.init
brltty-3.7.2-3/debian/brltty-udeb.init
--- brltty-3.7.2/debian/brltty-udeb.init 2006-08-27 04:43:06.000000000
+0200
+++ brltty-3.7.2-3/debian/brltty-udeb.init 2006-08-27 14:06:47.000000000
+0200
@@ -1,5 +1,36 @@
#!/bin/sh
-grep -q brltty /proc/cmdline && /lib/brltty/brltty.sh -E
+if grep -q brltty= /proc/cmdline
+then
+ set `cat /proc/cmdline`
+ while [ "$#" -gt 0 ]
+ do
+ case "${1}" in
+ "brltty="*)
+ parameters="${1#*=}"
+
+ IFS=,
+ set "$parameters"
+ driver="$1"
+ device="$2"
+ table="$3"
+
+ if [ "$device" ]; then
+ test "`expr "$device" : "/"`" -eq 0 && \
+ device="/dev/$device"
+ test "`expr "$device" : "/dev/tts/"`" -eq 9 && \
+ device="/dev/ttyS`expr substr $device
10 2`"
+ fi
+ /lib/brltty/brltty.sh "$driver" "$device" "$table"
+ break
+ ;;
+ esac
+ shift
+ done
+else
+ if [ "`debconf-get brltty/driver`" ] || [ "`debconf-get brltty/device`"
]
+ then
+ /lib/brltty/brltty.sh
+ fi
+fi
pid=/var/run/brltty
[ -r $pid ] && kill -0 `cat $pid` && debconf-set debian-installer/framebuffer
false
-
diff -urN brltty-3.7.2/debian/brltty-udeb.postinst
brltty-3.7.2-3/debian/brltty-udeb.postinst
--- brltty-3.7.2/debian/brltty-udeb.postinst 1970-01-01 01:00:00.000000000
+0100
+++ brltty-3.7.2-3/debian/brltty-udeb.postinst 2006-08-27 03:24:27.000000000
+0200
@@ -0,0 +1,56 @@
+#!/bin/sh
+set -e
+
+pid=/var/run/brltty
+if [ ! -r $pid ] || ! kill -0 `cat $pid`
+then
+ exit 0
+fi
+
+. /usr/share/debconf/confmodule
+
+drivercode=brltty/driver
+devicecode=brltty/device
+tablecode=brltty/table
+
+db_get "$tablecode"
+[ "$RET" -a "$RET" != nabcc ] && exit 0
+
+db_get "$drivercode"
+driver="$RET"
+
+db_get debian-installer/language
+LANGNAME="$RET"
+db_get debian-installer/country
+COUNTRYNAME="$RET"
+
+case "$driver,${LANGNAME}_${COUNTRYNAME}" in
+ vs,*) table=visiob ;;
+ *,*_FI) table=fi1 ;;
+ *,*_NO) table=no-p ;;
+ *,*_SE) table=se ;;
+ *,*_GB) table=uk ;;
+ *,*_US) table=us ;;
+ *,*_VN) table=vni ;;
+ *,*_CZ) table=cz ;;
+ lt,da_*) table=da-lt ;;
+ *,da_*) table=da ;;
+ *,fr_CA) table="${LANGNAME}_${COUNTRYNAME}" ;;
+ *,fr_*) table=fr_FR ;;
+ *,de_*|*,es_*|*,it_*|*,pl_*|*,ru_*) table="$LANGNAME" ;;
+ *) table=us ;;
+esac
+
+db_set "$tablecode" "$table"
+db_input critical "$tablecode"
+db_go || exit 0
+db_get "$tablecode"
+[ -z "$RET" ] && exit 0
+[ "$RET" = nabcc ] && exit 0
+
+kill `cat $pid`
+for i in 1 2 3 4 5; do
+ kill -0 `cat $pid` || break
+ sleep 1
+done
+/lib/brltty/brltty.sh
diff -urN brltty-3.7.2/debian/brltty-udeb.prebaseconfig
brltty-3.7.2-3/debian/brltty-udeb.prebaseconfig
--- brltty-3.7.2/debian/brltty-udeb.prebaseconfig 2006-08-27
04:43:06.000000000 +0200
+++ brltty-3.7.2-3/debian/brltty-udeb.prebaseconfig 1970-01-01
01:00:00.000000000 +0100
@@ -1,81 +0,0 @@
-#! /bin/sh -e
-# Boot Parameters to Configuration File
-
-# This script processes the brltty= boot parameters in /proc/cmdline and
-# writes a corresponding BRLTTY configuration file to /target/etc/brltty.conf.
-
-parse()
-{
- brailleDriver=""
- brailleDevice=""
- textTable=""
-
- found=false
- while [ "${#}" -gt 0 ]
- do
- case "${1}"
- in
- "brltty="*)
- found=true
- parameters="${1#*=}"
-
- number=1
- while [ "${number}" -le 3 ]
- do
- parameter="`echo ${parameters} | cut -d, -f${number}`"
- if [ -n "${parameter}" ]
- then
- case "${number}"
- in
- 1)
- brailleDriver="${parameter}"
- ;;
- 2)
- brailleDevice=${parameter}
- test "`expr "${brailleDevice}" : "/"`" -eq 0 && \
- brailleDevice="/dev/${brailleDevice}"
- test "`expr "${brailleDevice}" : "/dev/tts/"`" -eq 9 &&
\
- brailleDevice="/dev/ttyS`expr substr
${brailleDevice} 10 2`"
- ;;
- 3)
- textTable="${parameter}"
- ;;
- esac
- fi
-
- number="`expr ${number} + 1`"
- done
- ;;
- esac
-
- shift
- done
-
- if "${found}"
- then
- echo "# Created by ${0}"
- [ -n "${brailleDriver}" ] && echo "braille-driver ${brailleDriver}"
- [ -n "${brailleDevice}" ] && echo "braille-device ${brailleDevice}"
- [ -n "${textTable}" ] && echo "text-table ${textTable}"
- fi
-}
-
-unset DEBIAN_HAS_FRONTEND
-unset DEBIAN_FRONTEND
-unset DEBCONF_FRONTEND
-unset DEBCONF_REDIR
-
-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
- fi
- fi
- fi
-fi
-
-exit 0
diff -urN brltty-3.7.2/debian/brltty-udeb.sh
brltty-3.7.2-3/debian/brltty-udeb.sh
--- brltty-3.7.2/debian/brltty-udeb.sh 2006-08-27 04:43:06.000000000 +0200
+++ brltty-3.7.2-3/debian/brltty-udeb.sh 2006-08-27 03:26:45.000000000
+0200
@@ -1,5 +1,15 @@
#!/bin/sh
+[ "$1" ] && debconf-set brltty/driver "$1"
+[ "$2" ] && debconf-set brltty/device "$2"
+[ "$3" ] && debconf-set brltty/table "$3"
+[ "$4" ] && debconf-set brltty/extra "$4"
pid=/var/run/brltty
[ -r $pid ] && kill -0 `cat $pid` && exit 0
-exec /sbin/brltty -P $pid "$@"
-
+driver="`debconf-get brltty/driver`"
+device="`debconf-get brltty/device`"
+table="`debconf-get brltty/table`"
+extra="`debconf-get brltty/extra`"
+[ "$driver" ] && driver="-b $driver"
+[ "$device" ] && device="-d $device"
+[ "$table" ] && table="-t $table"
+exec /sbin/brltty -P $pid $driver $device $table $extra
diff -urN brltty-3.7.2/debian/brltty-udeb.templates-in
brltty-3.7.2-3/debian/brltty-udeb.templates-in
--- brltty-3.7.2/debian/brltty-udeb.templates-in 1970-01-01
01:00:00.000000000 +0100
+++ brltty-3.7.2-3/debian/brltty-udeb.templates-in 2006-08-27
17:26:16.000000000 +0200
@@ -0,0 +1,25 @@
+Template: debian-installer/brltty-udeb/title
+Type: text
+_Description: Choose Braille table
+
+Template: brltty/driver
+Type: string
+_Description: Braille driver:
+
+Template: brltty/device
+Type: string
+_Description: Braille device:
+
+Template: brltty/table
+Type: select
+# Translators, keep the first word as is, and please avoid letters other than
+# just plain a-z, because only a-z have standard braille representations
+__Choices: cz, da, da-lt, da-1252, de, es, fi1, fi2, fr-cbifs, fr_CA, fr_FR,
visiob, it, no-h, no-p, pl, ru, se, se-old, simple, uk, us, vni, nabcc
+Default: nabcc
+_Description: Braille table:
+ Please chose a braille table. If BrlTTY should not be restarted,
+ please choose "nabcc".
+
+Template: brltty/extra
+Type: string
+_Description: Extra BrlTTY options:
diff -urN brltty-3.7.2/debian/brltty-udeb.udev.rules
brltty-3.7.2-3/debian/brltty-udeb.udev.rules
--- brltty-3.7.2/debian/brltty-udeb.udev.rules 2006-08-27 04:43:06.000000000
+0200
+++ brltty-3.7.2-3/debian/brltty-udeb.udev.rules 2006-08-27
04:54:39.000000000 +0200
@@ -5,28 +5,28 @@
SUBSYSTEM!="usb_device", GOTO="brltty_rules_end"
# Alva
-SYSFS{idVendor}=="06b0", SYSFS{idProduct}=="0001", RUN+="/lib/brltty/brltty.sh
-b al -d usb:"
+SYSFS{idVendor}=="06b0", SYSFS{idProduct}=="0001", RUN+="/lib/brltty/brltty.sh
al usb:"
# Baum
-SYSFS{idVendor}=="0403", SYSFS{idProduct}=="fe71", RUN+="/lib/brltty/brltty.sh
-b bm -d usb:"
-SYSFS{idVendor}=="0403", SYSFS{idProduct}=="fe72", RUN+="/lib/brltty/brltty.sh
-b bm -d usb:"
-SYSFS{idVendor}=="0403", SYSFS{idProduct}=="fe73", RUN+="/lib/brltty/brltty.sh
-b bm -d usb:"
-SYSFS{idVendor}=="0403", SYSFS{idProduct}=="fe74", RUN+="/lib/brltty/brltty.sh
-b bm -d usb:"
-SYSFS{idVendor}=="0403", SYSFS{idProduct}=="fe75", RUN+="/lib/brltty/brltty.sh
-b bm -d usb:"
+SYSFS{idVendor}=="0403", SYSFS{idProduct}=="fe71", RUN+="/lib/brltty/brltty.sh
bm usb:"
+SYSFS{idVendor}=="0403", SYSFS{idProduct}=="fe72", RUN+="/lib/brltty/brltty.sh
bm usb:"
+SYSFS{idVendor}=="0403", SYSFS{idProduct}=="fe73", RUN+="/lib/brltty/brltty.sh
bm usb:"
+SYSFS{idVendor}=="0403", SYSFS{idProduct}=="fe74", RUN+="/lib/brltty/brltty.sh
bm usb:"
+SYSFS{idVendor}=="0403", SYSFS{idProduct}=="fe75", RUN+="/lib/brltty/brltty.sh
bm usb:"
# FreedomScientific
-SYSFS{idVendor}=="0f4e", SYSFS{idProduct}=="0100", RUN+="/lib/brltty/brltty.sh
-b fs -d usb:"
-SYSFS{idVendor}=="0f4e", SYSFS{idProduct}=="0111", RUN+="/lib/brltty/brltty.sh
-b fs -d usb:"
-SYSFS{idVendor}=="0f4e", SYSFS{idProduct}=="0112", RUN+="/lib/brltty/brltty.sh
-b fs -d usb:"
+SYSFS{idVendor}=="0f4e", SYSFS{idProduct}=="0100", RUN+="/lib/brltty/brltty.sh
fs usb:"
+SYSFS{idVendor}=="0f4e", SYSFS{idProduct}=="0111", RUN+="/lib/brltty/brltty.sh
fs usb:"
+SYSFS{idVendor}=="0f4e", SYSFS{idProduct}=="0112", RUN+="/lib/brltty/brltty.sh
fs usb:"
# HandyTech
-SYSFS{idVendor}=="0921", SYSFS{idProduct}=="1200", RUN+="/lib/brltty/brltty.sh
-b ht -d usb:"
-SYSFS{idVendor}=="0403", SYSFS{idProduct}=="6001", RUN+="/lib/brltty/brltty.sh
-b ht -d usb:"
+SYSFS{idVendor}=="0921", SYSFS{idProduct}=="1200", RUN+="/lib/brltty/brltty.sh
ht usb:"
+SYSFS{idVendor}=="0403", SYSFS{idProduct}=="6001", RUN+="/lib/brltty/brltty.sh
ht usb:"
# Papenmeier
-SYSFS{idVendor}=="0403", SYSFS{idProduct}=="f208", RUN+="/lib/brltty/brltty.sh
-b pm -d usb:"
+SYSFS{idVendor}=="0403", SYSFS{idProduct}=="f208", RUN+="/lib/brltty/brltty.sh
pm usb:"
# Voyager
-SYSFS{idVendor}=="0798", SYSFS{idProduct}=="0001", RUN+="/lib/brltty/brltty.sh
-b vo -d usb:"
+SYSFS{idVendor}=="0798", SYSFS{idProduct}=="0001", RUN+="/lib/brltty/brltty.sh
vo usb:"
LABEL="brltty_rules_end"
diff -urN brltty-3.7.2/debian/control brltty-3.7.2-3/debian/control
--- brltty-3.7.2/debian/control 2006-08-27 04:43:06.000000000 +0200
+++ brltty-3.7.2-3/debian/control 2006-08-27 13:24:28.000000000 +0200
@@ -3,7 +3,8 @@
Priority: extra
Maintainer: Mario Lang <[EMAIL PROTECTED]>
Build-Depends: debhelper (>= 4.2), bison, doxygen, linuxdoc-tools, groff,
- flite1-dev, libncurses5-dev, libxaw7-dev, libatspi-dev, libbluetooth2-dev |
libbluetooth-dev
+ flite1-dev, libncurses5-dev, libxaw7-dev, libatspi-dev,
+ libbluetooth2-dev | libbluetooth-dev, po-debconf
Standards-Version: 3.6.1
Package: brltty
@@ -69,7 +70,8 @@
XC-Package-Type: udeb
Section: debian-installer
Priority: extra
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, debconf, localechooser
+XB-Installer-Menu-Item: 10
Description: Access software for a blind person using a soft braille terminal
This is a small version of brltty, optimized for use on install media.
diff -urN brltty-3.7.2/debian/po/en.po brltty-3.7.2-3/debian/po/en.po
--- brltty-3.7.2/debian/po/en.po 1970-01-01 01:00:00.000000000 +0100
+++ brltty-3.7.2-3/debian/po/en.po 2006-08-27 17:27:01.000000000 +0200
@@ -0,0 +1,246 @@
+# French messages for brltty-udeb.
+# Copyright (C) 2006
+# This file is distributed under the same license as the brltty package.
+# Samuel Thibault <[EMAIL PROTECTED], 2006.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: en\n"
+"Report-Msgid-Bugs-To: [EMAIL PROTECTED]"
+"POT-Creation-Date: 2006-08-27 17:27+0200\n"
+"PO-Revision-Date: 2006-08-27 17:05+0200\n"
+"Last-Translator: Samuel Thibault <[EMAIL PROTECTED]>\n"
+"Language-Team: Debian Installer <debian-boot@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: text
+#. Description
+#: ../brltty-udeb.templates-in:1001
+msgid "Choose Braille table"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../brltty-udeb.templates-in:2001
+msgid "Braille driver:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../brltty-udeb.templates-in:3001
+msgid "Braille device:"
+msgstr ""
+
+#. Type: select
+#. Choices
+#. Translators, keep the first word as is, and please avoid letters other than
+#. just plain a-z, because only a-z have standard braille representations
+#: ../brltty-udeb.templates-in:4001
+msgid "cz"
+msgstr "cz - Czech"
+
+#. Type: select
+#. Choices
+#. Translators, keep the first word as is, and please avoid letters other than
+#. just plain a-z, because only a-z have standard braille representations
+#: ../brltty-udeb.templates-in:4001
+msgid "da"
+msgstr "da - Danish"
+
+#. Type: select
+#. Choices
+#. Translators, keep the first word as is, and please avoid letters other than
+#. just plain a-z, because only a-z have standard braille representations
+#: ../brltty-udeb.templates-in:4001
+msgid "da-lt"
+msgstr "da-lt - Danish (LogText)"
+
+#. Type: select
+#. Choices
+#. Translators, keep the first word as is, and please avoid letters other than
+#. just plain a-z, because only a-z have standard braille representations
+#: ../brltty-udeb.templates-in:4001
+msgid "da-1252"
+msgstr "da-1252 - Danish (Windows)"
+
+#. Type: select
+#. Choices
+#. Translators, keep the first word as is, and please avoid letters other than
+#. just plain a-z, because only a-z have standard braille representations
+#: ../brltty-udeb.templates-in:4001
+msgid "de"
+msgstr "de - German"
+
+#. Type: select
+#. Choices
+#. Translators, keep the first word as is, and please avoid letters other than
+#. just plain a-z, because only a-z have standard braille representations
+#: ../brltty-udeb.templates-in:4001
+msgid "es"
+msgstr "es - Spanish"
+
+#. Type: select
+#. Choices
+#. Translators, keep the first word as is, and please avoid letters other than
+#. just plain a-z, because only a-z have standard braille representations
+#: ../brltty-udeb.templates-in:4001
+msgid "fi1"
+msgstr "fi1 - Finnish (official)"
+
+#. Type: select
+#. Choices
+#. Translators, keep the first word as is, and please avoid letters other than
+#. just plain a-z, because only a-z have standard braille representations
+#: ../brltty-udeb.templates-in:4001
+msgid "fi2"
+msgstr "fi2 - Finnish (smarter)"
+
+#. Type: select
+#. Choices
+#. Translators, keep the first word as is, and please avoid letters other than
+#. just plain a-z, because only a-z have standard braille representations
+#: ../brltty-udeb.templates-in:4001
+msgid "fr-cbifs"
+msgstr "fr-cbifs - French (CBIFS)"
+
+#. Type: select
+#. Choices
+#. Translators, keep the first word as is, and please avoid letters other than
+#. just plain a-z, because only a-z have standard braille representations
+#: ../brltty-udeb.templates-in:4001
+msgid "fr_CA"
+msgstr "fr_CA - French (Canada)"
+
+#. Type: select
+#. Choices
+#. Translators, keep the first word as is, and please avoid letters other than
+#. just plain a-z, because only a-z have standard braille representations
+#: ../brltty-udeb.templates-in:4001
+msgid "fr_FR"
+msgstr "fr_FR - French (France)"
+
+#. Type: select
+#. Choices
+#. Translators, keep the first word as is, and please avoid letters other than
+#. just plain a-z, because only a-z have standard braille representations
+#: ../brltty-udeb.templates-in:4001
+msgid "visiob"
+msgstr "visiob - VisioBraille French"
+
+#. Type: select
+#. Choices
+#. Translators, keep the first word as is, and please avoid letters other than
+#. just plain a-z, because only a-z have standard braille representations
+#: ../brltty-udeb.templates-in:4001
+msgid "it"
+msgstr "it - Italian"
+
+#. Type: select
+#. Choices
+#. Translators, keep the first word as is, and please avoid letters other than
+#. just plain a-z, because only a-z have standard braille representations
+#: ../brltty-udeb.templates-in:4001
+msgid "no-h"
+msgstr "no-h - Norwegian and German"
+
+#. Type: select
+#. Choices
+#. Translators, keep the first word as is, and please avoid letters other than
+#. just plain a-z, because only a-z have standard braille representations
+#: ../brltty-udeb.templates-in:4001
+msgid "no-p"
+msgstr "no-p - Norwegian"
+
+#. Type: select
+#. Choices
+#. Translators, keep the first word as is, and please avoid letters other than
+#. just plain a-z, because only a-z have standard braille representations
+#: ../brltty-udeb.templates-in:4001
+msgid "pl"
+msgstr "pl - Polish"
+
+#. Type: select
+#. Choices
+#. Translators, keep the first word as is, and please avoid letters other than
+#. just plain a-z, because only a-z have standard braille representations
+#: ../brltty-udeb.templates-in:4001
+msgid "ru"
+msgstr "ru - Russian"
+
+#. Type: select
+#. Choices
+#. Translators, keep the first word as is, and please avoid letters other than
+#. just plain a-z, because only a-z have standard braille representations
+#: ../brltty-udeb.templates-in:4001
+msgid "se"
+msgstr "se - Swedish (1996)"
+
+#. Type: select
+#. Choices
+#. Translators, keep the first word as is, and please avoid letters other than
+#. just plain a-z, because only a-z have standard braille representations
+#: ../brltty-udeb.templates-in:4001
+msgid "se-old"
+msgstr "se-old - Swedish (1989)"
+
+#. Type: select
+#. Choices
+#. Translators, keep the first word as is, and please avoid letters other than
+#. just plain a-z, because only a-z have standard braille representations
+#: ../brltty-udeb.templates-in:4001
+msgid "simple"
+msgstr "simple"
+
+#. Type: select
+#. Choices
+#. Translators, keep the first word as is, and please avoid letters other than
+#. just plain a-z, because only a-z have standard braille representations
+#: ../brltty-udeb.templates-in:4001
+msgid "uk"
+msgstr "uk - United Kingdom English"
+
+#. Type: select
+#. Choices
+#. Translators, keep the first word as is, and please avoid letters other than
+#. just plain a-z, because only a-z have standard braille representations
+#: ../brltty-udeb.templates-in:4001
+msgid "us"
+msgstr "us - American English"
+
+#. Type: select
+#. Choices
+#. Translators, keep the first word as is, and please avoid letters other than
+#. just plain a-z, because only a-z have standard braille representations
+#: ../brltty-udeb.templates-in:4001
+msgid "vni"
+msgstr "vni - Vietnamese"
+
+#. Type: select
+#. Choices
+#. Translators, keep the first word as is, and please avoid letters other than
+#. just plain a-z, because only a-z have standard braille representations
+#: ../brltty-udeb.templates-in:4001
+msgid "nabcc"
+msgstr "nabcc - North American"
+
+#. Type: select
+#. Description
+#: ../brltty-udeb.templates-in:4002
+msgid "Braille table:"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../brltty-udeb.templates-in:4002
+msgid ""
+"Please chose a braille table. If BrlTTY should not be restarted, please "
+"choose \"nabcc\"."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../brltty-udeb.templates-in:5001
+msgid "Extra BrlTTY options:"
+msgstr ""
diff -urN brltty-3.7.2/debian/po/fr.po brltty-3.7.2-3/debian/po/fr.po
--- brltty-3.7.2/debian/po/fr.po 1970-01-01 01:00:00.000000000 +0100
+++ brltty-3.7.2-3/debian/po/fr.po 2006-08-27 17:27:01.000000000 +0200
@@ -0,0 +1,248 @@
+# French messages for brltty-udeb.
+# Copyright (C) 2006
+# This file is distributed under the same license as the brltty package.
+# Samuel Thibault <[EMAIL PROTECTED], 2006.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: fr\n"
+"Report-Msgid-Bugs-To: [EMAIL PROTECTED]"
+"POT-Creation-Date: 2006-08-27 17:27+0200\n"
+"PO-Revision-Date: 2006-08-27 17:05+0200\n"
+"Last-Translator: Samuel Thibault <[EMAIL PROTECTED]>\n"
+"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: text
+#. Description
+#: ../brltty-udeb.templates-in:1001
+msgid "Choose Braille table"
+msgstr "Choisir une table Braille"
+
+#. Type: string
+#. Description
+#: ../brltty-udeb.templates-in:2001
+msgid "Braille driver:"
+msgstr "Driver Braille:"
+
+#. Type: string
+#. Description
+#: ../brltty-udeb.templates-in:3001
+msgid "Braille device:"
+msgstr "Peripherique Braille:"
+
+#. Type: select
+#. Choices
+#. Translators, keep the first word as is, and please avoid letters other than
+#. just plain a-z, because only a-z have standard braille representations
+#: ../brltty-udeb.templates-in:4001
+msgid "cz"
+msgstr "cz - Tcheque"
+
+#. Type: select
+#. Choices
+#. Translators, keep the first word as is, and please avoid letters other than
+#. just plain a-z, because only a-z have standard braille representations
+#: ../brltty-udeb.templates-in:4001
+msgid "da"
+msgstr "da - Danois"
+
+#. Type: select
+#. Choices
+#. Translators, keep the first word as is, and please avoid letters other than
+#. just plain a-z, because only a-z have standard braille representations
+#: ../brltty-udeb.templates-in:4001
+msgid "da-lt"
+msgstr "da-lt - Danois (LogText)"
+
+#. Type: select
+#. Choices
+#. Translators, keep the first word as is, and please avoid letters other than
+#. just plain a-z, because only a-z have standard braille representations
+#: ../brltty-udeb.templates-in:4001
+msgid "da-1252"
+msgstr "da-1252 - Danois (Windows)"
+
+#. Type: select
+#. Choices
+#. Translators, keep the first word as is, and please avoid letters other than
+#. just plain a-z, because only a-z have standard braille representations
+#: ../brltty-udeb.templates-in:4001
+msgid "de"
+msgstr "de - Allemand"
+
+#. Type: select
+#. Choices
+#. Translators, keep the first word as is, and please avoid letters other than
+#. just plain a-z, because only a-z have standard braille representations
+#: ../brltty-udeb.templates-in:4001
+msgid "es"
+msgstr "es - Espagnol"
+
+#. Type: select
+#. Choices
+#. Translators, keep the first word as is, and please avoid letters other than
+#. just plain a-z, because only a-z have standard braille representations
+#: ../brltty-udeb.templates-in:4001
+msgid "fi1"
+msgstr "fi1 - Finlandais (officiel)"
+
+#. Type: select
+#. Choices
+#. Translators, keep the first word as is, and please avoid letters other than
+#. just plain a-z, because only a-z have standard braille representations
+#: ../brltty-udeb.templates-in:4001
+msgid "fi2"
+msgstr "fi2 - Finlandais (mieux pense)"
+
+#. Type: select
+#. Choices
+#. Translators, keep the first word as is, and please avoid letters other than
+#. just plain a-z, because only a-z have standard braille representations
+#: ../brltty-udeb.templates-in:4001
+msgid "fr-cbifs"
+msgstr "fr-cbifs - Francais (CBIFS)"
+
+#. Type: select
+#. Choices
+#. Translators, keep the first word as is, and please avoid letters other than
+#. just plain a-z, because only a-z have standard braille representations
+#: ../brltty-udeb.templates-in:4001
+msgid "fr_CA"
+msgstr "fr_CA - Francais (Canada)"
+
+#. Type: select
+#. Choices
+#. Translators, keep the first word as is, and please avoid letters other than
+#. just plain a-z, because only a-z have standard braille representations
+#: ../brltty-udeb.templates-in:4001
+msgid "fr_FR"
+msgstr "fr_FR - Francais (France)"
+
+#. Type: select
+#. Choices
+#. Translators, keep the first word as is, and please avoid letters other than
+#. just plain a-z, because only a-z have standard braille representations
+#: ../brltty-udeb.templates-in:4001
+msgid "visiob"
+msgstr "visiob - Francais VisioBraille"
+
+#. Type: select
+#. Choices
+#. Translators, keep the first word as is, and please avoid letters other than
+#. just plain a-z, because only a-z have standard braille representations
+#: ../brltty-udeb.templates-in:4001
+msgid "it"
+msgstr "it - Italien"
+
+#. Type: select
+#. Choices
+#. Translators, keep the first word as is, and please avoid letters other than
+#. just plain a-z, because only a-z have standard braille representations
+#: ../brltty-udeb.templates-in:4001
+msgid "no-h"
+msgstr "no-h - Norvegien et Allemand"
+
+#. Type: select
+#. Choices
+#. Translators, keep the first word as is, and please avoid letters other than
+#. just plain a-z, because only a-z have standard braille representations
+#: ../brltty-udeb.templates-in:4001
+msgid "no-p"
+msgstr "no-p - Norvegien"
+
+#. Type: select
+#. Choices
+#. Translators, keep the first word as is, and please avoid letters other than
+#. just plain a-z, because only a-z have standard braille representations
+#: ../brltty-udeb.templates-in:4001
+msgid "pl"
+msgstr "pl - Polonais"
+
+#. Type: select
+#. Choices
+#. Translators, keep the first word as is, and please avoid letters other than
+#. just plain a-z, because only a-z have standard braille representations
+#: ../brltty-udeb.templates-in:4001
+msgid "ru"
+msgstr "ru - Russe"
+
+#. Type: select
+#. Choices
+#. Translators, keep the first word as is, and please avoid letters other than
+#. just plain a-z, because only a-z have standard braille representations
+#: ../brltty-udeb.templates-in:4001
+msgid "se"
+msgstr "se - Suedois (1996)"
+
+#. Type: select
+#. Choices
+#. Translators, keep the first word as is, and please avoid letters other than
+#. just plain a-z, because only a-z have standard braille representations
+#: ../brltty-udeb.templates-in:4001
+msgid "se-old"
+msgstr "se-old - Suedois (1989)"
+
+#. Type: select
+#. Choices
+#. Translators, keep the first word as is, and please avoid letters other than
+#. just plain a-z, because only a-z have standard braille representations
+#: ../brltty-udeb.templates-in:4001
+msgid "simple"
+msgstr "simple"
+
+#. Type: select
+#. Choices
+#. Translators, keep the first word as is, and please avoid letters other than
+#. just plain a-z, because only a-z have standard braille representations
+#: ../brltty-udeb.templates-in:4001
+msgid "uk"
+msgstr "uk - Anglais d'Angleterre"
+
+#. Type: select
+#. Choices
+#. Translators, keep the first word as is, and please avoid letters other than
+#. just plain a-z, because only a-z have standard braille representations
+#: ../brltty-udeb.templates-in:4001
+msgid "us"
+msgstr "us - Anglais d'Amerique"
+
+#. Type: select
+#. Choices
+#. Translators, keep the first word as is, and please avoid letters other than
+#. just plain a-z, because only a-z have standard braille representations
+#: ../brltty-udeb.templates-in:4001
+msgid "vni"
+msgstr "vni - Vietnamien"
+
+#. Type: select
+#. Choices
+#. Translators, keep the first word as is, and please avoid letters other than
+#. just plain a-z, because only a-z have standard braille representations
+#: ../brltty-udeb.templates-in:4001
+msgid "nabcc"
+msgstr "nabcc - Nord-Americain"
+
+#. Type: select
+#. Description
+#: ../brltty-udeb.templates-in:4002
+msgid "Braille table:"
+msgstr "Table Braille:"
+
+#. Type: select
+#. Description
+#: ../brltty-udeb.templates-in:4002
+msgid ""
+"Please chose a braille table. If BrlTTY should not be restarted, please "
+"choose \"nabcc\"."
+msgstr ""
+"Veuillez choisir une table braille. Si BrlTTY ne devrait pas etre redemarre, "
+"choisissez \"nabcc\"."
+
+#. Type: string
+#. Description
+#: ../brltty-udeb.templates-in:5001
+msgid "Extra BrlTTY options:"
+msgstr "Options BrlTTY supplementaires:"
diff -urN brltty-3.7.2/debian/po/POTFILES.in
brltty-3.7.2-3/debian/po/POTFILES.in
--- brltty-3.7.2/debian/po/POTFILES.in 1970-01-01 01:00:00.000000000 +0100
+++ brltty-3.7.2-3/debian/po/POTFILES.in 2006-08-27 13:11:00.000000000
+0200
@@ -0,0 +1 @@
+[type: gettext/rfc822deb] brltty-udeb.templates-in
diff -urN brltty-3.7.2/debian/po/templates.pot
brltty-3.7.2-3/debian/po/templates.pot
--- brltty-3.7.2/debian/po/templates.pot 1970-01-01 01:00:00.000000000
+0100
+++ brltty-3.7.2-3/debian/po/templates.pot 2006-08-27 17:27:01.000000000
+0200
@@ -0,0 +1,247 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <[EMAIL PROTECTED]>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: [EMAIL PROTECTED]"
+"POT-Creation-Date: 2006-08-27 17:27+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <[EMAIL PROTECTED]>\n"
+"Language-Team: LANGUAGE <[EMAIL PROTECTED]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: text
+#. Description
+#: ../brltty-udeb.templates-in:1001
+msgid "Choose Braille table"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../brltty-udeb.templates-in:2001
+msgid "Braille driver:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../brltty-udeb.templates-in:3001
+msgid "Braille device:"
+msgstr ""
+
+#. Type: select
+#. Choices
+#. Translators, keep the first word as is, and please avoid letters other than
+#. just plain a-z, because only a-z have standard braille representations
+#: ../brltty-udeb.templates-in:4001
+msgid "cz"
+msgstr ""
+
+#. Type: select
+#. Choices
+#. Translators, keep the first word as is, and please avoid letters other than
+#. just plain a-z, because only a-z have standard braille representations
+#: ../brltty-udeb.templates-in:4001
+msgid "da"
+msgstr ""
+
+#. Type: select
+#. Choices
+#. Translators, keep the first word as is, and please avoid letters other than
+#. just plain a-z, because only a-z have standard braille representations
+#: ../brltty-udeb.templates-in:4001
+msgid "da-lt"
+msgstr ""
+
+#. Type: select
+#. Choices
+#. Translators, keep the first word as is, and please avoid letters other than
+#. just plain a-z, because only a-z have standard braille representations
+#: ../brltty-udeb.templates-in:4001
+msgid "da-1252"
+msgstr ""
+
+#. Type: select
+#. Choices
+#. Translators, keep the first word as is, and please avoid letters other than
+#. just plain a-z, because only a-z have standard braille representations
+#: ../brltty-udeb.templates-in:4001
+msgid "de"
+msgstr ""
+
+#. Type: select
+#. Choices
+#. Translators, keep the first word as is, and please avoid letters other than
+#. just plain a-z, because only a-z have standard braille representations
+#: ../brltty-udeb.templates-in:4001
+msgid "es"
+msgstr ""
+
+#. Type: select
+#. Choices
+#. Translators, keep the first word as is, and please avoid letters other than
+#. just plain a-z, because only a-z have standard braille representations
+#: ../brltty-udeb.templates-in:4001
+msgid "fi1"
+msgstr ""
+
+#. Type: select
+#. Choices
+#. Translators, keep the first word as is, and please avoid letters other than
+#. just plain a-z, because only a-z have standard braille representations
+#: ../brltty-udeb.templates-in:4001
+msgid "fi2"
+msgstr ""
+
+#. Type: select
+#. Choices
+#. Translators, keep the first word as is, and please avoid letters other than
+#. just plain a-z, because only a-z have standard braille representations
+#: ../brltty-udeb.templates-in:4001
+msgid "fr-cbifs"
+msgstr ""
+
+#. Type: select
+#. Choices
+#. Translators, keep the first word as is, and please avoid letters other than
+#. just plain a-z, because only a-z have standard braille representations
+#: ../brltty-udeb.templates-in:4001
+msgid "fr_CA"
+msgstr ""
+
+#. Type: select
+#. Choices
+#. Translators, keep the first word as is, and please avoid letters other than
+#. just plain a-z, because only a-z have standard braille representations
+#: ../brltty-udeb.templates-in:4001
+msgid "fr_FR"
+msgstr ""
+
+#. Type: select
+#. Choices
+#. Translators, keep the first word as is, and please avoid letters other than
+#. just plain a-z, because only a-z have standard braille representations
+#: ../brltty-udeb.templates-in:4001
+msgid "visiob"
+msgstr ""
+
+#. Type: select
+#. Choices
+#. Translators, keep the first word as is, and please avoid letters other than
+#. just plain a-z, because only a-z have standard braille representations
+#: ../brltty-udeb.templates-in:4001
+msgid "it"
+msgstr ""
+
+#. Type: select
+#. Choices
+#. Translators, keep the first word as is, and please avoid letters other than
+#. just plain a-z, because only a-z have standard braille representations
+#: ../brltty-udeb.templates-in:4001
+msgid "no-h"
+msgstr ""
+
+#. Type: select
+#. Choices
+#. Translators, keep the first word as is, and please avoid letters other than
+#. just plain a-z, because only a-z have standard braille representations
+#: ../brltty-udeb.templates-in:4001
+msgid "no-p"
+msgstr ""
+
+#. Type: select
+#. Choices
+#. Translators, keep the first word as is, and please avoid letters other than
+#. just plain a-z, because only a-z have standard braille representations
+#: ../brltty-udeb.templates-in:4001
+msgid "pl"
+msgstr ""
+
+#. Type: select
+#. Choices
+#. Translators, keep the first word as is, and please avoid letters other than
+#. just plain a-z, because only a-z have standard braille representations
+#: ../brltty-udeb.templates-in:4001
+msgid "ru"
+msgstr ""
+
+#. Type: select
+#. Choices
+#. Translators, keep the first word as is, and please avoid letters other than
+#. just plain a-z, because only a-z have standard braille representations
+#: ../brltty-udeb.templates-in:4001
+msgid "se"
+msgstr ""
+
+#. Type: select
+#. Choices
+#. Translators, keep the first word as is, and please avoid letters other than
+#. just plain a-z, because only a-z have standard braille representations
+#: ../brltty-udeb.templates-in:4001
+msgid "se-old"
+msgstr ""
+
+#. Type: select
+#. Choices
+#. Translators, keep the first word as is, and please avoid letters other than
+#. just plain a-z, because only a-z have standard braille representations
+#: ../brltty-udeb.templates-in:4001
+msgid "simple"
+msgstr ""
+
+#. Type: select
+#. Choices
+#. Translators, keep the first word as is, and please avoid letters other than
+#. just plain a-z, because only a-z have standard braille representations
+#: ../brltty-udeb.templates-in:4001
+msgid "uk"
+msgstr ""
+
+#. Type: select
+#. Choices
+#. Translators, keep the first word as is, and please avoid letters other than
+#. just plain a-z, because only a-z have standard braille representations
+#: ../brltty-udeb.templates-in:4001
+msgid "us"
+msgstr ""
+
+#. Type: select
+#. Choices
+#. Translators, keep the first word as is, and please avoid letters other than
+#. just plain a-z, because only a-z have standard braille representations
+#: ../brltty-udeb.templates-in:4001
+msgid "vni"
+msgstr ""
+
+#. Type: select
+#. Choices
+#. Translators, keep the first word as is, and please avoid letters other than
+#. just plain a-z, because only a-z have standard braille representations
+#: ../brltty-udeb.templates-in:4001
+msgid "nabcc"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../brltty-udeb.templates-in:4002
+msgid "Braille table:"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../brltty-udeb.templates-in:4002
+msgid ""
+"Please chose a braille table. If BrlTTY should not be restarted, please "
+"choose \"nabcc\"."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../brltty-udeb.templates-in:5001
+msgid "Extra BrlTTY options:"
+msgstr ""
diff -urN brltty-3.7.2/debian/rules brltty-3.7.2-3/debian/rules
--- brltty-3.7.2/debian/rules 2006-08-27 04:43:06.000000000 +0200
+++ brltty-3.7.2-3/debian/rules 2006-08-27 14:18:10.000000000 +0200
@@ -31,8 +31,12 @@
-test -r /usr/share/misc/config.guess && \
cp -f /usr/share/misc/config.guess acdir/config.guess
+ rm -f debian/brltty-udeb.templates
+
dh_clean
+ debconf-updatepo
+
configure: build-brltty/config.status
build-brltty/config.status:
mkdir build-brltty
@@ -127,8 +131,8 @@
$(MAKE) -C build-brltty-udeb install
INSTALL_ROOT=`pwd`/debian/brltty-udeb
- cp debian/brltty-udeb.prebaseconfig
debian/brltty-udeb/usr/lib/prebaseconfig.d/50brltty
- chmod 0755 debian/brltty-udeb/usr/lib/prebaseconfig.d/50brltty
+ cp debian/brltty-udeb.finish-install
debian/brltty-udeb/usr/lib/finish-install.d/19brltty
+ chmod 0755 debian/brltty-udeb/usr/lib/finish-install.d/19brltty
rm -f debian/brltty-udeb/sbin/brltty-*
rm -Rf debian/brltty-udeb/usr/share
# Strip comments from translation tables
@@ -146,6 +150,8 @@
cp debian/brltty-udeb.udev.rules debian/$@/etc/udev/rules.d/brltty.rules
cp debian/brltty-udeb.sh debian/$@/lib/brltty/brltty.sh
chmod +x debian/$@/lib/brltty/brltty.sh
+ po2debconf -o debian/brltty-udeb.templates
debian/brltty-udeb.templates-in
+ dh_installdebconf -p$@
dh_strip -p$@
dh_fixperms -p$@
dh_installdeb -p$@
diff -urN brltty-3.7.2/Programs/scr_help.c brltty-3.7.2-3/Programs/scr_help.c
--- brltty-3.7.2/Programs/scr_help.c 2005-12-26 13:57:10.000000000 +0100
+++ brltty-3.7.2-3/Programs/scr_help.c 2006-08-27 04:55:57.000000000 +0200
@@ -23,6 +23,7 @@
#include <string.h>
#include <sys/stat.h>
#include <fcntl.h>
+#include <errno.h>
#include "misc.h"
#include "scr.h"
@@ -66,7 +67,7 @@
int bytesRead;
if ((fileDescriptor = open(file, O_RDONLY)) == -1) {
- LogError("Help file open");
+ LogPrint(LOG_WARNING, "Help file open error %d: %s", errno,
strerror(errno));
goto failure;
}
diff -urN brltty-3.7.2/ScreenDrivers/Linux/screen.c
brltty-3.7.2-3/ScreenDrivers/Linux/screen.c
--- brltty-3.7.2/ScreenDrivers/Linux/screen.c 2005-12-26 13:58:05.000000000
+0100
+++ brltty-3.7.2-3/ScreenDrivers/Linux/screen.c 2006-08-27 04:02:04.000000000
+0200
@@ -243,9 +243,11 @@
int file;
LogPrint(LOG_DEBUG, "Opening %s device: %s", description, path);
if ((file = open(path, flags)) == -1) {
- LogPrint(LOG_ERR, "Cannot open %s device: %s: %s",
+ int create = errno == ENOENT;
+ LogPrint(create? LOG_WARNING: LOG_ERR,
+ "Cannot open %s device: %s: %s",
description, path, strerror(errno));
- if (errno == ENOENT) {
+ if (create) {
mode_t mode = S_IFCHR | S_IRUSR | S_IWUSR;
LogPrint(LOG_NOTICE, "Creating %s device: %s mode=%06o major=%d
minor=%d",
description, path, mode, major, minor);
