hal: Branch 'master'

[Danny Kukawka]

 fdi/information/10freedesktop/10-dell-rfkill-switch-bluetooth.fdi |    2 +-
 fdi/information/10freedesktop/10-dell-rfkill-switch-wlan.fdi      |    2 +-
 fdi/information/10freedesktop/10-dell-rfkill-switch-wwan.fdi      |    2 +-
 fdi/information/10freedesktop/10-usb-pda.fdi                      |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit bce7df829de82ffa0f8aa4dff55c5f983243a4d6
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Mon Mar 3 13:51:32 2008 +0100

    removed deprecated and outdated info.bus
    
    Removed deprecated info.bus property from hal. The key reached end of
    lifetime with 2008-03-01 and was replaced by info.subsystem.

diff --git a/fdi/information/10freedesktop/10-dell-rfkill-switch-bluetooth.fdi b/fdi/information/10freedesktop/10-dell-rfkill-switch-bluetooth.fdi
index 4921163..21c3880 100644
--- a/fdi/information/10freedesktop/10-dell-rfkill-switch-bluetooth.fdi
+++ b/fdi/information/10freedesktop/10-dell-rfkill-switch-bluetooth.fdi
@@ -3,7 +3,7 @@
 <deviceinfo version="0.2">
 
   <device>
-    <match key="info.bus" string="platform">
+    <match key="info.subsystem" string="platform">
       <match key="platform.id" string="dcdbas">
         <match key="/org/freedesktop/Hal/devices/computer:system.kernel.name" string="Linux">
           <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" prefix="Dell ">
diff --git a/fdi/information/10freedesktop/10-dell-rfkill-switch-wlan.fdi b/fdi/information/10freedesktop/10-dell-rfkill-switch-wlan.fdi
index d2be8b9..4c545c5 100644
--- a/fdi/information/10freedesktop/10-dell-rfkill-switch-wlan.fdi
+++ b/fdi/information/10freedesktop/10-dell-rfkill-switch-wlan.fdi
@@ -3,7 +3,7 @@
 <deviceinfo version="0.2">
 
   <device>
-    <match key="info.bus" string="platform">
+    <match key="info.subsystem" string="platform">
       <match key="platform.id" string="dcdbas">
         <match key="/org/freedesktop/Hal/devices/computer:system.kernel.name" string="Linux"> 
           <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" prefix="Dell ">
diff --git a/fdi/information/10freedesktop/10-dell-rfkill-switch-wwan.fdi b/fdi/information/10freedesktop/10-dell-rfkill-switch-wwan.fdi
index 5d6f185..2d94a24 100644
--- a/fdi/information/10freedesktop/10-dell-rfkill-switch-wwan.fdi
+++ b/fdi/information/10freedesktop/10-dell-rfkill-switch-wwan.fdi
@@ -3,7 +3,7 @@
 <deviceinfo version="0.2">
 
   <device>
-    <match key="info.bus" string="platform">
+    <match key="info.subsystem" string="platform">
       <match key="platform.id" string="dcdbas">
         <match key="/org/freedesktop/Hal/devices/computer:system.kernel.name" string="Linux">
           <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" prefix="Dell ">
diff --git a/fdi/information/10freedesktop/10-usb-pda.fdi b/fdi/information/10freedesktop/10-usb-pda.fdi
index 156c151..c51caf7 100644
--- a/fdi/information/10freedesktop/10-usb-pda.fdi
+++ b/fdi/information/10freedesktop/10-usb-pda.fdi
@@ -86,7 +86,7 @@
     </match>
 
     <!-- PalmOS PDAs via libusb -->
-    <match key="info.bus" string="usb_device">
+    <match key="info.subsystem" string="usb_device">
 
       <!-- Sony -->
       <match key="usb_device.vendor_id" int="0x054c">