hal-info: Branch 'master' - 2 commits

[Danny Kukawka]

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

New commits:
commit 677703c951105c7d09c7936d14d20d6903a16891
Merge: 3cb1723... bffde4e...
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Tue Jun 17 22:40:23 2008 +0200

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

commit 3cb1723ed84f196d236ce52391073a6207ab226d
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Tue Jun 17 22:39:51 2008 +0200

    fixed keymap for the HP dv6000
    
    Fixed keymap for the HP dv6000, it's the same as the dv6500 as
    pointed out in fd.o bug #16337.

diff --git a/fdi/information/10freedesktop/30-keymap-hp.fdi b/fdi/information/10freedesktop/30-keymap-hp.fdi
index 0f9962e..9b811ad 100644
--- a/fdi/information/10freedesktop/30-keymap-hp.fdi
+++ b/fdi/information/10freedesktop/30-keymap-hp.fdi
@@ -19,13 +19,7 @@
           <append key="input.keymap.data" type="strlist">e00a:screenlock</append> <!-- FnF6 (lock) -->
           <append key="info.capabilities" type="strlist">input.keymap</append>
         </match>
-	<!-- HP Pavilion dv6426us -->
-	<match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="dv6000">
-          <append key="input.keymap.data" type="strlist">e008:f20</append>	<!-- FIXME: quick play -->
-          <append key="input.keymap.data" type="strlist">e00e:f21</append>	<!-- FIXME: dvd -->
-          <append key="info.capabilities" type="strlist">input.keymap</append>
-        </match>
-        <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="dv6500">
+        <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="dv6000;dv6500">
           <append key="input.keymap.data" type="strlist">e008:f20</append>	<!-- FIXME: quick play -->
           <append key="input.keymap.data" type="strlist">e00a:screenlock</append> <!-- FnF6 (lock) -->
           <append key="input.keymap.data" type="strlist">e00e:f21</append>	<!-- FIXME: dvd -->