X Strike Force XFree86 SVN commit: r1854 - branches/debconf-overhaul/debian
Author: branden
Date: 2004-09-22 16:36:13 -0500 (Wed, 22 Sep 2004)
New Revision: 1854
Modified:
branches/debconf-overhaul/debian/CHANGESETS
branches/debconf-overhaul/debian/TODO
branches/debconf-overhaul/debian/xserver-xfree86.config.in
Log:
Update configure_mouse() to include defaults appropriate to the Hurd (thanks,
Michael Banck). (Closes: #259080)
Modified: branches/debconf-overhaul/debian/CHANGESETS
===================================================================
--- branches/debconf-overhaul/debian/CHANGESETS 2004-09-22 21:32:32 UTC (rev 1853)
+++ branches/debconf-overhaul/debian/CHANGESETS 2004-09-22 21:36:13 UTC (rev 1854)
@@ -99,6 +99,8 @@
of /dev/hardware.
+ Update configure_mouse() to default to ADB mice on OldWorld PowerMacs, and USB
mice on NewWorld PowerMacs.
++ Update configure_mouse() to include defaults appropriate to the Hurd (thanks,
+ Michael Banck). (Closes: #259080)
+ Make extensive stylistic cleanups:
- Identify more "global" variables at top of script.
- Add comment headers to every function (where not already present)
Modified: branches/debconf-overhaul/debian/TODO
===================================================================
--- branches/debconf-overhaul/debian/TODO 2004-09-22 21:32:32 UTC (rev 1853)
+++ branches/debconf-overhaul/debian/TODO 2004-09-22 21:36:13 UTC (rev 1854)
@@ -26,7 +26,6 @@
+ #229850: xserver-xfree86: [debconf] monitor selection methods need to be
more careful about clobbering autodetected monitor sync ranges; study Jay
Berkenbilt's feedback [BR]
- + #259080: xserver-xfree86: [debconf] specialized mouse defaults for Hurd [BR]
+ #261777: Problems handling multiple detected video cards; see what can be
done about this [BR]
Modified: branches/debconf-overhaul/debian/xserver-xfree86.config.in
===================================================================
--- branches/debconf-overhaul/debian/xserver-xfree86.config.in 2004-09-22 21:32:32 UTC (rev 1853)
+++ branches/debconf-overhaul/debian/xserver-xfree86.config.in 2004-09-22 21:36:13 UTC (rev 1854)
@@ -1128,6 +1128,9 @@
trace "$func(): no good defaults known for PA-RISC mouse configuration"
;;
hurd-i386)
+ # Override the available choices on the Hurd.
+ mouse_port_choices="/dev/mouse, /dev/gpmdata"
+ default_port="/dev/mouse"
;;
i386)
# Assume Linux x86 machines use USB mice.
@@ -1299,6 +1302,10 @@
mouse_protocol_choices="IntelliMouse"
default_protocol="IntelliMouse"
;;
+ */mouse)
+ mouse_protocol_choices="OSMouse"
+ default_protocol="OSMouse"
+ ;;
esac
db_subst xserver-xfree86/config/inputdevice/mouse/protocol choices \
"$mouse_protocol_choices"
@@ -1313,6 +1320,13 @@
"${autodetected_protocol:-$default_protocol}"
fi
+ # The Hurd's mouse device doesn't support button emulation or a Z axis, per
+ # Michael Banck (see Debian Bug #259080).
+ if [ "$ARCH" = "hurd-i386" ]; then
+ db_set xserver-xfree86/config/inputdevice/mouse/emulate3buttons "false"
+ db_set xserver-xfree86/config/inputdevice/mouse/zaxismapping "false"
+ fi
+
set_db_priority "low"
run db_input "$PRIORITY" \
xserver-xfree86/config/inputdevice/mouse/emulate3buttons
Reply to: