Bug#633004: pu: package brltty/4.2-7+squeeze1

[Samuel Thibault <sthibault@debian.org>]

Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: pu

Hello,

We would like to upload a fixed version of brltty to squeeze and get
the debian installer rebuilt: when configuring the use of a braille
device during installation, in some syntax cases, braille support gets
broken at reboot, which is really a problem for our blind users. The
documentation only provides the syntax which works, but the non-working
syntaxes are also well-known and should work, so users tend to use it by
default.

The attached patch is the fix which is now well-tested in sid.

Samuel

-- System Information:
Debian Release: wheezy/sid
  APT prefers testing
  APT policy: (990, 'testing'), (500, 'unstable'), (500, 'stable'), (1, 'experimental')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.39-2-amd64 (SMP w/2 CPU cores)
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash

-- 
Samuel Thibault <samuel.thibault@fnac.net>
/* Halley */

	(Halley's comment.)

diff --git a/debian/brltty-udeb.prebaseconfig b/debian/brltty-udeb.prebaseconfig
index 9549f37..792ed86 100644
--- a/debian/brltty-udeb.prebaseconfig
+++ b/debian/brltty-udeb.prebaseconfig
@@ -24,7 +24,7 @@ parse()
             number=1
             while [ "${number}" -le 3 ]
             do
-               parameter="`echo ${parameters} | cut -d, -f${number}`"
+               parameter="${parameters%%,*}"
                if [ -n "${parameter}" ]
                then
                   case "${number}"
@@ -33,7 +33,7 @@ parse()
                         brailleDriver="${parameter}"
                         ;;
                      2)
-                        brailleDevice=${parameter}
+                        brailleDevice="${parameter}"
                         ;;
                      3)
                         textTable="${parameter}"
@@ -42,6 +42,9 @@ parse()
                fi
 
                number="`expr ${number} + 1`"
+               new_parameters="${parameters#*,}"
+               [ "${new_parameters}" != "${parameters}" ] || break
+               parameters="${new_parameters}"
             done
             ;;
       esac
@@ -58,6 +61,8 @@ parse()
       echo "braille-device ${brailleDevice}"
       [ -n "${textTable}" ] && echo "text-table ${textTable}"
    fi
+
+   true
 }
 
 unset DEBIAN_HAS_FRONTEND
diff --git a/debian/changelog b/debian/changelog
index add8fd7..dd2abe1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+brltty (4.2-7+squeeze1) squeeze; urgency=low
+
+  * brltty-udeb.prebasconfig:
+    - do not stop and not setup gconf just because no table was specified in
+    kernel parameters.
+    - Fix parsing brltty= when not all parameters are provided.
+
+ -- Samuel Thibault <sthibault@debian.org>  Thu, 07 Jul 2011 21:43:22 +0200
+
 brltty (4.2-7) unstable; urgency=low
 
   * debian/brltty-udeb.init: Call udevadm settle before deciding whether to