rpms/linuxwacom/devel 10-linuxwacom.fdi, 1.3, 1.4 linuxwacom.spec, 1.63, 1.64

[Peter Hutterer]

Author: whot

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

Modified Files:
	10-linuxwacom.fdi linuxwacom.spec 
Log Message:
* Tue Oct 28 2008 Peter Hutterer <peter.hutterer at redhat.com> 0.8.0.3-4
- 10-linuxwacom.fdi: specify "stylus" as default type. (#465349)




Index: 10-linuxwacom.fdi
===================================================================
RCS file: /cvs/pkgs/rpms/linuxwacom/devel/10-linuxwacom.fdi,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 10-linuxwacom.fdi	27 Oct 2008 00:02:08 -0000	1.3
+++ 10-linuxwacom.fdi	28 Oct 2008 00:13:03 -0000	1.4
@@ -5,6 +5,12 @@
     <match key="info.capabilities" 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
+             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>
       </match>
     </match>
   </device>
@@ -14,6 +20,12 @@
       <match key="info.product" contains="WACOM">
         <match key="info.product" contains="Tablet">
           <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>
         </match>
       </match>
     </match>


Index: linuxwacom.spec
===================================================================
RCS file: /cvs/pkgs/rpms/linuxwacom/devel/linuxwacom.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- linuxwacom.spec	27 Oct 2008 00:02:08 -0000	1.63
+++ linuxwacom.spec	28 Oct 2008 00:13:03 -0000	1.64
@@ -3,7 +3,7 @@
 # Upstream's versioning is goofy.  Note the mapping from tarname to version.
 Name:		linuxwacom
 Version:	0.8.0.3
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Wacom Drivers from Linux Wacom Project
 
 Group:		User Interface/X Hardware Support
@@ -105,6 +105,9 @@
 %{_libdir}/libwacomcfg*.so
 
 %changelog
+* Tue Oct 28 2008 Peter Hutterer <peter.hutterer at redhat.com> 0.8.0.3-4
+- 10-linuxwacom.fdi: specify "stylus" as default type. (#465349)
+
 * Sun Oct 26 2008 - Bastien Nocera <bnocera at redhat.com> 0.8.0.3-3
 - Update HAL fdi file to also match the Wacom Bluetooth tablet