hal-info: Branch 'master'

[Matthew Garrett]

 fdi/information/10freedesktop/30-keymap-hp.fdi |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit ce34e97094f834708f2f4adbc7d8b648e69f6d70
Author: Matthew Garrett <mjg at redhat.com>
Date:   Mon Mar 30 14:58:41 2009 +0100

    Add EliteBook and 2530p support to HP keymaps
    
    The EliteBook range has the same keyboard mappings as the previous HP Compaq
    business machines. Te 2530p is aso special in terms of having a touchpad
    disable button.

diff --git a/fdi/information/10freedesktop/30-keymap-hp.fdi b/fdi/information/10freedesktop/30-keymap-hp.fdi
index 3a36baf..bb10734 100644
--- a/fdi/information/10freedesktop/30-keymap-hp.fdi
+++ b/fdi/information/10freedesktop/30-keymap-hp.fdi
@@ -37,13 +37,13 @@
             <append key="input.keymap.data" type="strlist">e059:f23</append>    <!-- touchpad on  -->
           </match>
 
-	  <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_ncase="Compaq">
+	  <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="Compaq;EliteBook">
             <!-- Business and enterprise machines -->
             <append key="input.keymap.data" type="strlist">e008:presentation</append>   <!-- Presentation -->
             <append key="input.keymap.data" type="strlist">e059:help</append>   <!-- I key (high keycode: "info") -->
           </match>
 
-	  <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="2510p">
+	  <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="2510p;2530p">
             <!-- 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:help</remove>
             <append key="input.keymap.data" type="strlist">e058:f22</append>    <!-- touchpad off -->