hal: Branch 'master' - 3 commits

[Richard Hughes]

 fdi/information/10freedesktop/30-keymap-acer.fdi |    2 +-
 fdi/information/10freedesktop/30-keymap-misc.fdi |    8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

New commits:
diff-tree 38ae34b634403b75bfbf4c7a43ea7951d623dc2d (from parents)
Merge: 5db88023b3693f040cf4b1b0aa66d184a444fc7c b844a4df4072d01917c54371e4001fe0af12157e
Author: Richard Hughes <richard at hughsie.com>
Date:   Tue Aug 21 18:05:17 2007 +0100

    Merge branch 'master' of git+ssh://hughsient@git.freedesktop.org/git/hal-info

diff-tree 5db88023b3693f040cf4b1b0aa66d184a444fc7c (from 92f92ea3a46faa73dd9639f703f2bf62c283620a)
Author: Adel Gadllah <adel.gadllah at gmail.com>
Date:   Tue Aug 21 18:04:11 2007 +0100

    add keymap for INVENTEC SYMPHONY 6.0/7.0
    
    The attached patch adds keymap quirks for the Zepto 6615WD Laptop.
    Its a rebranded Laptop thats why it does not expose its name in the dmi data.

diff --git a/fdi/information/10freedesktop/30-keymap-misc.fdi b/fdi/information/10freedesktop/30-keymap-misc.fdi
index 9a8fc81..aabac24 100644
--- a/fdi/information/10freedesktop/30-keymap-misc.fdi
+++ b/fdi/information/10freedesktop/30-keymap-misc.fdi
@@ -61,6 +61,14 @@
         </match>
       </match>
 	
+      <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" string="INVENTEC">
+	<match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" string="SYMPHONY 6.0/7.0">
+	  <append key="input.keymap.data" type="strlist">e073:prog2</append> <!-- "P2" programmable button -->
+	  <append key="input.keymap.data" type="strlist">e074:prog1</append> <!-- "P1" programmable button -->
+	  <append key="info.capabilities" type="strlist">input.keymap</append>
+	</match>
+      </match>
+
     </match>
 
   </device>
diff-tree 92f92ea3a46faa73dd9639f703f2bf62c283620a (from fca27b96eb970f9519b1cacb7a55c157dff4feac)
Author: Richard Hughes <richard at hughsie.com>
Date:   Tue Aug 21 18:03:00 2007 +0100

    correct a keyname in an acer keymap

diff --git a/fdi/information/10freedesktop/30-keymap-acer.fdi b/fdi/information/10freedesktop/30-keymap-acer.fdi
index b09ec82..dc8fcff 100644
--- a/fdi/information/10freedesktop/30-keymap-acer.fdi
+++ b/fdi/information/10freedesktop/30-keymap-acer.fdi
@@ -229,7 +229,7 @@
             <append key="input.keymap.data" type="strlist">0x68:up</append> 
             <append key="input.keymap.data" type="strlist">0x69:down</append> 
             <append key="input.keymap.data" type="strlist">0x6b:fn</append> 
-            <append key="input.keymap.data" type="strlist">0x6c:lockscreen</append> 
+            <append key="input.keymap.data" type="strlist">0x6c:screenlock</append> 
             <append key="info.capabilities" type="strlist">input.keymap</append>
           </match>
           <!-- TravelMate 3000 -->