diff --git a/.gitignore b/.gitignore index c440f23..9c38b9d 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ xf86-input-wacom-20101119.tar.bz2 /xf86-input-wacom-20110401.tar.bz2 /xf86-input-wacom-20110408.tar.bz2 /xf86-input-wacom-0.11.0.tar.bz2 +/xf86-input-wacom-0.11.1.tar.bz2 diff --git a/0001-wcmValidateDevice.c-Add-0xE6.patch b/0001-wcmValidateDevice.c-Add-0xE6.patch deleted file mode 100644 index 9bee69c..0000000 --- a/0001-wcmValidateDevice.c-Add-0xE6.patch +++ /dev/null @@ -1,29 +0,0 @@ -From c6b979e24d56823f30c5ee922a86c138dbe64341 Mon Sep 17 00:00:00 2001 -From: David Foley -Date: Tue, 24 May 2011 17:12:22 -0500 -Subject: [PATCH] wcmValidateDevice.c: Add 0xE6 - -Adds the E6 2FGT tablet PC. - -Tested-by: Ethan Schoonover -Signed-off-by: David Foley -Signed-off-by: Peter Hutterer ---- - src/wcmValidateDevice.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -diff --git a/src/wcmValidateDevice.c b/src/wcmValidateDevice.c -index b177713..409a42f 100644 ---- a/src/wcmValidateDevice.c -+++ b/src/wcmValidateDevice.c -@@ -254,6 +254,7 @@ int wcmDeviceTypeKeys(InputInfoPtr pInfo) - - case 0xE2: /* TPC with 2FGT */ - case 0xE3: /* TPC with 2FGT */ -+ case 0xE6: /* TPC with 2FGT */ - priv->common->tablet_type = WCM_TPC; - priv->common->tablet_type |= WCM_LCD; - break; --- -1.7.5.1 - diff --git a/sources b/sources index 3e5e147..2876344 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e0f6182cf7fba19c13f3db7e0da1baf3 xf86-input-wacom-0.11.0.tar.bz2 +0aec4a338cc583ed497b6af68d6d80ab xf86-input-wacom-0.11.1.tar.bz2 diff --git a/xorg-x11-drv-wacom.spec b/xorg-x11-drv-wacom.spec index 68906bf..48de948 100644 --- a/xorg-x11-drv-wacom.spec +++ b/xorg-x11-drv-wacom.spec @@ -7,8 +7,8 @@ Summary: Xorg X11 wacom input driver Name: xorg-x11-drv-wacom -Version: 0.11.0 -Release: 2%{?gitdate:.%{gitdate}}%{?dist} +Version: 0.11.1 +Release: 1%{?gitdate:.%{gitdate}}%{?dist} URL: http://www.x.org License: GPLv2+ Group: User Interface/X Hardware Support @@ -19,7 +19,6 @@ Source0: %{tarball}-%{gitdate}.tar.bz2 Source0: http://prdownloads.sourceforge.net/linuxwacom/xf86-input-wacom-%{version}.tar.bz2 %endif Source1: 70-wacom.rules -Patch001: 0001-wcmValidateDevice.c-Add-0xE6.patch ExcludeArch: s390 s390x @@ -40,7 +39,6 @@ X.Org X11 wacom input driver for Wacom tablets. %prep %setup -q -n %{tarball}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}} -%patch001 -p1 %build %if 0%{?gitdate} @@ -99,6 +97,9 @@ X.Org X11 wacom input driver development files. %{_bindir}/isdv4-serial-debugger %changelog +* Mon May 30 2011 Peter Hutterer 0.11.1-1 +- wacom 0.11.1 + * Fri May 27 2011 Peter Hutterer 0.11.0-2 - Add 0xE6 2FGT tablet PC (#708225)