rpms/linuxwacom/devel 10-linuxwacom.fdi, 1.4, 1.5 linuxwacom.spec, 1.71, 1.72

[Matthew Garrett]

Author: mjg59

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

Modified Files:
	10-linuxwacom.fdi linuxwacom.spec 
Log Message:
* Mon Feb 16 2009 Matthew Garrett <mjg at redhat.com> 0.8.2.2-4
- Update the fdi file to automatch tablet PCs with serial Wacoms



Index: 10-linuxwacom.fdi
===================================================================
RCS file: /cvs/pkgs/rpms/linuxwacom/devel/10-linuxwacom.fdi,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- 10-linuxwacom.fdi	28 Oct 2008 00:13:03 -0000	1.4
+++ 10-linuxwacom.fdi	16 Feb 2009 16:20:02 -0000	1.5
@@ -2,8 +2,8 @@
 <!-- this is probably a bit imprecise -->
 <deviceinfo version="0.2">
   <device>
-    <match key="info.capabilities" contains="input">
-      <match key="info.product" contains="Wacom">
+    <match key="info.category" contains="input">
+      <match key="info,product" contains="Wacom">
 	<merge key="input.x11_driver" type="string">wacom</merge>
         <!-- Wacom isn't yet suited well for hotplugging, as we need three
              devices off one kernel device, but HAL only reports this device
@@ -13,6 +13,21 @@
 	<merge key="input.x11_options.Type" type="string">stylus</merge>
       </match>
     </match>
+    <match key="info.capabilities" contains="serial">
+      <match key="@info.parent:pnp.id" contains_outof="WACf001;WACf002;WACf003;WACf004;WACf005;WACf006;WACf007;WACf008;WACf009;WACf00a;WACf00b;WACf00c;FUJ02e5">
+	<append key="info.capabilities" type="strlist">input</append>
+	<merge key="input.x11_driver" type="string">wacom</merge>
+        <!-- Wacom isn't yet suited well for hotplugging, as we need three
+             devices off one kernel device, but HAL only reports this device
+             once. This needs fixing in the driver.
+             Use stylus by default for this single device, if you want erasor
+             or cursor, specify in the line below.  -->
+	<merge key="input.x11_options.Type" type="string">stylus</merge>
+	<merge key="input.x11_options.ForceDevice" type="string">ISDV4</merge>
+	<merge key="input.x11_options.Device" type="copy_property">serial.device</merge>
+	<merge key="input.device" type="copy_property">serial.device</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.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- linuxwacom.spec	11 Feb 2009 22:58:09 -0000	1.71
+++ linuxwacom.spec	16 Feb 2009 16:20:02 -0000	1.72
@@ -3,7 +3,7 @@
 # Upstream's versioning is goofy.  Note the mapping from tarname to version.
 Name:		linuxwacom
 Version:	0.8.2.2
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Wacom Drivers from Linux Wacom Project
 
 Group:		User Interface/X Hardware Support
@@ -107,6 +107,9 @@
 %{_libdir}/libwacomcfg*.so
 
 %changelog
+* Mon Feb 16 2009 Matthew Garrett <mjg at redhat.com> 0.8.2.2-4
+- Update the fdi file to automatch tablet PCs with serial Wacoms
+
 * Thu Feb 12 2009 Peter Hutterer <peter.hutterer at redhat.com> 0.8.2.2-3
 - Revert last commit, this is against Fedora policy.
   https://fedoraproject.org/wiki/Packaging:Guidelines#Configuration_files