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

[Jan Steffens]

    Date: Friday, April 18, 2014 @ 13:53:02
  Author: heftig
Revision: 211258

0.24.0

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

----------------+
 70-wacom.rules |   15 ---------------
 PKGBUILD       |   15 +++++----------
 2 files changed, 5 insertions(+), 25 deletions(-)

Deleted: 70-wacom.rules
===================================================================
--- 70-wacom.rules	2014-04-18 11:45:34 UTC (rev 211257)
+++ 70-wacom.rules	2014-04-18 11:53:02 UTC (rev 211258)
@@ -1,15 +0,0 @@
-ACTION!="add|change", GOTO="wacom_end"
-
-# 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}"
-
-# inputattach
-SUBSYSTEM=="tty|pnp", KERNEL=="ttyS[0-9]*", ATTRS{id}=="WACf*", RUN+="/usr/sbin/modprobe wacom_w8001", RUN+="/usr/sbin/inputattach --daemon -w8001 /dev/%k"
-
-LABEL="wacom_end"
-

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-04-18 11:45:34 UTC (rev 211257)
+++ PKGBUILD	2014-04-18 11:53:02 UTC (rev 211258)
@@ -4,21 +4,18 @@
 # Contributor: M Rawash <mrawash at gmail.com>
 
 pkgname=xf86-input-wacom
-pkgver=0.23.0
-pkgrel=2
+pkgver=0.24.0
+pkgrel=1
 pkgdesc="X.Org Wacom tablet driver"
 arch=(i686 x86_64)
 url="http://linuxwacom.sourceforge.net/"
 license=(GPL)
 backup=('etc/X11/xorg.conf.d/50-wacom.conf')
-depends=(libxi libxinerama libxrandr)
+depends=(libxi libxinerama libxrandr systemd)
 makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=20' 'resourceproto' 'scrnsaverproto')
 conflicts=('xorg-server<1.15.0' 'X-ABI-XINPUT_VERSION<20' 'X-ABI-XINPUT_VERSION>=21')
-optdepends=('inputattach: support for serial tablets')
-source=(http://downloads.sourceforge.net/project/linuxwacom/$pkgname/$pkgname-$pkgver.tar.bz2
-        70-wacom.rules)
-md5sums=('353642b8a3f2dde089e913be32955aae'
-         'cc46dcb399d5ee62c9feb610c60d1270')
+source=(http://downloads.sourceforge.net/project/linuxwacom/$pkgname/$pkgname-$pkgver.tar.bz2)
+md5sums=('f487fffe1ba7d661aed84a9e36ea3b70')
 
 build() {
   cd $pkgname-$pkgver
@@ -29,6 +26,4 @@
 package() {
   cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
-
-  install -Dm644 ../70-wacom.rules "$pkgdir/usr/lib/udev/rules.d/70-wacom.rules"
 }