hal-info: Branch 'master'

[Danny Kukawka]

 fdi/information/10freedesktop/10-usb-music-players.fdi      |    2 +-
 fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi    |    2 +-
 fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi    |    2 +-
 fdi/information/10freedesktop/20-video-quirk-pm-samsung.fdi |    2 +-
 fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi    |    2 +-
 fdi/information/10freedesktop/30-keymap-hp.fdi              |    2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 87d51f5817da870a65215b741731ff1d61c04ae7
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Wed Oct 1 18:25:06 2008 +0200

    fixed usage of *_outof directives
    
    Fixed usage of *_outof directives.

diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index ec9c2d3..c8dcb5d 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -229,7 +229,7 @@
             <append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
             <append key="portable_audio_player.audio_folders" type="strlist">Music/</append>
 	    <!-- Samsung YP-J70 -->
-            <match key="@storage.originating_device:usb.product_id" int_outof="0x5032">
+            <match key="@storage.originating_device:usb.product_id" int="0x5032">
               <append key="portable_audio_player.audio_folders" type="strlist">RECORDED/</append>
               <merge key="storage.requires_eject" type="bool">true</merge>
             </match>
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
index 10510f9..79f4d6a 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
@@ -33,7 +33,7 @@
           <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
           <merge key="power_management.quirk.no_fb" type="bool">true</merge>
         </match>
-	<match key="system.hardware.product" contains_outof="D630">
+	<match key="system.hardware.product" contains="D630">
 	  <match key="system.firmware.version" compare_lt="A12">
 	    <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
             <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi
index a13a5bb..be1183d 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi
@@ -156,7 +156,7 @@
 
   <device>
     <match key="system.hardware.vendor" prefix_ncase="micro-star">
-      <match key="system.hardware.product" string="MS-1012;MS-1013">
+      <match key="system.hardware.product" string_outof="MS-1012;MS-1013">
         <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
       </match>
       <match key="system.hardware.product" string="MS-1057">
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-samsung.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-samsung.fdi
index fc41aa7..2d2e826 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-samsung.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-samsung.fdi
@@ -6,7 +6,7 @@
         <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="SQ30;SQ35S;SX50S">
+      <match key="system.hardware.product" string_outof="SQ30;SQ35S;SX50S">
         <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
       </match>
       <!-- Samsung UMPC, P35 (NOTE: there is a s2ram report for CoronaR to need no quirks)-->
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi
index accbf52..559bc57 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi
@@ -29,7 +29,7 @@
 	<merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
 	<merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
       </match>
-      <match key="system.hardware.product" contains_outof="PCG-Z1MP">
+      <match key="system.hardware.product" contains="PCG-Z1MP">
 	<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
 	<merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
 	<merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
diff --git a/fdi/information/10freedesktop/30-keymap-hp.fdi b/fdi/information/10freedesktop/30-keymap-hp.fdi
index 29000c0..b8987f7 100644
--- a/fdi/information/10freedesktop/30-keymap-hp.fdi
+++ b/fdi/information/10freedesktop/30-keymap-hp.fdi
@@ -32,7 +32,7 @@
           <append key="input.keymap.data" type="strlist">e012:brightnessdown</append>	<!-- FnF7 (brightness down) -->
           <append key="input.keymap.data" type="strlist">e017:brightnessup</append>	<!-- FnF8 (brightness up) -->
         </match>
-	<match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="2510p">
+	<match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="2510p">
           <!-- The 2510p seems to be unique in having a touchpad disable button despite being an enterprise model -->
           <remove key="input.keymap.data" type="strlist">e059:info</remove>
           <append key="input.keymap.data" type="strlist">e058:f22</append>    <!-- touchpad off -->