hal: Branch 'master'

[Danny Kukawka]

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

New commits:
commit 7168ba19ebee612baf7c33ef79821895668c6439
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Fri Jan 25 16:33:36 2008 +0100

    added keymap for a HP zd7000
    
    Applied adopted version of a patch from Bernard Johnson <bjohnson at symetrix.com>
    to add keymap for a HP zd7000. Changed it to fit into the already existing
    entries of HP machines.

diff --git a/fdi/information/10freedesktop/30-keymap-hp.fdi b/fdi/information/10freedesktop/30-keymap-hp.fdi
index ba073b4..915eba6 100644
--- a/fdi/information/10freedesktop/30-keymap-hp.fdi
+++ b/fdi/information/10freedesktop/30-keymap-hp.fdi
@@ -74,6 +74,13 @@
           <append key="input.keymap.data" type="strlist">e031:help</append>	<!-- FnF1 (help) -->
           <append key="info.capabilities" type="strlist">input.keymap</append>
         </match>
+	<match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="zd7000">
+          <append key="input.keymap.data" type="strlist">e008:player</append>    <!-- multi-media -->
+          <append key="input.keymap.data" type="strlist">e00a:screenlock</append><!-- Fn+lock -->
+          <append key="input.keymap.data" type="strlist">e00b:camera</append>    <!-- camera -->
+          <append key="input.keymap.data" type="strlist">e031:help</append>      <!-- Fn+F1 (help) -->
+          <append key="info.capabilities" type="strlist">input.keymap</append>
+        </match>
       </match>
     </match>
   </device>