hal: Branch 'master'

[Danny Kukawka]

 fdi/information/10freedesktop/30-keymap-lenovo.fdi |   24 +++++++++++----------
 1 file changed, 13 insertions(+), 11 deletions(-)

New commits:
commit 1b40bdf002a95d8cc4b1641776146e62f86c726b
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Tue Oct 23 11:27:17 2007 +0200

    add keymap for X61 Tablet tablet keys
    
    Added keymap for X61 Tablet tablet keys, changed match for X60 for this.

diff --git a/fdi/information/10freedesktop/30-keymap-lenovo.fdi b/fdi/information/10freedesktop/30-keymap-lenovo.fdi
index 22e6ad3..2da9bf1 100644
--- a/fdi/information/10freedesktop/30-keymap-lenovo.fdi
+++ b/fdi/information/10freedesktop/30-keymap-lenovo.fdi
@@ -13,17 +13,19 @@
           <append key="input.keymap.data" type="strlist">e018:suspend</append> <!-- Fn+F12 hibernate -->
           <append key="info.capabilities" type="strlist">input.keymap</append>
         </match>
-        <match key="/org/freedesktop/Hal/devices/computer:system.hardware.version" contains="X60 Tablet">
-          <append key="input.keymap.data" type="strlist">006c:f21</append> <!-- rotate -->
-          <append key="input.keymap.data" type="strlist">0068:screenlock</append> <!-- screenlock -->
-          <append key="input.keymap.data" type="strlist">006b:esc</append> <!-- escape -->
-          <append key="input.keymap.data" type="strlist">006d:right</append> <!-- right on d-pad -->
-          <append key="input.keymap.data" type="strlist">006e:left</append> <!-- left on d-pad -->
-          <append key="input.keymap.data" type="strlist">0071:up</append> <!-- up on d-pad -->
-          <append key="input.keymap.data" type="strlist">006f:down</append> <!-- down on d-pad -->
-          <append key="input.keymap.data" type="strlist">0069:enter</append> <!-- enter on d-pad -->
-          <append key="info.capabilities" type="strlist">input.keymap</append>
-        </match>
+	<!-- match for X60/X61/ ... ThinkPad Tablets -->
+        <match key="/org/freedesktop/Hal/devices/computer:system.hardware.version" prefix="ThinkPad X6">
+          <match key="/org/freedesktop/Hal/devices/computer:system.hardware.version" suffix=" Tablet">
+            <append key="input.keymap.data" type="strlist">006c:f21</append> <!-- rotate -->
+            <append key="input.keymap.data" type="strlist">0068:screenlock</append> <!-- screenlock -->
+            <append key="input.keymap.data" type="strlist">006b:esc</append> <!-- escape -->
+            <append key="input.keymap.data" type="strlist">006d:right</append> <!-- right on d-pad -->
+            <append key="input.keymap.data" type="strlist">006e:left</append> <!-- left on d-pad -->
+            <append key="input.keymap.data" type="strlist">0071:up</append> <!-- up on d-pad -->
+            <append key="input.keymap.data" type="strlist">006f:down</append> <!-- down on d-pad -->
+            <append key="input.keymap.data" type="strlist">0069:enter</append> <!-- enter on d-pad -->
+            <append key="info.capabilities" type="strlist">input.keymap</append>
+          </match>
 
       </match>