hal: Branch 'master'

[Danny Kukawka]

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

New commits:
commit c0241d64f2e6859358d694eddf63c9289c85f37a
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Thu Jan 17 15:30:30 2008 +0100

    fixed keymapping for HP machines (added before by myself)
    
    Fixed keymapping for some HP machines I added. Replaced mapping to
    tv key with korrect presentation key and replaced www mapping with
    info key since this is what the key really is.

diff --git a/fdi/information/10freedesktop/30-keymap-hp.fdi b/fdi/information/10freedesktop/30-keymap-hp.fdi
index 93747d1..1223f4c 100644
--- a/fdi/information/10freedesktop/30-keymap-hp.fdi
+++ b/fdi/information/10freedesktop/30-keymap-hp.fdi
@@ -25,10 +25,10 @@
         </match>
         <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="nc2400">
           <append key="input.keymap.data" type="strlist">e001:fn_esc</append>	<!-- FnEsc -->
-          <append key="input.keymap.data" type="strlist">e008:tv</append>	<!-- SVideo/Presentation -->
+          <append key="input.keymap.data" type="strlist">e008:presentation</append>	<!-- Presentation -->
           <append key="input.keymap.data" type="strlist">e009:battery</append>	<!-- FnF8 (battery) -->
           <append key="input.keymap.data" type="strlist">e00a:f22</append>	<!-- FnF6 -->
-          <append key="input.keymap.data" type="strlist">e059:www</append>	<!-- I key -->
+          <append key="input.keymap.data" type="strlist">e059:info</append>	<!-- I key -->
           <append key="info.capabilities" type="strlist">input.keymap</append>
         </match>
         <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="nx5000">
@@ -47,18 +47,18 @@
         </match>
         <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="nc6400;nx6125">
           <append key="input.keymap.data" type="strlist">e001:fn_esc</append>	<!-- FnEsc -->
-          <append key="input.keymap.data" type="strlist">e008:tv</append>	<!-- SVideo -->
+          <append key="input.keymap.data" type="strlist">e008:presentation</append>	<!-- presentation -->
           <append key="input.keymap.data" type="strlist">e009:battery</append>	<!-- FnF8 (battery) -->
-          <append key="input.keymap.data" type="strlist">e059:www</append>	<!-- I key -->
+          <append key="input.keymap.data" type="strlist">e059:info</append>	<!-- I key -->
           <append key="info.capabilities" type="strlist">input.keymap</append>
         </match>
         <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="nc6230;nw8440;nx6325">
           <append key="input.keymap.data" type="strlist">e001:fn_esc</append>	<!-- FnEsc -->
-          <append key="input.keymap.data" type="strlist">e008:tv</append>	<!-- SVideo -->
+          <append key="input.keymap.data" type="strlist">e008:presentation</append>	<!-- presentation -->
           <append key="input.keymap.data" type="strlist">e009:battery</append>	<!-- FnF8 (battery) -->
           <append key="input.keymap.data" type="strlist">e00a:screenlock</append>	<!-- FnF6 Lock -->
           <append key="input.keymap.data" type="strlist">e033:f22</append>      <!-- FIXME: Auto brightness -->
-          <append key="input.keymap.data" type="strlist">e059:www</append>	<!-- I key -->
+          <append key="input.keymap.data" type="strlist">e059:info</append>	<!-- I key -->
           <append key="info.capabilities" type="strlist">input.keymap</append>
         </match>
         <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="nx7300;nx7400">