rpms/hal-info/devel hal-info-20090330-dell-media-key-hub.patch, NONE, 1.1 hal-info.spec, 1.41, 1.42

[Richard Hughes]

Author: rhughes

Update of /cvs/pkgs/rpms/hal-info/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27847

Modified Files:
	hal-info.spec 
Added Files:
	hal-info-20090330-dell-media-key-hub.patch 
Log Message:
* Tue Apr 14 2009 Richard Hughes <rhughes at redhat.com> - 20090330-2
- A key labelled "Music" on a Dell USB keyboard shows up in X as "XF86Tools"
  which is wrong. Reassigns the key to be "Media".


hal-info-20090330-dell-media-key-hub.patch:

--- NEW FILE hal-info-20090330-dell-media-key-hub.patch ---
commit 73b7c9705bb87276d090e88800ef045f0ebb3a07
Author: Richard Hughes <richard at hughsie.com>
Date:   Tue Apr 14 16:04:31 2009 +0100

    remap Dell USB Keyboard Hub to have XF86Media for the media button, not XF86Tools

diff --git a/fdi/information/10freedesktop/30-keymap-dell.fdi b/fdi/information/10freedesktop/30-keymap-dell.fdi
index 349cb17..295304a 100644
--- a/fdi/information/10freedesktop/30-keymap-dell.fdi
+++ b/fdi/information/10freedesktop/30-keymap-dell.fdi
@@ -43,6 +43,17 @@
         </match>
       </match>
     </match>
+
+    <!-- Dell USB Keyboard Hub -->
+    <match key="@input.originating_device:info.linux.driver" string="usbhid">
+      <match key="info.product" string="Dell Dell USB Keyboard Hub">
+        <match key="@input.originating_device:usb.interface.number" int="0x1">
+          <append key="info.capabilities" type="strlist">input.keymap</append>
+          <append key="input.keymap.data" type="strlist">ce103:media</append> <!-- Media/Music key -->
+        </match>
+      </match>
+    </match>
+
   </device>
 </deviceinfo>
 


Index: hal-info.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hal-info/devel/hal-info.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- hal-info.spec	30 Mar 2009 11:03:22 -0000	1.41
+++ hal-info.spec	14 Apr 2009 15:10:23 -0000	1.42
@@ -1,7 +1,7 @@
 Summary: Device information files for HAL
 Name: hal-info
 Version: 20090330
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: AFL or GPLv2
 Group: System Environment/Libraries
 URL: http://www.freedesktop.org/Software/hal
@@ -10,6 +10,9 @@
 # OLPC specific, not upstream yet, although on HAL mailing list
 Source1: 30-keymap-olpc.fdi
 
+# upstream, 73b7c9705bb87276d090e88800ef045f0ebb3a07
+Patch1: hal-info-20090330-dell-media-key-hub.patch
+
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch: noarch
 Requires: hal >= 0.5.10
@@ -21,6 +24,7 @@
 
 %prep
 %setup -q
+%patch1 -p1 -b .dell-hub
 
 %build
 %configure --enable-killswitch-dell-wlan=no --enable-killswitch-dell-bluetooth=no --enable-killswitch-dell-wwan=no
@@ -42,6 +46,10 @@
 %{_datadir}/hal/fdi/preprobe/10osvendor/*.fdi
 
 %changelog
+* Tue Apr 14 2009 Richard Hughes <rhughes at redhat.com> - 20090330-2
+- A key labelled "Music" on a Dell USB keyboard shows up in X as "XF86Tools"
+  which is wrong. Reassigns the key to be "Media".
+
 * Mon Mar 30 2009 Richard Hughes <rhughes at redhat.com> - 20090330-1
 - Update to latest upstream release