X Strike Force X.Org X11 SVN commit: r1037 - trunk/debian
Author: dnusinow
Date: 2006-01-08 20:03:47 -0500 (Sun, 08 Jan 2006)
New Revision: 1037
Modified:
trunk/debian/changelog
trunk/debian/xserver-xorg.config.in
Log:
* Raise mouse detection question to high priority when mdetect isn't
present. This will help out LiveCD's. Thanks Robert Millan and Daniel
Stone. (closes: #333921)
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2006-01-09 00:46:48 UTC (rev 1036)
+++ trunk/debian/changelog 2006-01-09 01:03:47 UTC (rev 1037)
@@ -22,11 +22,14 @@
drivers for some people. (closes: #274862)
* Hurd patch and MANIFEST updates. Thanks Samuel Thibault and Michael Banck.
(closes: #346500)
- * Add general/020_acpi_event_loop_fix.diff. This corrects a problem when the
+ * Add general/020_acpi_event_loop_fix.diff. This corrects a problem when the
acpid is shut down while server is running. Thanks Mattia Dongili.
(closes: #345537)
+ * Raise mouse detection question to high priority when mdetect isn't
+ present. This will help out LiveCD's. Thanks Robert Millan and Daniel
+ Stone. (closes: #333921)
- -- David Nusinow <dnusinow@debian.org> Sun, 8 Jan 2006 19:44:49 -0500
+ -- David Nusinow <dnusinow@debian.org> Sun, 8 Jan 2006 20:01:53 -0500
xorg-x11 (6.9.0.dfsg.1-2) unstable; urgency=low
Modified: trunk/debian/xserver-xorg.config.in
===================================================================
--- trunk/debian/xserver-xorg.config.in 2006-01-09 00:46:48 UTC (rev 1036)
+++ trunk/debian/xserver-xorg.config.in 2006-01-09 01:03:47 UTC (rev 1037)
@@ -42,6 +42,7 @@
NSERVERS=0
NDRIVERS=0
MULTIHEAD=
+HAVE_MDETECT="true"
# get machine architecture
ARCH=$(dpkg --print-installation-architecture)
@@ -1294,7 +1295,7 @@
auto_answer db_input "$(priority_ceil $PRIORITY)" xserver-xorg/autodetect_mouse "true"
while :; do
# bail out if autodetection tool not available
- which mdetect > /dev/null 2>&1 || break
+ which mdetect > /dev/null 2>&1 || HAVE_MDETECT="false" ; break
db_get xserver-xorg/autodetect_mouse
if [ "$RET" = "true" ]; then
# Reset values of templates that are to be autodetected to make sure that
@@ -1354,6 +1355,11 @@
if [ -z "$AUTODETECTED_PORT" ] || [ "$AUTODETECTED_PORT" = "/dev/psaux" ]; then
AUTODETECTED_PORT="/dev/input/mice"
fi
+if [ $HAVE_MDETECT = "false" ]; then
+ PRIORITY=high
+else
+ PRIORITY=low
+fi
auto_answer db_input "$(priority_ceil $PRIORITY)" xserver-xorg/config/inputdevice/mouse/port "${AUTODETECTED_PORT:-$DEFAULT_PORT}"
db_get xserver-xorg/config/inputdevice/mouse/port
Reply to: