rpms/xorg-x11-drv-wacom/F-12 10-wacom.fdi, 1.1, 1.2 xorg-x11-drv-wacom.spec, 1.2, 1.3

[Peter Hutterer]

Author: whot

Update of /cvs/pkgs/rpms/xorg-x11-drv-wacom/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv620

Modified Files:
	10-wacom.fdi xorg-x11-drv-wacom.spec 
Log Message:
* Mon Nov 23 2009 Peter Hutterer <peter.hutterer at redhat.com> 0.10.1-2
- 10-linuxwacom.fdi: squash extra entry for bluetooth tablet into general
  Wacom match. 
- 10-linuxwacom.fdi: remove info.parent condition for N-Trig (#538036)



Index: 10-wacom.fdi
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-wacom/F-12/10-wacom.fdi,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- 10-wacom.fdi	20 Nov 2009 04:46:42 -0000	1.1
+++ 10-wacom.fdi	23 Nov 2009 07:02:43 -0000	1.2
@@ -3,7 +3,7 @@
 <deviceinfo version="0.2">
   <device>
     <match key="info.category" contains="input">
-      <match key="info.product" contains_outof="Wacom;WALTOP">
+      <match key="info.product" contains_outof="Wacom;WALTOP;WACOM">
 	<merge key="input.x11_driver" type="string">wacom</merge>
       </match>
     </match>
@@ -17,19 +17,7 @@
     </match>
     <!-- N-Trig Duosense Electromagnetic Digitizer -->
     <match key="info.product" contains="HID 1b96:0001">
-      <match key="info.parent" contains="if0">
        <merge key="input.x11_driver" type="string">wacom</merge>
-      </match>
-    </match>
-  </device>
-  <!-- Match the Wacom Bluetooth A5 pen tablet -->
-  <device>
-    <match key="info.capabilities" contains="input.mouse">
-      <match key="info.product" contains="WACOM">
-        <match key="info.product" contains="Tablet">
-          <merge key="input.x11_driver" type="string">wacom</merge>
-        </match>
-      </match>
     </match>
   </device>
 </deviceinfo>


Index: xorg-x11-drv-wacom.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-wacom/F-12/xorg-x11-drv-wacom.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- xorg-x11-drv-wacom.spec	20 Nov 2009 04:46:42 -0000	1.2
+++ xorg-x11-drv-wacom.spec	23 Nov 2009 07:02:44 -0000	1.3
@@ -5,7 +5,7 @@
 Summary:    Xorg X11 wacom input driver
 Name:       xorg-x11-drv-wacom
 Version:    0.10.1
-Release:    1%{?dist}
+Release:    2%{?dist}
 URL:        http://www.x.org
 License:    GPLv2+
 Group:      User Interface/X Hardware Support
@@ -75,6 +75,11 @@ X.Org X11 wacom input driver development
 %{_includedir}/xorg/wacom-properties.h
 
 %changelog
+* Mon Nov 23 2009 Peter Hutterer <peter.hutterer at redhat.com> 0.10.1-2
+- 10-linuxwacom.fdi: squash extra entry for bluetooth tablet into general
+  Wacom match. 
+- 10-linuxwacom.fdi: remove info.parent condition for N-Trig (#538036)
+
 * Fri Nov 20 2009 Peter Hutterer <peter.hutterer at redhat.com> 0.10.1-1
 - wacom 0.10.1
 - Remove unnecessary 'find' directive, changed upstream.