[arch-commits] Commit in xf86-input-wacom/repos (5 files)

[Jan Steffens]

    Date: Thursday, August 18, 2011 @ 22:23:53
  Author: heftig
Revision: 135825

db-move: moved xf86-input-wacom from [testing] to [extra] (i686)

Added:
  xf86-input-wacom/repos/extra-i686/70-wacom.rules
    (from rev 135824, xf86-input-wacom/repos/testing-i686/70-wacom.rules)
  xf86-input-wacom/repos/extra-i686/PKGBUILD
    (from rev 135824, xf86-input-wacom/repos/testing-i686/PKGBUILD)
Deleted:
  xf86-input-wacom/repos/extra-i686/70-wacom.rules
  xf86-input-wacom/repos/extra-i686/PKGBUILD
  xf86-input-wacom/repos/testing-i686/

----------------+
 70-wacom.rules |   20 +++++++++------
 PKGBUILD       |   70 +++++++++++++++++++++++++++----------------------------
 2 files changed, 47 insertions(+), 43 deletions(-)

Deleted: extra-i686/70-wacom.rules
===================================================================
--- extra-i686/70-wacom.rules	2011-08-18 21:27:02 UTC (rev 135824)
+++ extra-i686/70-wacom.rules	2011-08-19 02:23:53 UTC (rev 135825)
@@ -1,8 +0,0 @@
-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"
-
-LABEL="wacom_end"
-

Copied: xf86-input-wacom/repos/extra-i686/70-wacom.rules (from rev 135824, xf86-input-wacom/repos/testing-i686/70-wacom.rules)
===================================================================
--- extra-i686/70-wacom.rules	                        (rev 0)
+++ extra-i686/70-wacom.rules	2011-08-19 02:23:53 UTC (rev 135825)
@@ -0,0 +1,12 @@
+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}"
+
+LABEL="wacom_end"
+

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2011-08-18 21:27:02 UTC (rev 135824)
+++ extra-i686/PKGBUILD	2011-08-19 02:23:53 UTC (rev 135825)
@@ -1,35 +0,0 @@
-# $Id$
-# Maintainer: Jan "heftig" Steffens <jan.steffens at gmail.com>
-# Contributor: Jan de Groot <jgc at archlinux.org>
-# Contributor: M Rawash <mrawash at gmail.com>
-
-pkgname=xf86-input-wacom
-pkgver=0.11.1
-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' 'libxrandr')
-makedepends=('xorg-server-devel' 'libxext' 'libxi')
-conflicts=('xorg-server<1.10.0')
-options=(!libtool)
-source=(http://downloads.sourceforge.net/project/linuxwacom/${pkgname}/${pkgname}-${pkgver}.tar.bz2
-        70-wacom.rules)
-md5sums=('0aec4a338cc583ed497b6af68d6d80ab'
-         '4d3665bb2ef8a8190734640dffa4c6f7')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --with-xorg-conf-dir=/etc/X11/xorg.conf.d
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/lib/udev/rules.d"
-  install -m644 "${srcdir}/70-wacom.rules"  "${pkgdir}/lib/udev/rules.d/"
-}

Copied: xf86-input-wacom/repos/extra-i686/PKGBUILD (from rev 135824, xf86-input-wacom/repos/testing-i686/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2011-08-19 02:23:53 UTC (rev 135825)
@@ -0,0 +1,35 @@
+# $Id$
+# Maintainer: Jan "heftig" Steffens <jan.steffens at gmail.com>
+# Contributor: Jan de Groot <jgc at archlinux.org>
+# Contributor: M Rawash <mrawash at gmail.com>
+
+pkgname=xf86-input-wacom
+pkgver=0.11.1
+pkgrel=2
+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' 'libxrandr')
+makedepends=('xorg-server-devel' 'libxext' 'libxi')
+conflicts=('xorg-server<1.10.0')
+options=(!libtool)
+source=(http://downloads.sourceforge.net/project/linuxwacom/${pkgname}/${pkgname}-${pkgver}.tar.bz2
+        70-wacom.rules)
+md5sums=('0aec4a338cc583ed497b6af68d6d80ab'
+         '10db4f8272286690255c1bcc18bfdd92')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr --with-xorg-conf-dir=/etc/X11/xorg.conf.d
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+
+  install -m755 -d "${pkgdir}/lib/udev/rules.d"
+  install -m644 "${srcdir}/70-wacom.rules"  "${pkgdir}/lib/udev/rules.d/"
+}