Bug#777501: unblock: brltty/5.2~20141018-3
Package: release.debian.org
Severity: normal
User: [email protected]
Usertags: unblock
Please unblock package brltty
This is a followup to the unblock request #777384: brltty 5.2~20141018-3
fixes braille input when using lightdm (#777377) by making xbrlapi aware
of XDG_VTNR (in addition to WINDOWPATH, not set by lightdm), already
commited upstream. As explained in #777384, this breaks the braille
output of previous versions of Orca, thus introducing a Breaks.
Also, this adds support in d-i to auto-enable beep in grub when
installing with brltty, as discussed on debian-boot and acked by kibi
(in Cc so he can confirm the udeb unblock).
unblock brltty/5.2~20141018-3
-- System Information:
Debian Release: 8.0
APT prefers testing
APT policy: (990, 'testing'), (500, 'buildd-unstable'), (500, 'unstable'), (500, 'stable'), (500, 'oldstable'), (1, 'buildd-experimental'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.18.0 (SMP w/8 CPU cores)
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
Init: systemd (via /run/systemd/system)
--
Samuel
> Quelqu'un aurait-il une solution pour réinitialiser un MBR
Si tu veux qu'il soit complètement blanc (pas souhaitable, à mon avis) :
dd if=/dev/zero of=/dev/hda bs=512 count=1 (sous Linux)
-+- OT in Guide du linuxien (très) pervers - "Pour les K difficiles" -+-
diff -Nru brltty-5.2~20141018/debian/brltty-udeb.prebaseconfig brltty-5.2~20141018/debian/brltty-udeb.prebaseconfig
--- brltty-5.2~20141018/debian/brltty-udeb.prebaseconfig 2014-11-02 18:40:49.000000000 +0100
+++ brltty-5.2~20141018/debian/brltty-udeb.prebaseconfig 2015-02-07 20:40:52.000000000 +0100
@@ -81,6 +81,11 @@
fi
fi
+ # Grub
+ mkdir -p /target/etc/default/grub.d
+ echo 'GRUB_INIT_TUNE="480 440 1"' > /target/etc/default/grub.d/brltty.cfg
+ [ -x /target/usr/sbin/update-grub ] && /bin/in-target /usr/sbin/update-grub || true
+
# Gnome 2
/bin/in-target su -s /bin/sh -c "gconftool-2 --type bool --set /desktop/gnome/applications/at/screen_reader_enabled true" Debian-gdm || true
diff -Nru brltty-5.2~20141018/debian/changelog brltty-5.2~20141018/debian/changelog
--- brltty-5.2~20141018/debian/changelog 2014-11-06 19:53:49.000000000 +0100
+++ brltty-5.2~20141018/debian/changelog 2015-02-08 22:58:15.000000000 +0100
@@ -1,3 +1,13 @@
+brltty (5.2~20141018-3) unstable; urgency=medium
+
+ * brltty-udeb.prebaseconfig: Make grub beep at boot when brltty was used
+ during installation (Closes: #774536).
+ * patches/git-2421eda: Fix xbrlapi window path computation (Closes: #777377).
+ * control: Break old version of Orca which does not have the same fix as
+ xbrlapi.
+
+ -- Samuel Thibault <[email protected]> Sun, 08 Feb 2015 22:58:05 +0100
+
brltty (5.2~20141018-2) unstable; urgency=medium
* patches/git-a7123d7: Fix brlapi output with the NoScreen screen driver.
diff -Nru brltty-5.2~20141018/debian/control brltty-5.2~20141018/debian/control
--- brltty-5.2~20141018/debian/control 2014-11-02 18:40:49.000000000 +0100
+++ brltty-5.2~20141018/debian/control 2015-02-08 23:12:23.000000000 +0100
@@ -210,6 +210,7 @@
Architecture: any
Recommends: xbrlapi (>= 4.3-3)
Depends: ${shlibs:Depends}, ${misc:Depends}, brltty (= ${binary:Version})
+Breaks: gnome-orca (<< 3.14.0-3~)
Description: Access software for a blind person using a braille display - X11 drivers
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
diff -Nru brltty-5.2~20141018/debian/patches/git-2421eda brltty-5.2~20141018/debian/patches/git-2421eda
--- brltty-5.2~20141018/debian/patches/git-2421eda 1970-01-01 01:00:00.000000000 +0100
+++ brltty-5.2~20141018/debian/patches/git-2421eda 2015-02-08 22:59:52.000000000 +0100
@@ -0,0 +1,26 @@
+commit 2421eda2cf18ea4684b904867735778509af26c6
+Author: Dave Mielke <[email protected]>
+Date: Sun Feb 1 17:40:30 2015 -0500
+
+ Fix XDG_VTNR/WINDOWPATH support in xbrlapi. (st)
+
+diff --git a/Programs/xbrlapi.c b/Programs/xbrlapi.c
+index 4822e11..093f2c4 100644
+--- a/Programs/xbrlapi.c
++++ b/Programs/xbrlapi.c
+@@ -185,12 +185,13 @@ static int getXVTnb(void);
+
+ void getVT(void) {
+ char *path = getenv("WINDOWPATH");
++ char *vtnr = getenv("XDG_VTNR");
+ int vtno = -1;
+- if (!path)
++ if (!path && !vtnr)
+ /* Workaround for old xinit/xdm/gdm/kdm */
+ vtno = getXVTnb();
+
+- if (path || vtno == -1) {
++ if (path || vtnr || vtno == -1) {
+ if (brlapi_enterTtyModeWithPath(NULL,0,NULL)<0)
+ fatal_brlapi_errno("geTtyPath",gettext("cannot get tty\n"));
+ } else {
diff -Nru brltty-5.2~20141018/debian/patches/series brltty-5.2~20141018/debian/patches/series
--- brltty-5.2~20141018/debian/patches/series 2014-11-02 18:40:49.000000000 +0100
+++ brltty-5.2~20141018/debian/patches/series 2015-02-07 21:40:07.000000000 +0100
@@ -4,3 +4,4 @@
41-java-bytecode-compat.patch
50-constants.patch
git-a7123d7
+git-2421eda
Reply to: