X Strike Force XFree86 SVN commit: r1978 - branches/ubuntu/debian
Author: fabbione
Date: 2004-10-29 23:49:56 -0500 (Fri, 29 Oct 2004)
New Revision: 1978
Modified:
branches/ubuntu/debian/changelog
branches/ubuntu/debian/xserver-xfree86.config.in
Log:
Import 4.3.0.dfsg.1-6ubuntu2 release.
Modified: branches/ubuntu/debian/changelog
===================================================================
--- branches/ubuntu/debian/changelog 2004-10-30 04:47:02 UTC (rev 1977)
+++ branches/ubuntu/debian/changelog 2004-10-30 04:49:56 UTC (rev 1978)
@@ -1,3 +1,13 @@
+xfree86 (4.3.0.dfsg.1-6ubuntu2) warty; urgency=low
+
+ Warty specific changes:
+
+ * Fix infinite loop when mdetect returns no output, by setting the default
+ for xserver-xfree86/autodetect_mouse outside the loop.
+ (debian/xserver-xfree86.config)
+
+ -- Colin Watson <cjwatson@flatline.org.uk> Fri, 30 Jul 2004 16:44:26 +0100
+
xfree86 (4.3.0.dfsg.1-6ubuntu1) warty; urgency=low
Warty specific changes:
Modified: branches/ubuntu/debian/xserver-xfree86.config.in
===================================================================
--- branches/ubuntu/debian/xserver-xfree86.config.in 2004-10-30 04:47:02 UTC (rev 1977)
+++ branches/ubuntu/debian/xserver-xfree86.config.in 2004-10-30 04:49:56 UTC (rev 1978)
@@ -903,11 +903,11 @@
# if configuring for the first time, ask if user wants to autodetect
if [ -z "$RECONFIGURE" ]; then
+ db_set xserver-xfree86/autodetect_mouse "true"
while :; do
# bail out if autodetection tool not available
which mdetect > /dev/null 2>&1 || break
#auto_answer db_input "$(priority_ceil $PRIORITY)" xserver-xfree86/autodetect_mouse "true"
- db_set xserver-xfree86/autodetect_mouse "true"
db_get xserver-xfree86/autodetect_mouse
if [ "$RET" = "true" ]; then
set +e
Reply to: