hal: Branch 'master'

[Danny Kukawka]

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

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

    sort keymap entries for machines listed in 30-keymap-misc.fdi
    
    Sort the keymap entries for machines listed in 30-keymap-misc.fdi
    to find easier duplicates.

diff --git a/fdi/information/10freedesktop/30-keymap-misc.fdi b/fdi/information/10freedesktop/30-keymap-misc.fdi
index 0e2afbe..9a8fc81 100644
--- a/fdi/information/10freedesktop/30-keymap-misc.fdi
+++ b/fdi/information/10freedesktop/30-keymap-misc.fdi
@@ -16,17 +16,17 @@
 
       <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" prefix="MICRO-STAR">
         <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="INFINITY">
-          <append key="input.keymap.data" type="strlist">e064:f22</append> <!-- Fn-F3   Touchpad disable -->
-          <append key="input.keymap.data" type="strlist">e077:brightnessdown</append> <!-- Fn-F4   Brightness down -->
-          <append key="input.keymap.data" type="strlist">e078:brightnessup</append> <!-- Fn-F5   Brightness up -->
+          <append key="input.keymap.data" type="strlist">e020:mute</append> <!-- Fn-F9   Sound On/Off -->
           <append key="input.keymap.data" type="strlist">e02e:volumedown</append> <!-- Fn-F7   Volume down -->
           <append key="input.keymap.data" type="strlist">e030:volumeup</append> <!-- Fn-F8   Volume up -->
-          <append key="input.keymap.data" type="strlist">e020:mute</append> <!-- Fn-F9   Sound On/Off -->
+          <append key="input.keymap.data" type="strlist">e032:www</append> <!-- e button -->
           <append key="input.keymap.data" type="strlist">e05f:sleep</append> <!-- Fn-F12  Sleep -->
+          <append key="input.keymap.data" type="strlist">e062:bluetooth</append> <!-- satellite dish2 -->
+          <append key="input.keymap.data" type="strlist">e064:f22</append> <!-- Fn-F3   Touchpad disable -->
           <append key="input.keymap.data" type="strlist">e06c:email</append> <!-- envelope button -->
-          <append key="input.keymap.data" type="strlist">e032:www</append> <!-- e button -->
           <append key="input.keymap.data" type="strlist">e076:wlan</append> <!-- satellite dish1 -->
-          <append key="input.keymap.data" type="strlist">e062:bluetooth</append> <!-- satellite dish2 -->
+          <append key="input.keymap.data" type="strlist">e077:brightnessdown</append> <!-- Fn-F4   Brightness down -->
+          <append key="input.keymap.data" type="strlist">e078:brightnessup</append> <!-- Fn-F5   Brightness up -->
           <append key="input.keymap.data" type="strlist">e079:search</append> <!-- Search -->
           <append key="info.capabilities" type="strlist">input.keymap</append>
         </match>
@@ -34,28 +34,28 @@
       
       <match key="/org/freedesktop/Hal/devices/computer:system.chassis.manufacturer" prefix="MICRO-STAR">
         <match key="/org/freedesktop/Hal/devices/computer:system.hardware.version" string="0131">
-          <append key="input.keymap.data" type="strlist">e078:brightnessup</append> <!-- Fn-F4   Brightness up -->
-          <append key="input.keymap.data" type="strlist">e077:brightnessdown</append> <!-- Fn-F5   Brightness down -->
+          <append key="input.keymap.data" type="strlist">e020:mute</append> <!-- Fn-F9   Sound On/Off -->
           <append key="input.keymap.data" type="strlist">e02e:volumedown</append> <!-- Fn-F7   Volume down -->
           <append key="input.keymap.data" type="strlist">e030:volumeup</append> <!-- Fn-F8   Volume up -->
-          <append key="input.keymap.data" type="strlist">e020:mute</append> <!-- Fn-F9   Sound On/Off -->
+          <append key="input.keymap.data" type="strlist">e032:www</append> <!-- www button -->
           <append key="input.keymap.data" type="strlist">e05f:sleep</append> <!-- Fn-F12  Sleep -->
+          <append key="input.keymap.data" type="strlist">e062:bluetooth</append> <!-- satellite dish: bluetooth -->
           <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> <!-- 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="input.keymap.data" type="strlist">e077:brightnessdown</append> <!-- Fn-F5   Brightness down -->
+          <append key="input.keymap.data" type="strlist">e078:brightnessup</append> <!-- Fn-F4   Brightness up -->
+          <append key="input.keymap.data" type="strlist">e079:search</append> <!-- search button -->
           <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">67:email</append> <!-- envelope button -->
           <append key="input.keymap.data" type="strlist">69:prog2</append> <!-- link 2 button -->
           <append key="info.capabilities" type="strlist">input.keymap</append>
         </match>