hal: Branch 'master'

[Richard Hughes]

 fdi/information/10freedesktop/30-keymap-misc.fdi |   15 ++++++++++++---
 1 files changed, 12 insertions(+), 3 deletions(-)

New commits:
diff-tree d63ebab620b690f42b385beaf2731398924f1bf7 (from 35f05aeb5c50e1e6402975af23330b8f49894fdf)
Author: Lennart Poettering <lennart at poettering.net>
Date:   Mon Jul 30 12:54:07 2007 +0100

    add keymap for Medion 9580-F
    
    I attached yet another hal-info keymap patch, this time for an old
    Medion 9580-F laptop. Please merge!
    
    (I figured it might be a better idea to send this patch directly to
    you instead of the ML, to lower the signal-to-noise ratio on the ML a
    bit)
    
    Oh, and the patch also updates the comments of my older MSI S270
    keymap xml fragment.

diff --git a/fdi/information/10freedesktop/30-keymap-misc.fdi b/fdi/information/10freedesktop/30-keymap-misc.fdi
index 63d4f4b..490a917 100644
--- a/fdi/information/10freedesktop/30-keymap-misc.fdi
+++ b/fdi/information/10freedesktop/30-keymap-misc.fdi
@@ -42,15 +42,24 @@
           <append key="input.keymap.data" type="strlist">e05f:sleep</append> <!-- Fn-F12  Sleep -->
           <append key="input.keymap.data" type="strlist">e06c:email</append> <!-- envelope button -->
           <append key="input.keymap.data" type="strlist">e032:www</append> <!-- www button -->
-          <append key="input.keymap.data" type="strlist">e076:wlan</append> <!-- wlan -->
-          <append key="input.keymap.data" type="strlist">e062:bluetooth</append> <!-- satellite dish2 -->
-          <append key="input.keymap.data" type="strlist">e079:search</append> <!-- search -->
+          <append key="input.keymap.data" type="strlist">e076:wlan</append> <!-- satellite dish: wlan -->
+          <append key="input.keymap.data" type="strlist">e062:bluetooth</append> <!-- satellite dish: bluetooth -->
+          <append key="input.keymap.data" type="strlist">e079:search</append> <!-- search button -->
           <append key="input.keymap.data" type="strlist">e071:unknown</append> <!-- plug -->
           <append key="input.keymap.data" type="strlist">e072:unknown</append> <!-- unplug -->
           <append key="info.capabilities" type="strlist">input.keymap</append>
         </match>
       </match>
 
+      <match key="/org/freedesktop/Hal/devices/computer:system.vendor" string="MEDIONNB">
+        <match key="/org/freedesktop/Hal/devices/computer:system.product" prefix="A555">
+          <append key="input.keymap.data" type="strlist">67:email</append> <!-- envelope button -->
+          <append key="input.keymap.data" type="strlist">63:www</append> <!-- N button -->
+          <append key="input.keymap.data" type="strlist">66:prog1</append> <!-- link 1 button -->
+          <append key="input.keymap.data" type="strlist">69:prog2</append> <!-- link 2 button -->
+          <append key="info.capabilities" type="strlist">input.keymap</append>
+        </match>
+      </match>
 	
     </match>