Bug#768153: unblock: brltty/5.2~20141018-2
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Hello,
unblock brltty/5.2~20141018-2
I'd like to upload the attached changes for brltty. Two important issues
are being fixed here
- bug #767601: when using no screen driver, brltty doesn't show the
output from brlapi clients such as the orca screen reader. While this
doesn't affect actual blind users, which usually enable the Linux screen
driver, this affects sighted users who would for instance use brltty to
test the Debian Installer. The patch, from upstream, actually simply
reverts to the previous brltty 5.0 behavior.
- bug #766844: upstream added installation of all its internal headers,
some of which are generated according to ./configure results, and thus
vary between architectures, thus making the package non-multi-arch.
Those internal headers are not actually useful for libbrlapi, so I only
kept the few ones which we need. I'm also removing them completely from
the udeb, since d-i doesn't need them at all.
Samuel
-- System Information:
Debian Release: jessie/sid
APT prefers testing
APT policy: (990, 'testing'), (500, 'buildd-unstable'), (500, 'unstable'), (500, 'stable'), (500, 'oldstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.17.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
diff --git a/debian/changelog b/debian/changelog
index e3873d0..f4e8ef7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+brltty (5.2~20141018-2) UNRELEASED; urgency=medium
+
+ * patches/git-a7123d7: Fix brlapi output with the NoScreen screen driver.
+ (Closes: #767601).
+ * libbrlapi-dev.install: Do not install internal brltty headers
+ (Closes: #766844).
+ * rules: Remove brltty headers from brltty-udeb.
+
+ -- Samuel Thibault <sthibault@debian.org> Sun, 26 Oct 2014 21:22:30 +0100
+
brltty (5.2~20141018-1) unstable; urgency=medium
* New upstream snapshot, very close to upstream 5.2 release.
diff --git a/debian/libbrlapi-dev.install b/debian/libbrlapi-dev.install
index e885da3..b5606d5 100644
--- a/debian/libbrlapi-dev.install
+++ b/debian/libbrlapi-dev.install
@@ -1,3 +1,5 @@
debian/tmp/usr/lib/*/libbrlapi*.a
debian/tmp/lib/*/libbrlapi*.so
-debian/tmp/usr/include/* usr/include
+debian/tmp/usr/include/brlapi*
+debian/tmp/usr/include/brltty/api.h
+debian/tmp/usr/include/brltty/brldefs.h
diff --git a/debian/patches/git-a7123d7 b/debian/patches/git-a7123d7
new file mode 100644
index 0000000..17a82a9
--- /dev/null
+++ b/debian/patches/git-a7123d7
@@ -0,0 +1,38 @@
+commit a7123d720e97eaa1185f4bb3739e670b9b0bbffb
+Author: Dave Mielke <dave@mielke.cc>
+Date: Sun Oct 26 10:21:15 2014 -0400
+
+ The currentVirtualTerminal() method of the null screen driver should return -1 (always has focus). (dm)
+
+diff --git a/Programs/scr_driver.c b/Programs/scr_driver.c
+index 889becd..767977c 100644
+--- a/Programs/scr_driver.c
++++ b/Programs/scr_driver.c
+@@ -52,13 +52,18 @@ processParameters_NoScreen (char **parameters) {
+ return 1;
+ }
+
++static int
++currentVirtualTerminal_NoScreen (void) {
++ return -1;
++}
++
+ static void
+ describe_NoScreen (ScreenDescription *description) {
+ description->rows = 1;
+ description->cols = strlen(screenMessage);
+ description->posx = 0;
+ description->posy = 0;
+- description->number = 1;
++ description->number = currentVirtualTerminal_NoScreen();
+ }
+
+ static int
+@@ -82,6 +87,7 @@ scr_initialize (MainScreen *main) {
+ main->base.poll = poll_NoScreen;
+ main->base.describe = describe_NoScreen;
+ main->base.readCharacters = readCharacters_NoScreen;
++ main->base.currentVirtualTerminal = currentVirtualTerminal_NoScreen;
+
+ main->processParameters = processParameters_NoScreen;
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 455c200..68a2ffb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
40-no-update-pot.patch
41-java-bytecode-compat.patch
50-constants.patch
+git-a7123d7
diff --git a/debian/rules b/debian/rules
index 520a4d8..591a6ff 100755
--- a/debian/rules
+++ b/debian/rules
@@ -216,6 +216,7 @@ brltty-udeb: build-udeb
# temporary fix
rm -Rf debian/brltty-udeb/share
+ rm -Rf debian/brltty-udeb/usr/include
cp debian/brltty-udeb.prebaseconfig debian/brltty-udeb/usr/lib/finish-install.d/07brltty
chmod 0755 debian/brltty-udeb/usr/lib/finish-install.d/07brltty
Reply to: