xserver-xorg-input-evdev: Changes to 'debian-unstable'

[Julien Cristau <jcristau@alioth.debian.org>]

 debian/changelog                 |    8 ++++++++
 debian/local/65-xorg-evdev.rules |   10 ++++++----
 2 files changed, 14 insertions(+), 4 deletions(-)

New commits:
commit d293b7ae066ab55540809b99ba770174dfca3bc7
Author: Julien Cristau <jcristau@debian.org>
Date:   Tue Jan 12 10:17:04 2010 +0000

    65-xorg-evdev.rules: don't set x11_driver for accelerometers
    
    Instead of blacklisting joysticks, explicitly whitelist keyboards, mice,
    touchscreens and touchpads (closes: #564219). We'll need a better
    solution, but this should do for now.

diff --git a/debian/changelog b/debian/changelog
index 1456356..bf1faae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xserver-xorg-input-evdev (1:2.3.2-3) UNRELEASED; urgency=low
+
+  * 65-xorg-evdev.rules: instead of blacklisting joysticks, explicitly
+    whitelist keyboards, mice, touchscreens and touchpads (closes: #564219).
+    We'll need a better solution, but this should do for now.
+
+ -- Julien Cristau <jcristau@debian.org>  Tue, 12 Jan 2010 10:13:45 +0000
+
 xserver-xorg-input-evdev (1:2.3.2-2) unstable; urgency=low
 
   [ Timo Aaltonen ]
diff --git a/debian/local/65-xorg-evdev.rules b/debian/local/65-xorg-evdev.rules
index 9324cba..ea4a9bb 100644
--- a/debian/local/65-xorg-evdev.rules
+++ b/debian/local/65-xorg-evdev.rules
@@ -1,10 +1,12 @@
 ACTION!="add|change", GOTO="xorg_evdev_end"
 
-# By default, we use the -evdev driver for every input device except
-# joysticks; later rules can then change the driver for specific input
+# By default, we use the -evdev driver for every mouse, keyboard, touchscreen
+# or touchpad; later rules can then change the driver for specific input
 # devices.
 ENV{ID_INPUT}=="", GOTO="xorg_evdev_end"
-ENV{ID_INPUT_JOYSTICK}=="?*", GOTO="xorg_evdev_end"
-ENV{x11_driver}="evdev"
+ENV{ID_INPUT_MOUSE}=="?*", ENV{x11_driver}="evdev"
+ENV{ID_INPUT_KEY}=="?*", ENV{x11_driver}="evdev"
+ENV{ID_INPUT_TOUCHSCREEN}=="?*", ENV{x11_driver}="evdev"
+ENV{ID_INPUT_TOUCHPAD}=="?*", ENV{x11_driver}="evdev"
 
 LABEL="xorg_evdev_end"