rpms/hal-info/devel 30-keymap-olpc.fdi, NONE, 1.1 hal-info.spec, 1.33, 1.34

[Richard Hughes]

Author: rhughes

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

Modified Files:
	hal-info.spec 
Added Files:
	30-keymap-olpc.fdi 
Log Message:
* Wed Nov 12 2008 Richard Hughes <rhughes at redhat.com> - 20081022-2
- Add a OLPC keymap file, based from one by Ignacio Vazquez-Abrams.



--- NEW FILE 30-keymap-olpc.fdi ---
<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->

<deviceinfo version="0.2">
  <device>
    <!-- These are raw scancodes produced by the atkbd driver -->
    <match key="@input.originating_device:info.linux.driver" string="atkbd">
      <!-- OLPC devices -->
      <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" string="OLPC">
        <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" string="C2">
          <append key="input.keymap.data" type="strlist">59:fn</append> <!-- Fn -->
          <append key="input.keymap.data" type="strlist">73:prog1</append> <!-- ×/÷ -->
          <append key="input.keymap.data" type="strlist">e067:clear</append> <!-- GP Square -->
          <append key="input.keymap.data" type="strlist">e068:ok</append> <!-- GP Check -->
          <append key="input.keymap.data" type="strlist">e065:select</append> <!-- GP Circle -->
          <append key="input.keymap.data" type="strlist">e066:cancel</append> <!-- GP X -->
          <append key="input.keymap.data" type="strlist">43:brightnessdown</append> <!-- Old F9 -->
          <append key="input.keymap.data" type="strlist">44:brightnessup</append> <!-- Old F10 -->
          <append key="input.keymap.data" type="strlist">57:volumedown</append> <!-- Old F11 -->
          <append key="input.keymap.data" type="strlist">58:volumeup</append> <!-- Old F12 -->
          <append key="input.keymap.data" type="strlist">65:scrollup</append> <!-- GP Up -->
          <append key="input.keymap.data" type="strlist">66:scrolldown</append> <!-- GP Down -->
          <append key="input.keymap.data" type="strlist">67:back</append> <!-- GP Left -->
          <append key="input.keymap.data" type="strlist">68:forward</append> <!-- GP Right -->
          <append key="input.keymap.data" type="strlist">69:direction</append> <!-- Rotate -->
          <append key="input.keymap.data" type="strlist">e079:find</append> <!-- Loupe -->
          <append key="input.keymap.data" type="strlist">e06e:cyclewindows</append> <!-- Boards -->
        </match>
      </match>
    </match>
  </device>
</deviceinfo>



Index: hal-info.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hal-info/devel/hal-info.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- hal-info.spec	22 Oct 2008 12:44:21 -0000	1.33
+++ hal-info.spec	12 Nov 2008 15:41:26 -0000	1.34
@@ -1,11 +1,15 @@
 Summary: Device information files for HAL
 Name: hal-info
 Version: 20081022
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: AFL or GPLv2
 Group: System Environment/Libraries
 URL: http://www.freedesktop.org/Software/hal
 Source0: http://hal.freedesktop.org/releases/%{name}-%{version}.tar.gz
+
+# OLPC specific, not upstream yet, although on HAL mailing list
+Source1: 30-keymap-olpc.fdi
+
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch: noarch
 Requires: hal >= 0.5.10
@@ -25,6 +29,9 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
+# OLPC keys FDI file
+install -D -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/hal/fdi/information/10freedesktop/30-keymap-olpc.fdi
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -35,6 +42,9 @@
 %{_datadir}/hal/fdi/preprobe/10osvendor/*.fdi
 
 %changelog
+* Wed Nov 12 2008 Richard Hughes <rhughes at redhat.com> - 20081022-2
+- Add a OLPC keymap file, based from one by Ignacio Vazquez-Abrams.
+
 * Mon Oct 22 2008 Richard Hughes <rhughes at redhat.com> - 20081022-1
 - Update to latest upstream release