Package: xf86-input-wacom
Version: 0.10.5+20100416-1
Severity: normal
Tags: patch
User: [email protected]
Usertags: origin-ubuntu maverick ubuntu-maverick

Hi!

The serial wacom udev rules are slightly wrong. The attached patch fixes
the problem so that they are correctly detected by Xorg autoconfiguration.

(Note the difference between SUBSYSTEM/SUBSYSTEMS and ATTR/ATTRS so that
the ID_INPUT* ENVs are added to the tty layer and the ENV NAME is added
to the PNP layer.)

Thanks,

-Kees

-- 
Kees Cook                                            @debian.org
diff -u xf86-input-wacom-0.10.6/debian/xserver-xorg-input-wacom.udev xf86-input-wacom-0.10.6/debian/xserver-xorg-input-wacom.udev
--- xf86-input-wacom-0.10.6/debian/xserver-xorg-input-wacom.udev
+++ xf86-input-wacom-0.10.6/debian/xserver-xorg-input-wacom.udev
@@ -8,14 +8,10 @@
 # they can rely on across the board.
 
 # Catch the serial tablets and tell X that's what they are
-ACTION=="add|change", SUBSYSTEM=="pnp", ATTR{id}=="WACf*", 	\
-	ENV{NAME}="Serial Wacom Tablet",			\
-	ENV{ID_INPUT}="1", ENV{ID_INPUT_TABLET}="1"
-
-ACTION=="add|change", SUBSYSTEM=="pnp", ATTR{id}=="FUJ*",	\
-	ENV{NAME}="Serial Wacom Tablet",			\
-	ENV{ID_INPUT}="1", ENV{ID_INPUT_TABLET}="1"
-
+ACTION=="add|change", SUBSYSTEM=="pnp", ATTR{id}=="WACf*", ENV{NAME}="Serial Wacom Tablet"
+ACTION=="add|change", SUBSYSTEM=="pnp", ATTR{id}=="FUJ*", ENV{NAME}="Serial Wacom Tablet"
+ACTION=="add|change", SUBSYSTEMS=="pnp", ATTRS{id}=="WACf*", ENV{ID_INPUT}="1", ENV{ID_INPUT_TABLET}="1"
+ACTION=="add|change", SUBSYSTEMS=="pnp", ATTRS{id}=="FUJ*", ENV{ID_INPUT}="1", ENV{ID_INPUT_TABLET}="1"
 
 KERNEL!="event[0-9]*", GOTO="wacom_end"
 

Reply via email to