hal: Branch 'master'

[Richard Hughes]

 fdi/information/10freedesktop/10-laptop-panel-hardware.fdi |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

New commits:
diff-tree 54be9fb333bab23b5ce6a7473fb469ddd2ccc8b1 (from 3de31d4b45dcdf63ebda2fefe603264875e32b59)
Author: Richard Hughes <richard at hughsie.com>
Date:   Mon Feb 19 21:28:47 2007 +0000

    match all IBM ThinkPad models to make the brightness keys work
    
    According to bug https://launchpad.net/bugs/81407 the
    hal-0.5.8.1/fdi/policy/10osvendor/10-laptop-panel-mgmt-policy.fdi needs
    to match all IBM ThinkPad models to make the brightness keys work.
    Patch from Oliver Grawert <ogra at ubuntu.com>, thanks.

diff --git a/fdi/information/10freedesktop/10-laptop-panel-hardware.fdi b/fdi/information/10freedesktop/10-laptop-panel-hardware.fdi
index 5f30680..f5e98b8 100644
--- a/fdi/information/10freedesktop/10-laptop-panel-hardware.fdi
+++ b/fdi/information/10freedesktop/10-laptop-panel-hardware.fdi
@@ -8,7 +8,7 @@
   <device>
     <match key="info.category" string="laptop_panel">
       <match key="/org/freedesktop/Hal/devices/computer:smbios.system.manufacturer" string="IBM">
-        <match key="/org/freedesktop/Hal/devices/computer:smbios.system.version" string="ThinkPad X31">
+        <match key="/org/freedesktop/Hal/devices/computer:smbios.system.version" contains="ThinkPad">
           <merge key="laptop_panel.brightness_in_hardware" type="bool">true</merge>
         </match>
       </match>