Author: branden
Date: 2003-10-23 02:49:15 -0500 (Thu, 23 Oct 2003)
New Revision: 706
Modified:
trunk/debian/changelog
trunk/debian/xserver-xfree86.config.in
Log:
Fix long-standing thinko in xserver-xfree86's config script; test correct
variable for nullity when deciding if mdetect didn't return anything for
the mouse protocol (thanks, Daniel Barlow). Also perform extra sanity
check on mdetect output (we expect exactly 2 lines' worth), and do not set
the question priority to low just because mdetect succeeds.
(Closes: #216932)
- debian/xserver-xfree86.config.in
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2003-10-23 07:25:18 UTC (rev 705)
+++ trunk/debian/changelog 2003-10-23 07:49:15 UTC (rev 706)
@@ -203,8 +203,16 @@
- debian/control: document existence of unstripped modules and explain
how to use them in xlibmesa3-gl-dbg's extended description
- -- Branden Robinson <[EMAIL PROTECTED]> Thu, 23 Oct 2003 01:55:21 -0500
+ * Fix long-standing thinko in xserver-xfree86's config script; test correct
+ variable for nullity when deciding if mdetect didn't return anything for
+ the mouse protocol (thanks, Daniel Barlow). Also perform extra sanity
+ check on mdetect output (we expect exactly 2 lines' worth), and do not set
+ the question priority to low just because mdetect succeeds.
+ (Closes: #216932)
+ - debian/xserver-xfree86.config.in
+ -- Branden Robinson <[EMAIL PROTECTED]> Thu, 23 Oct 2003 02:28:15 -0500
+
xfree86 (4.2.1-12.1) unstable; urgency=low
* Fix typo in xlibs preinst. Closes: #213774, #213776
Modified: trunk/debian/xserver-xfree86.config.in
===================================================================
--- trunk/debian/xserver-xfree86.config.in 2003-10-23 07:25:18 UTC (rev 705)
+++ trunk/debian/xserver-xfree86.config.in 2003-10-23 07:49:15 UTC (rev 706)
@@ -757,7 +757,10 @@
MDETECT_OUTPUT=$(mdetect -x)
set -e
if [ -n "$MDETECT_OUTPUT" ]; then
- PRIORITY=low
+ if [ $(echo "$MDETECT_OUTPUT" | wc -l) -ne 2 ]; then
+ debug_echo "bug in mdetect; did not return two lines of output"
+ break
+ fi
AUTODETECTED_PORT=$(echo "$MDETECT_OUTPUT" | head -n 1)
AUTODETECTED_PROTOCOL=$(echo "$MDETECT_OUTPUT" | tail -n 1)
debug_echo "mdetect returned port \"$AUTODETECTED_PORT\"; protocol
\"$AUTODETECTED_PROTOCOL\""
@@ -771,7 +774,7 @@
debug_echo "bug in mdetect: returned nothing for mouse port"
break
fi
- if [ -z "$DEFAULT_PROTOCOL" ]; then
+ if [ -z "$AUTODETECTED_PROTOCOL" ]; then
debug_echo "bug in mdetect: returned nothing for mouse protocol"
break
fi
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
