hal: Branch 'master'

[Danny Kukawka]

 fdi/information/10freedesktop/30-keymap-compaq.fdi |    2 +-
 fdi/information/10freedesktop/30-keymap-hp.fdi     |    8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
diff-tree aaac8e3628e44eb0dbfabd7bf07a5bffd8dd940f (from e1a30ab4d8c5808611b1d0efe29d9272d1c1fcf5)
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Wed Aug 15 13:13:18 2007 +0200

    sort keymap entries for Compaq/HP machines
    
    Sort the keymap entries for Compaq/HP machines to find easier duplicates.

diff --git a/fdi/information/10freedesktop/30-keymap-compaq.fdi b/fdi/information/10freedesktop/30-keymap-compaq.fdi
index c6d51dd..012e192 100644
--- a/fdi/information/10freedesktop/30-keymap-compaq.fdi
+++ b/fdi/information/10freedesktop/30-keymap-compaq.fdi
@@ -9,9 +9,9 @@
       <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" prefix="Compaq">
         <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="E500">
           <append key="input.keymap.data" type="strlist">e023:www</append>	<!-- I key -->
-          <append key="input.keymap.data" type="strlist">e01f:homepage</append>	<!-- Home key -->
           <append key="input.keymap.data" type="strlist">e01a:search</append>	<!-- Search key -->
           <append key="input.keymap.data" type="strlist">e01e:email</append>	<!-- Email -->
+          <append key="input.keymap.data" type="strlist">e01f:homepage</append>	<!-- Home key -->
           <append key="info.capabilities" type="strlist">input.keymap</append>
         </match>
       </match>
diff --git a/fdi/information/10freedesktop/30-keymap-hp.fdi b/fdi/information/10freedesktop/30-keymap-hp.fdi
index 730e4c4..3ca2de8 100644
--- a/fdi/information/10freedesktop/30-keymap-hp.fdi
+++ b/fdi/information/10freedesktop/30-keymap-hp.fdi
@@ -16,15 +16,15 @@
           <append key="info.capabilities" type="strlist">input.keymap</append>
         </match>
         <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="nc6120">
-          <append key="input.keymap.data" type="strlist">e059:www</append>	<!-- I key -->
-          <append key="input.keymap.data" type="strlist">e009:battery</append>	<!-- FnF8 (battery) -->
           <append key="input.keymap.data" type="strlist">e008:tv</append>	<!-- SVideo -->
+          <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="info.capabilities" type="strlist">input.keymap</append>
         </match>
         <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="nc6320">
-          <append key="input.keymap.data" type="strlist">e059:www</append>	<!-- I key -->
-          <append key="input.keymap.data" type="strlist">e009:battery</append>	<!-- FnF8 (battery) -->
           <append key="input.keymap.data" type="strlist">e008:tv</append>	<!-- SVideo -->
+          <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="info.capabilities" type="strlist">input.keymap</append>
         </match>
       </match>