hal-info: Branch 'master'

[Danny Kukawka]

 fdi/information/10freedesktop/10-tablet-wacom.fdi |   26 ----------------------
 fdi/information/10freedesktop/Makefile.am         |    1 
 2 files changed, 27 deletions(-)

New commits:
commit aea4798a30bb29a4c0a982edbc7bb93ae47d1a6e
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Fri Mar 6 13:10:10 2009 +0100

    Revert "add list of wacom tablets for X autoconfiguration"
    
    This reverts commit 5007cd4cdf150d29283dbe8f89b055e5c6fb6870.
    
    Reason: This should be part of the related X wacom driver (linuxwacom)
    and not hal-info because it makes no sense to set all those info if the
    wacom driver isn't installed in the system. Another problem: there is
    no hal-setup-wacom in hal-info or hal which was added as callout.

diff --git a/fdi/information/10freedesktop/10-tablet-wacom.fdi b/fdi/information/10freedesktop/10-tablet-wacom.fdi
deleted file mode 100644
index 7ad5917..0000000
--- a/fdi/information/10freedesktop/10-tablet-wacom.fdi
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!-- this is probably a bit imprecise -->
-<deviceinfo version="0.2">
-  <device>
-    <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.device" type="copy_property">serial.device</merge>
-        <append key="info.callouts.add" type="strlist">hal-setup-wacom</append>
-        <append key="wacom.types" type="strlist">eraser</append>
-        <match key="@info.parent:pnp.id" contains_outof="WACf008;WACf009">
-          <append key="wacom.types" type="strlist">touch</append>
-        </match>
-      </match>
-    </match>
-  </device>
-</deviceinfo>
-
diff --git a/fdi/information/10freedesktop/Makefile.am b/fdi/information/10freedesktop/Makefile.am
index f047326..3332609 100644
--- a/fdi/information/10freedesktop/Makefile.am
+++ b/fdi/information/10freedesktop/Makefile.am
@@ -10,7 +10,6 @@ dist_fdi_DATA = 10-usb-card-readers.fdi		\
 		10-laptop-panel-hardware.fdi	\
 		10-cd-dvd-burner.fdi		\
 		10-battery.fdi			\
-		10-tablet-wacom.fdi		\
 		10-modem.fdi			\
 		10-scanner.fdi			\
 		10-usb-obex.fdi