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

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

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

New commits:
commit a5fbec7502dbacf503f0cdb9a59ffbfbd5b7d018
Author: Julien Cristau <jcristau@debian.org>
Date:   Thu Jan 7 20:22:12 2010 +0000

    Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index f534878..1456356 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-input-evdev (1:2.3.2-2) UNRELEASED; urgency=low
+xserver-xorg-input-evdev (1:2.3.2-2) unstable; urgency=low
 
   [ Timo Aaltonen ]
   * evdev.rules: Skip joysticks, since using evdev for those is
@@ -6,8 +6,9 @@ xserver-xorg-input-evdev (1:2.3.2-2) UNRELEASED; urgency=low
 
   [ Julien Cristau ]
   * evdev.rules: Match on ID_INPUT instead of device name + subsystem.
+  * Upload to unstable.
 
- -- Timo Aaltonen <tjaalton@ubuntu.com>  Wed, 06 Jan 2010 13:45:23 +0200
+ -- Julien Cristau <jcristau@debian.org>  Thu, 07 Jan 2010 20:21:57 +0000
 
 xserver-xorg-input-evdev (1:2.3.2-1) experimental; urgency=low
 

commit 126afcc73d4b185464ca6e3689312b8b4a797404
Author: Julien Cristau <jcristau@debian.org>
Date:   Thu Jan 7 20:21:23 2010 +0000

    evdev.rules: Match on ID_INPUT instead of device name + subsystem.

diff --git a/debian/changelog b/debian/changelog
index ce6fa85..f534878 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
 xserver-xorg-input-evdev (1:2.3.2-2) UNRELEASED; urgency=low
 
+  [ Timo Aaltonen ]
   * evdev.rules: Skip joysticks, since using evdev for those is
     generally considered as a bad idea. Use -joystick instead.
 
+  [ Julien Cristau ]
+  * evdev.rules: Match on ID_INPUT instead of device name + subsystem.
+
  -- Timo Aaltonen <tjaalton@ubuntu.com>  Wed, 06 Jan 2010 13:45:23 +0200
 
 xserver-xorg-input-evdev (1:2.3.2-1) experimental; urgency=low
diff --git a/debian/local/65-xorg-evdev.rules b/debian/local/65-xorg-evdev.rules
index 2d99ce3..9324cba 100644
--- a/debian/local/65-xorg-evdev.rules
+++ b/debian/local/65-xorg-evdev.rules
@@ -1,10 +1,9 @@
 ACTION!="add|change", GOTO="xorg_evdev_end"
-SUBSYSTEM!="input", GOTO="xorg_evdev_end"
-KERNEL!="event*", 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
 # devices.
+ENV{ID_INPUT}=="", GOTO="xorg_evdev_end"
 ENV{ID_INPUT_JOYSTICK}=="?*", GOTO="xorg_evdev_end"
 ENV{x11_driver}="evdev"