[arch-commits] Commit in xf86-input-wacom/trunk (70-wacom.rules PKGBUILD)

[Jan Steffens]

    Date: Thursday, August 4, 2011 @ 14:20:04
  Author: heftig
Revision: 134510

upgpkg: xf86-input-wacom 0.11.1-2
Use udev rules from Fedora to fix udev errors

Modified:
  xf86-input-wacom/trunk/70-wacom.rules
  xf86-input-wacom/trunk/PKGBUILD

----------------+
 70-wacom.rules |   10 +++++++---
 PKGBUILD       |    4 ++--
 2 files changed, 9 insertions(+), 5 deletions(-)

Modified: 70-wacom.rules
===================================================================
--- 70-wacom.rules	2011-08-04 17:27:38 UTC (rev 134509)
+++ 70-wacom.rules	2011-08-04 18:20:04 UTC (rev 134510)
@@ -1,8 +1,12 @@
 ACTION!="add|change", GOTO="wacom_end"
 
-# Match all wacom tablets with a serial ID starting with WACf
-ATTRS{id}=="WACf*" ENV{NAME}="Serial Wacom Tablet", ENV{SUBSYSTEM}="input", ENV{ID_INPUT}="1", ENV{ID_INPUT_TABLET}="1"
-ATTRS{id}=="FUJ*" ENV{NAME}="Serial Wacom Tablet", ENV{SUBSYSTEM}="input", ENV{ID_INPUT}="1", ENV{ID_INPUT_TABLET}="1"
+# Match all serial wacom tablets with a serial ID starting with WACf
+# Notes: We assign NAME though we shouldn't, but currently the server requires it
+#        We assign the lot to subsystem pnp too because server reads NAME from
+#        the parent device. Once all that's fixed, as simple SUBSYSTEM="tty"
+#        will do and the ENV{NAME} can be removed.
+SUBSYSTEM=="tty|pnp", SUBSYSTEMS=="pnp", ATTRS{id}=="WACf*", ENV{ID_MODEL}="Serial Wacom Tablet $attr{id}", ENV{ID_INPUT}="1", ENV{ID_INPUT_TABLET}="1", ENV{NAME}="Serial Wacom Tablet $attr{id}"
+SUBSYSTEM=="tty|pnp", SUBSYSTEMS=="pnp", ATTRS{id}=="FUJ*", ENV{ID_MODEL}="Serial Wacom Tablet $attr{id}", ENV{ID_INPUT}="1", ENV{ID_INPUT_TABLET}="1", ENV{NAME}="Serial Wacom Tablet $attr{id}"
 
 LABEL="wacom_end"
 

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-08-04 17:27:38 UTC (rev 134509)
+++ PKGBUILD	2011-08-04 18:20:04 UTC (rev 134510)
@@ -5,7 +5,7 @@
 
 pkgname=xf86-input-wacom
 pkgver=0.11.1
-pkgrel=1
+pkgrel=2
 pkgdesc="X.Org Wacom tablet driver"
 arch=('i686' 'x86_64')
 url="http://linuxwacom.sourceforge.net/"
@@ -18,7 +18,7 @@
 source=(http://downloads.sourceforge.net/project/linuxwacom/${pkgname}/${pkgname}-${pkgver}.tar.bz2
         70-wacom.rules)
 md5sums=('0aec4a338cc583ed497b6af68d6d80ab'
-         '4d3665bb2ef8a8190734640dffa4c6f7')
+         '10db4f8272286690255c1bcc18bfdd92')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"