~ubuntu-branches/ubuntu/trusty/xkeyboard-config/trusty-proposed

« back to all changes in this revision

Viewing changes to debian/patches/120_aluminium_rules.patch

  • Committer: Bryce Harrington
  • Date: 2010-03-30 03:34:02 UTC
  • Revision ID: bryce@canonical.com-20100330033402-2z3ywo8akru0u3t3
Cherrypick patches from upstream git

This includes patches to enable the Apple aluminum keyboards, and
various minor layout enhancements or fixes to particular keys.

Show diffs side-by-side

added added

removed removed

Lines of Context:
 
1
commit c0cb36603a182a6fb6943293101da8eea856ff65
 
2
Author: Damien Ciabrini <damien.ciabrini@gmail.com>
 
3
Date:   Thu Dec 24 16:40:42 2009 +0100
 
4
 
 
5
    xkeyboard-config: Base rules for Apple Aluminium Keyboards
 
6
    
 
7
    Additional base rules to define the geometry and symbols to use for ANSI, ISO and JIS keyboards
 
8
    
 
9
    Signed-off-by: Damien Ciabrini <damien.ciabrini@gmail.com>
 
10
 
 
11
diff --git a/rules/base.m_k.part b/rules/base.m_k.part
 
12
index 6d5eda0..f9ff97d 100644
 
13
--- a/rules/base.m_k.part
 
14
+++ b/rules/base.m_k.part
 
15
@@ -9,6 +9,7 @@
 
16
   evdev                =       evdev
 
17
  $nokiamodels  =       evdev
 
18
   olpc         =       evdev
 
19
+ $applealu     =       macintosh(alukbd)
 
20
   macintosh_hhk        =       macintosh(hhk)
 
21
   macintosh_old        =       macintosh(old)
 
22
  $macs         =       macintosh
 
23
diff --git a/rules/base.m_s.part b/rules/base.m_s.part
 
24
index a032e0a..0f1bcce 100644
 
25
--- a/rules/base.m_s.part
 
26
+++ b/rules/base.m_s.part
 
27
@@ -48,4 +48,5 @@
 
28
   vsonku306     =       +inet(microsoftprooem)
 
29
   $inetkbds     =       +inet(%m)
 
30
   $maclaptop    =       +inet(apple)+level3(enter_switch)
 
31
+  $applealu     =       +inet(apple)
 
32
   $macs                =       +inet(apple)