--- Begin Message ---
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package brltty
unblock brltty/4.4-7
There are four changes here:
- The first is for d-i, it fixes the activation of the screen reader in
the installed system. You can see it already done for gnome 2 through
gconftool, we now also need to do it the gnome 3 way through gsettings.
- The second is a FTBFS fix: brltty actually needs tcl >= 8.5, so let's
document it in build-depends.
- The third and fourth, from upstream, bring support for some new
braille models. This is actually no code change, but just the missing
additional detection string, so on already-supported hardware that does
not change anything, and on the newly-supported hardware, they would not
work at all before, and work fine after. This is an important support,
since that's basically what users require to be able to use the system
at all.
Samuel
diff -Nru brltty-4.4/debian/brltty-udeb.prebaseconfig brltty-4.4/debian/brltty-udeb.prebaseconfig
--- brltty-4.4/debian/brltty-udeb.prebaseconfig 2012-07-05 04:04:47.000000000 +0200
+++ brltty-4.4/debian/brltty-udeb.prebaseconfig 2012-12-07 02:32:05.000000000 +0100
@@ -82,10 +82,17 @@
fi
/bin/in-target su -s /bin/sh -c "gconftool-2 --type bool --set /desktop/gnome/applications/at/screen_reader_enabled true" Debian-gdm || true
+
+ /bin/in-target su -s /bin/sh -c 'eval $(dbus-launch) ; export DBUS_SESSION_BUS_ADDRESS DBUS_SESSION_BUS_PID ; GSETTINGS_BACKEND=dconf gsettings set org.gnome.desktop.a11y.applications screen-reader-enabled true' Debian-gdm || true
+
db_get passwd/username
USERNAME="$RET"
if [ -n "$USERNAME" ]
then
+ # Gnome 3
+ /bin/in-target su -s /bin/sh -c 'eval $(dbus-launch) ; export DBUS_SESSION_BUS_ADDRESS DBUS_SESSION_BUS_PID ; GSETTINGS_BACKEND=dconf gsettings set org.gnome.desktop.a11y.applications screen-reader-enabled true' "$USERNAME" || true
+
+ # Gnome 2
/bin/in-target su -s /bin/sh -c "gconftool-2 --type bool --set /desktop/gnome/interface/accessibility true" "$USERNAME" || true
/bin/in-target su -s /bin/sh -c "gconftool-2 --type bool --set /desktop/gnome/applications/at/visual/startup true" "$USERNAME" || true
/bin/in-target su -s /bin/sh -c "gconftool-2 --type bool --set /desktop/gnome/sound/event_sounds true" "$USERNAME" || true
diff -Nru brltty-4.4/debian/changelog brltty-4.4/debian/changelog
--- brltty-4.4/debian/changelog 2012-08-28 10:09:37.000000000 +0200
+++ brltty-4.4/debian/changelog 2012-12-20 20:41:45.000000000 +0100
@@ -1,3 +1,21 @@
+brltty (4.4-7) unstable; urgency=low
+
+ * control: Add >= 8.5~ version to tcl build-depend, as brltty won't build
+ with tcl 8.4.
+ * patches/30-late-fixes-r6685.patch: Avoid cosmetic change in patch.
+
+ -- Samuel Thibault <sthibault@debian.org> Thu, 20 Dec 2012 20:41:43 +0100
+
+brltty (4.4-6) unstable; urgency=low
+
+ * brltty-udeb.prebaseconfig: Enable orca in gnome3 sessions too.
+ * patches/30-late-fixes-r6685.patch: New patch to trivially add support for
+ EL*c.
+ * patches/30-late-fixes-r6777.patch: New patch to trivially add support for
+ Focus 14.
+
+ -- Samuel Thibault <sthibault@debian.org> Tue, 02 Oct 2012 02:42:49 +0200
+
brltty (4.4-5) unstable; urgency=low
[ Mario Lang ]
diff -Nru brltty-4.4/debian/control brltty-4.4/debian/control
--- brltty-4.4/debian/control 2012-08-23 19:20:55.000000000 +0200
+++ brltty-4.4/debian/control 2012-12-10 16:22:40.000000000 +0100
@@ -7,7 +7,7 @@
Vcs-Git: git://git.debian.org/git/pkg-a11y/brltty.git
Homepage: http://mielke.cc/brltty/
Build-Depends: debhelper (>= 7), dh-lisp,
- autotools-dev, autoconf, tcl,
+ autotools-dev, autoconf, tcl (>= 8.5~),
libasound2-dev [linux-any],
python-dev (>= 2.7~0),
python-pyrex,
diff -Nru brltty-4.4/debian/patches/30-late-fixes-r6685.patch brltty-4.4/debian/patches/30-late-fixes-r6685.patch
--- brltty-4.4/debian/patches/30-late-fixes-r6685.patch 1970-01-01 01:00:00.000000000 +0100
+++ brltty-4.4/debian/patches/30-late-fixes-r6685.patch 2012-12-20 20:42:45.000000000 +0100
@@ -0,0 +1,147 @@
+--- a/Drivers/Braille/Papenmeier/models.h (révision 6684)
++++ b/Drivers/Braille/Papenmeier/models.h (révision 6685)
+@@ -394,6 +394,27 @@
+ KEY_NAME_TABLE(routingKeys1),
+ END_KEY_NAME_TABLES
+
++BEGIN_KEY_NAME_TABLES(el40c)
++ KEY_NAME_TABLE(bar),
++ KEY_NAME_TABLE(keys),
++ KEY_NAME_TABLE(routingKeys1),
++ KEY_NAME_TABLE(routingKeys2),
++END_KEY_NAME_TABLES
++
++BEGIN_KEY_NAME_TABLES(el60c)
++ KEY_NAME_TABLE(bar),
++ KEY_NAME_TABLE(keys),
++ KEY_NAME_TABLE(routingKeys1),
++ KEY_NAME_TABLE(routingKeys2),
++END_KEY_NAME_TABLES
++
++BEGIN_KEY_NAME_TABLES(el80c)
++ KEY_NAME_TABLE(bar),
++ KEY_NAME_TABLE(keys),
++ KEY_NAME_TABLE(routingKeys1),
++ KEY_NAME_TABLE(routingKeys2),
++END_KEY_NAME_TABLES
++
+ DEFINE_KEY_TABLE(c_486)
+ DEFINE_KEY_TABLE(2d_l)
+ DEFINE_KEY_TABLE(c)
+@@ -415,6 +436,9 @@
+ DEFINE_KEY_TABLE(el2d_80s)
+ DEFINE_KEY_TABLE(elba_trio_20)
+ DEFINE_KEY_TABLE(elba_trio_32)
++DEFINE_KEY_TABLE(el40c)
++DEFINE_KEY_TABLE(el60c)
++DEFINE_KEY_TABLE(el80c)
+
+ BEGIN_KEY_TABLE_LIST
+ &KEY_TABLE_DEFINITION(c_486),
+@@ -438,6 +462,9 @@
+ &KEY_TABLE_DEFINITION(el2d_80s),
+ &KEY_TABLE_DEFINITION(elba_trio_20),
+ &KEY_TABLE_DEFINITION(elba_trio_32),
++ &KEY_TABLE_DEFINITION(el40c),
++ &KEY_TABLE_DEFINITION(el60c),
++ &KEY_TABLE_DEFINITION(el80c),
+ END_KEY_TABLE_LIST
+
+
+@@ -565,6 +592,21 @@
+ { PM_MODEL_IDENTITY(93, elba_trio_32, "BrailleX Elba (Trio 32)", 2),
+ PM_CELL_COUNTS(32, 0),
+ PM_BAR(0, 0, 1, 1)
++ },
++
++ { PM_MODEL_IDENTITY(95, el40c, "BrailleX EL40c", 1),
++ PM_CELL_COUNTS(40, 0),
++ PM_BAR(0, 0, 1, 1)
++ },
++
++ { PM_MODEL_IDENTITY(96, el60c, "BrailleX EL60c", 1),
++ PM_CELL_COUNTS(60, 0),
++ PM_BAR(0, 0, 1, 1)
++ },
++
++ { PM_MODEL_IDENTITY(97, el80c, "BrailleX EL80c", 1),
++ PM_CELL_COUNTS(80, 0),
++ PM_BAR(0, 0, 1, 1)
+ }
+ };
+
+--- a/Tables/brl-pm-el80c.ktb (révision 0)
++++ b/Tables/brl-pm-el80c.ktb (révision 6685)
+@@ -0,0 +1,22 @@
++###############################################################################
++# BRLTTY - A background process providing access to the console screen (when in
++# text mode) for a blind person using a refreshable braille display.
++#
++# Copyright (C) 1995-2012 by The BRLTTY Developers.
++#
++# 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. Please see the file LICENSE-LGPL for details.
++#
++# Web Page: http://mielke.cc/brltty/
++#
++# This software is maintained by Dave Mielke <dave@mielke.cc>.
++###############################################################################
++
++title Papenmeier BrailleX EL80c
++
++assign statusKeys 0
++include brl-pm-bar.kti
+--- a/Tables/brl-pm-el60c.ktb (révision 0)
++++ b/Tables/brl-pm-el60c.ktb (révision 6685)
+@@ -0,0 +1,22 @@
++###############################################################################
++# BRLTTY - A background process providing access to the console screen (when in
++# text mode) for a blind person using a refreshable braille display.
++#
++# Copyright (C) 1995-2012 by The BRLTTY Developers.
++#
++# 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. Please see the file LICENSE-LGPL for details.
++#
++# Web Page: http://mielke.cc/brltty/
++#
++# This software is maintained by Dave Mielke <dave@mielke.cc>.
++###############################################################################
++
++title Papenmeier BrailleX EL60c
++
++assign statusKeys 0
++include brl-pm-bar.kti
+--- a/Tables/brl-pm-el40c.ktb (révision 0)
++++ b/Tables/brl-pm-el40c.ktb (révision 6685)
+@@ -0,0 +1,22 @@
++###############################################################################
++# BRLTTY - A background process providing access to the console screen (when in
++# text mode) for a blind person using a refreshable braille display.
++#
++# Copyright (C) 1995-2012 by The BRLTTY Developers.
++#
++# 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. Please see the file LICENSE-LGPL for details.
++#
++# Web Page: http://mielke.cc/brltty/
++#
++# This software is maintained by Dave Mielke <dave@mielke.cc>.
++###############################################################################
++
++title Papenmeier BrailleX EL40c
++
++assign statusKeys 0
++include brl-pm-bar.kti
diff -Nru brltty-4.4/debian/patches/30-late-fixes-r6777.patch brltty-4.4/debian/patches/30-late-fixes-r6777.patch
--- brltty-4.4/debian/patches/30-late-fixes-r6777.patch 1970-01-01 01:00:00.000000000 +0100
+++ brltty-4.4/debian/patches/30-late-fixes-r6777.patch 2012-12-07 02:33:21.000000000 +0100
@@ -0,0 +1,29 @@
+From: Mario Lang <mlang@delysid.org>
+
+If you happen to use a Focus 14, you might have noticed that it is
+initialized, but does not work correctly with the current stable release
+(4.4) and the current development branch. The patch below makes it
+work.
+You should be able to apply this patch to the 4.4 tarball as well if you
+want a quick fix without moving to the development version, which will
+probably include this change in the near future.
+
+Change to the toplevel source tree of BRLTTY and apply the patch with
+$ patch -p1 <FILENAME
+
+--- a/Drivers/Braille/FreedomScientific/braille.c
++++ b/Drivers/Braille/FreedomScientific/braille.c
+@@ -391,6 +391,12 @@ typedef struct {
+ static const DotsTable dotsTable_Focus1 = {0X01, 0X02, 0X04, 0X10, 0X20, 0X40, 0X08, 0X80};
+
+ static const ModelEntry modelTable[] = {
++ { .identifier = "Focus 14",
++ .dotsTable = &dotsTable_ISO11548_1,
++ .cellCount = 14,
++ .type = MOD_TYPE_Focus
++ }
++ ,
+ { .identifier = "Focus 40",
+ .dotsTable = &dotsTable_ISO11548_1,
+ .cellCount = 40,
+
diff -Nru brltty-4.4/debian/patches/series brltty-4.4/debian/patches/series
--- brltty-4.4/debian/patches/series 2012-08-28 01:08:44.000000000 +0200
+++ brltty-4.4/debian/patches/series 2012-12-07 02:41:43.000000000 +0100
@@ -9,4 +9,6 @@
30-late-fixes-r6592.patch
30-late-fixes-r6623.patch
30-late-fixes-r6625.patch
+30-late-fixes-r6685.patch
+30-late-fixes-r6777.patch
40-no-update-pot.patch
--- End Message ---