hal: Branch 'master'

[Danny Kukawka]

 fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi |    6 +++---
 fdi/information/10freedesktop/30-keymap-misc.fdi         |    4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit bd634aefdaaa090eefadb4c61bc127fba86a5820
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Mon Mar 3 13:56:47 2008 +0100

    removed deprecated and outdated smbios.* keys
    
    Removed deprecated smbios.* properties from hal. The key reached end of
    lifetime with 2008-02-28 and was replaced by some other:
    
     smbios.system.manufacturer --> system.hardware.vendor
     smbios.system.product --> system.hardware.product
     smbios.system.version --> system.hardware.version
     smbios.system.serial --> system.hardware.serial
     smbios.system.uuid --> system.hardware.uuid
     smbios.bios.vendor --> system.firmware.vendor
     smbios.bios.version --> system.firmware.version
     smbios.bios.release_date --> system.firmware.release_date
     smbios.chassis.manufacturer --> system.chassis.manufacturer
     smbios.chassis.type --> system.chassis.type
     system.vendor --> system.hardware.vendor

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi
index 52ebc03..e8f55ec 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi
@@ -37,17 +37,17 @@
     </match>
 
     <!-- ASUS a7v600 motherboard, has no usable sys_* entries besides bios_version -->
-    <match key="smbios.bios.version" prefix="ASUS A7V600">
+    <match key="system.firmware.version" prefix="ASUS A7V600">
       <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
       <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
     </match>
     <!-- another ASUS Mainboard -->
-    <match key="smbios.bios.version" prefix_outof="ASUS M2N32-SLI DELUXE ACPI BIOS Revision 1201;ASUS M2N32-SLI DELUXE ACPI BIOS Revision 1101">
+    <match key="system.firmware.version" prefix_outof="ASUS M2N32-SLI DELUXE ACPI BIOS Revision 1201;ASUS M2N32-SLI DELUXE ACPI BIOS Revision 1101">
       <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
       <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
     </match>
     <!-- another ASUS Mainboard, this need no quirk -->
-    <match key="smbios.bios.version" prefix="ASUS M2N-E ACPI BIOS Revision">
+    <match key="system.firmware.version" prefix="ASUS M2N-E ACPI BIOS Revision">
       <merge key="power_management.quirk.none" type="bool">true</merge>
     </match>
 
diff --git a/fdi/information/10freedesktop/30-keymap-misc.fdi b/fdi/information/10freedesktop/30-keymap-misc.fdi
index 948a10a..cb35bbf 100644
--- a/fdi/information/10freedesktop/30-keymap-misc.fdi
+++ b/fdi/information/10freedesktop/30-keymap-misc.fdi
@@ -60,8 +60,8 @@
         </match>
       </match>
 
-      <match key="/org/freedesktop/Hal/devices/computer:system.vendor" string="MEDIONNB">
-        <match key="/org/freedesktop/Hal/devices/computer:system.product" prefix="A555">
+      <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" string="MEDIONNB">
+        <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" prefix="A555">
           <append key="input.keymap.data" type="strlist">63:www</append> <!-- N button -->
           <append key="input.keymap.data" type="strlist">66:prog1</append> <!-- link 1 button -->
           <append key="input.keymap.data" type="strlist">67:email</append> <!-- envelope button -->