X Strike Force X.Org X11 SVN commit: r3622 - trunk/debian/xorg/debian
Author: dnusinow
Date: 2006-10-05 21:59:53 -0400 (Thu, 05 Oct 2006)
New Revision: 3622
Modified:
trunk/debian/xorg/debian/changelog
trunk/debian/xorg/debian/xserver-xorg.postinst.in
trunk/debian/xorg/debian/xserver-xorg.templates
Log:
* Make ImPS/2 the default mouse port in the xserver-xorg.templates file.
Also provide the devices in this file rather than as a variable in the
config script. Closes: #385078
Modified: trunk/debian/xorg/debian/changelog
===================================================================
--- trunk/debian/xorg/debian/changelog 2006-10-06 00:21:59 UTC (rev 3621)
+++ trunk/debian/xorg/debian/changelog 2006-10-06 01:59:53 UTC (rev 3622)
@@ -1,11 +1,16 @@
xorg (1:7.1.0-3) UNRELEASED; urgency=low
- [ Debconf translation updates ]
+ [ Debconf translation updates ]
- Dutch. Closes: #391187
- Simplified Chinese. Closes: #390956
- -- David Nusinow <dnusinow@debian.org> Thu, 5 Oct 2006 20:20:19 -0400
+ [ David Nusinow ]
+ * Make ImPS/2 the default mouse port in the xserver-xorg.templates file.
+ Also provide the devices in this file rather than as a variable in the
+ config script. Closes: #385078
+ -- David Nusinow <dnusinow@debian.org> Thu, 5 Oct 2006 21:57:11 -0400
+
xorg (1:7.1.0-2) unstable; urgency=low
[ Debconf translations updates ]
Modified: trunk/debian/xorg/debian/xserver-xorg.postinst.in
===================================================================
--- trunk/debian/xorg/debian/xserver-xorg.postinst.in 2006-10-06 00:21:59 UTC (rev 3621)
+++ trunk/debian/xorg/debian/xserver-xorg.postinst.in 2006-10-06 01:59:53 UTC (rev 3622)
@@ -1309,12 +1309,8 @@
MAY_BE_NULL=yes auto_answer validate_string_db_input "$(priority_ceil $PRIORITY)" xserver-xorg/config/inputdevice/keyboard/options "$XKBOPTIONS"
-AUTODETECTED_PORT="/dev/input/mice"
-AUTODETECTED_PROTOCOL="ImPS/2"
+auto_answer db_input "$(priority_ceil low)" xserver-xorg/config/inputdevice/mouse/port "/dev/input/mice"
-db_subst xserver-xorg/config/inputdevice/mouse/port choices $AUTODETECTED_PORT
-auto_answer db_input "$(priority_ceil low)" xserver-xorg/config/inputdevice/mouse/port "${AUTODETECTED_PORT}"
-
db_get xserver-xorg/config/inputdevice/mouse/port
case "$RET" in
*psaux)
Modified: trunk/debian/xorg/debian/xserver-xorg.templates
===================================================================
--- trunk/debian/xorg/debian/xserver-xorg.templates 2006-10-06 00:21:59 UTC (rev 3621)
+++ trunk/debian/xorg/debian/xserver-xorg.templates 2006-10-06 01:59:53 UTC (rev 3622)
@@ -295,7 +295,8 @@
Template: xserver-xorg/config/inputdevice/mouse/port
Type: select
-Choices: ${choices}
+Choices: /dev/input/mice, /dev/psaux, /dev/ttyS0, /dev/tts0, /dev/gpmdata
+Default: ImPS/2
_Description: Mouse port:
For the X Window System graphical user interface to operate correctly,
certain characteristics of the mouse (or other pointing device, such as a
Reply to: