hal: Branch 'master'

[Danny Kukawka]

 fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi  |    2 +-
 fdi/information/10freedesktop/20-video-quirk-pm-apple.fdi |    2 +-
 fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi  |    2 +-
 fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi    |    2 +-
 fdi/information/10freedesktop/30-keymap-acer.fdi          |    2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 8e3bc7ec845761f96705712e7aabb1151aeb328b
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Tue Nov 20 14:11:55 2007 +0100

    fixed usage of *_outof/; directive in several files
    
    Fixed the usage of *_outof/; directive in several fdi-files.

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi
index dd8b503..e3c3b79 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi
@@ -38,7 +38,7 @@
           <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
           <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
         </match>
-       <match key="system.hardware.product" prefix="TravelMate 630;TravelMate 230 "> <!-- TravelMate 630Lci -->
+       <match key="system.hardware.product" prefix_outof="TravelMate 630;TravelMate 230 "> <!-- TravelMate 630Lci -->
           <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
           <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
         </match>
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-apple.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-apple.fdi
index ab9cdb2..2d5bb2e 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-apple.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-apple.fdi
@@ -2,7 +2,7 @@
 <deviceinfo version="0.2">
   <device>
     <match key="system.hardware.vendor" prefix="Apple">
-      <match key="system.hardware.product" string_outof="MacBook2,1">
+      <match key="system.hardware.product" string="MacBook2,1">
         <match key="system.hardware.vendor" prefix="Apple Inc.">
       	  <match key="system.hardware.version" string="1.0">
              <!-- needs VBE_SAVE from console, but that slows resuming -->
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
index 38004b3..d4d764f 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
@@ -79,7 +79,7 @@
           <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
         </match>
         <!-- these need no quirks -->
-        <match key="system.hardware.product" contains=" 1150; 1720">
+        <match key="system.hardware.product" contains_outof=" 1150; 1720">
           <merge key="power_management.quirk.none" type="bool">true</merge>
         </match>
       </match>
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
index 8780e61..498d09c 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
@@ -6,7 +6,7 @@
     <match key="system.hardware.vendor" prefix="Compaq">
       <!-- Compaq Amada -->
       <match key="system.hardware.product" prefix="Armada">
-        <match key="system.hardware.product" contains="    E500  ;     M70  ;    M700 ">
+        <match key="system.hardware.product" contains_outof="    E500  ;     M70  ;    M700 ">
           <merge key="power_management.quirk.none" type="bool">true</merge>
         </match>
         <!-- This Armada m300 seems not to have a useful model description, so to make sure also check the bios_version-->
diff --git a/fdi/information/10freedesktop/30-keymap-acer.fdi b/fdi/information/10freedesktop/30-keymap-acer.fdi
index fb0bf28..b9c080f 100644
--- a/fdi/information/10freedesktop/30-keymap-acer.fdi
+++ b/fdi/information/10freedesktop/30-keymap-acer.fdi
@@ -72,7 +72,7 @@
             <append key="info.capabilities" type="strlist">input.keymap</append>
           </match>
           <!-- Laptops with extra Euro and Dollar keys, and Fn+Right (Brightness Up) needs mapping (type 2) -->
-          <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="3100;3690;5100;5610;5630;5650;5680;9110">
+          <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="3100;3690;5100;5610;5630;5650;5680;9110">
             <append key="input.keymap.data" type="strlist">e025:help</append> <!-- Fn+F1 Hotkey help -->
             <append key="input.keymap.data" type="strlist">e026:setup</append> <!-- Fn+F2 Acer eSettings -->
             <append key="input.keymap.data" type="strlist">e027:battery</append> <!-- Fn+F3 Power Management -->