[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#697033: marked as done (unblock: brltty/4.4-8)

Your message dated Fri, 04 Jan 2013 19:23:39 +0000
with message-id <1357327419.6386.5.camel@jacala.jungle.funky-badger.org>
and subject line Re: Bug#697033: unblock: brltty/4.4-8
has caused the Debian Bug report #697033,
regarding unblock: brltty/4.4-8
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
697033: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=697033
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Please unblock package brltty

This is needed to fix both the "dark" theme of the installer, and the
auto-detection of braille devices even if the graphical installer has
already started (for instance because the braille display took a long
time to get detected by udev etc.).

See #696972 for the details, the idea is that brltty used to kill
debconf to abort the graphical installer, and we passed -terminate to
the Xorg server so that it actually shuts down to let brltty access text
mode. But -terminate breaks the "dark" theme: when the "dark" theme
command finishes, the server terminates...

This change makes brltty detection kill the Xorg server instead of
debconf. It looks less nice to me, but does work just as fine.

I also realized that there was a typo in a path, and the loop was
busy-waiting for debconf. Sleeping second per second is fine, detection
already takes seconds anyway.

unblock brltty/4.4-8

diff -Nru brltty-4.4/debian/brltty-udeb.sh brltty-4.4/debian/brltty-udeb.sh
--- brltty-4.4/debian/brltty-udeb.sh	2012-12-07 02:32:05.000000000 +0100
+++ brltty-4.4/debian/brltty-udeb.sh	2012-12-31 00:07:53.000000000 +0100
@@ -3,17 +3,18 @@
 [ -r $pid ] && kill -0 `cat $pid` && exit 0
 
 echo debconf-set debian-installer/framebuffer false > /lib/debian-installer.d/S20brltty
-rm -f /lib/debian-installer/S19brltty
+rm -f /lib/debian-installer.d/S19brltty
 
-if [ -f /var/run/brltty-debconf ]
+if [ -f /var/run/brltty-Xorg ]
 then
-	rm /var/run/brltty-debconf
-	DEBCONF=""
-	while [ -z "$DEBCONF"  ]
+	rm /var/run/brltty-Xorg
+	XORG=""
+	while [ -z "$XORG"  ]
 	do
-		DEBCONF=`pidof debconf`
+		XORG=`pidof Xorg`
+		sleep 1
 	done
-	[ -z "$DEBCONF" ] || kill "$DEBCONF"
+	kill "$XORG"
 fi
 
 exec /sbin/brltty -P $pid "$@"
diff -Nru brltty-4.4/debian/brltty-udeb.start brltty-4.4/debian/brltty-udeb.start
--- brltty-4.4/debian/brltty-udeb.start	2012-12-07 02:32:05.000000000 +0100
+++ brltty-4.4/debian/brltty-udeb.start	2012-12-31 00:08:08.000000000 +0100
@@ -1,2 +1,2 @@
 #!/bin/sh
-touch /var/run/brltty-debconf
+touch /var/run/brltty-Xorg
diff -Nru brltty-4.4/debian/changelog brltty-4.4/debian/changelog
--- brltty-4.4/debian/changelog	2012-12-20 20:41:45.000000000 +0100
+++ brltty-4.4/debian/changelog	2012-12-31 00:42:38.000000000 +0100
@@ -1,3 +1,12 @@
+brltty (4.4-8) unstable; urgency=low
+
+  * brltty-udeb.sh:
+    - Fix typo in path.
+    - Kill Xorg instead of debconf to switch back installer from g-i to
+    textmode. Also, sleep instead of busy-waiting for Xorg. Closes: #696972.
+
+ -- Samuel Thibault <sthibault@debian.org>  Mon, 31 Dec 2012 00:42:37 +0100
+
 brltty (4.4-7) unstable; urgency=low
 
   * control: Add >= 8.5~ version to tcl build-depend, as brltty won't build

--- End Message ---
--- Begin Message --- 
On Mon, 2012-12-31 at 01:40 +0100, Samuel Thibault wrote:
> Please unblock package brltty
> 
> This is needed to fix both the "dark" theme of the installer, and the
> auto-detection of braille devices even if the graphical installer has
> already started (for instance because the braille display took a long
> time to get detected by udev etc.).

Unblocked as part of KiBi's latest request; thanks.

Regards,

Adam

--- End Message ---
Reply to: