hal: Branch 'master'

[Danny Kukawka]

 fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi |   18 +++++++++------
 1 file changed, 11 insertions(+), 7 deletions(-)

New commits:
commit f0239858682f60da5d26eaf28f8b034b3a4e0141
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Tue Mar 18 11:54:35 2008 +0100

    fixed suspend entries for some Acer machines
    
    Fixed suspend entries for some Acer machines. The effected entries are from
    s2ram, the problem is that HAL strip whitespaces from the sysfs and
    dmidecode output, while s2ram use original dmidecode info to match
    machines. For this we need to use string* machtes instead of contains for
    some machines to prevent mixup with other machines.

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi
index d4a7452..a3866b9 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi
@@ -28,19 +28,23 @@
           <merge key="power_management.quirk.none" type="bool">true</merge>
         </match>
 
-	<!-- these need the full name to prevent mixes with other machines -->
-        <match key="system.hardware.product" prefix_outof="TravelMate 240;TravelMate 250;TravelMate 650">
+	<!-- these need the full name to prevent mixes with other machines 
+             NOTE: HAL removes whitespaces at the end of the sysfs and dmidecode output, 
+                   we need to do exact string matches.
+         -->
+        <match key="system.hardware.product" string_outof="TravelMate 240;TravelMate 250;TravelMate 650">
           <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
           <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
         </match>
-        <match key="system.hardware.product" prefix="TravelMate 380">
+        <match key="system.hardware.product" string="TravelMate 380">
           <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
           <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_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>
+        <!-- TravelMate 630Lci -->
+        <match key="system.hardware.product" string_outof="TravelMate 630;TravelMate 230">
+           <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
+           <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
         </match>
         <match key="system.hardware.product" string="TravelMate 800">
           <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
@@ -72,7 +76,7 @@
           <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
           <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
         </match>
-        <match key="system.hardware.product" contains_outof="1640;3100;5500Z ">
+        <match key="system.hardware.product" contains_outof="1640;3100;5500Z">
           <merge key="power_management.quirk.none" type="bool">true</merge>
         </match>
       </match>