← Back to branch summary

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

« back to all changes in this revision

Viewing changes to debian/patches/110_variants-cleanup.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:
debian/patches/110_variants-cleanup.patch
 
1
commit d33ce57e8411b5cd63070086e56229d1839a0ff4
 
2
Author: Sergey V. Udaltsov <svu@gnome.org>
 
3
Date:   Thu Jan 28 23:52:09 2010 +0000
 
4
 
 
5
    slightly improved variant names
 
6
 
 
7
diff --git a/rules/base.xml.in b/rules/base.xml.in
 
8
index 8ec086e..76b0b98 100644
 
9
--- a/rules/base.xml.in
 
10
+++ b/rules/base.xml.in
 
11
@@ -4344,19 +4344,19 @@
 
12
       <variantList>
 
13
         <variant>
 
14
           <configItem>
 
15
-            <name>fross</name>
 
16
+            <name>fr-oss</name>
 
17
             <description>Français (France Alternative)</description>
 
18
           </configItem>
 
19
         </variant>
 
20
         <variant>
 
21
           <configItem>
 
22
-            <name>usmac</name>
 
23
+            <name>us-mac</name>
 
24
             <description>English (USA Macintosh)</description>
 
25
           </configItem>
 
26
         </variant>
 
27
         <variant>
 
28
           <configItem>
 
29
-            <name>usintl</name>
 
30
+            <name>us-intl</name>
 
31
             <description>English (USA International)</description>
 
32
           </configItem>
 
33
         </variant>
 
34
diff --git a/symbols/ml b/symbols/ml
 
35
index 732eab3..2ca4384 100644
 
36
--- a/symbols/ml
 
37
+++ b/symbols/ml
 
38
@@ -17,7 +17,7 @@ xkb_symbols "basic" {
 
39
 };
 
40
 
 
41
 partial alphanumeric_keys
 
42
-xkb_symbols "fross" {
 
43
+xkb_symbols "fr-oss" {
 
44
 
 
45
     include "fr(oss)"
 
46
 
 
47
@@ -39,7 +39,7 @@ xkb_symbols "fross" {
 
48
 };
 
49
 
 
50
 partial alphanumeric_keys
 
51
-xkb_symbols "usmac" {
 
52
+xkb_symbols "us-mac" {
 
53
 
 
54
     include "us(mac)"
 
55
 
 
56
@@ -62,7 +62,7 @@ xkb_symbols "usmac" {
 
57
 };
 
58
 
 
59
 partial alphanumeric_keys
 
60
-xkb_symbols "usintl" {
 
61
+xkb_symbols "us-intl" {
 
62
 
 
63
     include "us(intl)"
 
64