rpms/linuxwacom/devel 10-linuxwacom.fdi, 1.7, 1.8 linuxwacom.spec, 1.77, 1.78

[Peter Hutterer]

Author: whot

Update of /cvs/pkgs/rpms/linuxwacom/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4170

Modified Files:
	10-linuxwacom.fdi linuxwacom.spec 
Log Message:
* Thu Mar 26 2009 Peter Hutterer <peter.hutterer at redhat.com> 0.8.2.2-10
- Add WALTOP and N-Trig Duosense devices to the fdi file.




Index: 10-linuxwacom.fdi
===================================================================
RCS file: /cvs/pkgs/rpms/linuxwacom/devel/10-linuxwacom.fdi,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- 10-linuxwacom.fdi	7 Mar 2009 17:40:01 -0000	1.7
+++ 10-linuxwacom.fdi	26 Mar 2009 05:25:54 -0000	1.8
@@ -3,7 +3,7 @@
 <deviceinfo version="0.2">
   <device>
     <match key="info.category" contains="input">
-      <match key="info.product" contains="Wacom">
+      <match key="info.product" contains_outof="Wacom;WALTOP">
 	<merge key="input.x11_driver" type="string">wacom</merge>
 	<merge key="input.x11_options.Type" type="string">stylus</merge>
 	<append key="info.callouts.add" type="strlist">hal-setup-wacom</append>
@@ -27,6 +27,13 @@
 	</match>
       </match>
     </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>
+       <merge key="input.x11_options.Type" type="string">stylus</merge>
+      </match>
+    </match>
   </device>
   <!-- Match the Wacom Bluetooth A5 pen tablet -->
   <device>


Index: linuxwacom.spec
===================================================================
RCS file: /cvs/pkgs/rpms/linuxwacom/devel/linuxwacom.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- linuxwacom.spec	9 Mar 2009 04:09:58 -0000	1.77
+++ linuxwacom.spec	26 Mar 2009 05:25:54 -0000	1.78
@@ -3,7 +3,7 @@
 # Upstream's versioning is goofy.  Note the mapping from tarname to version.
 Name:		linuxwacom
 Version:	0.8.2.2
-Release:	9%{?dist}
+Release:	10%{?dist}
 Summary:	Wacom Drivers from Linux Wacom Project
 
 Group:		User Interface/X Hardware Support
@@ -115,6 +115,9 @@
 %{_libdir}/libwacomcfg*.so
 
 %changelog
+* Thu Mar 26 2009 Peter Hutterer <peter.hutterer at redhat.com> 0.8.2.2-10
+- Add WALTOP and N-Trig Duosense devices to the fdi file.
+
 * Mon Mar 09 2009 Peter Hutterer <peter.hutterer at redhat.com> 0.8.2.2-9
 - Remove linuxwacom-0.8.2.2-HAL.patch, obsolete with the hal callout.