Attachment 14818 Details for Bug 14749 – revert changes to fr layout and apply them to the ca layout instead

[patch] revert changes to fr layout and apply them to the ca layout instead

xkeyboard-config-olpc-ca-fr.patch (text/plain), 1.65 KB, created by Bernie Innocenti on 2008-03-04 11:39:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bernie Innocenti

Created: 2008-03-04 11:39:22 UTC

Size: 1.65 KB

patch

obsolete

>Index: rules/base.lists.part
>===================================================================
>RCS file: /cvs/xlibs/xkbdesc/xkeyboard-config/rules/base.lists.part,v
>retrieving revision 1.61
>diff -u -p -u -p -r1.61 base.lists.part
>--- rules/base.lists.part	3 Mar 2008 20:48:21 -0000	1.61
>+++ rules/base.lists.part	4 Mar 2008 19:32:38 -0000
>@@ -15,7 +15,7 @@
> ! $pcgeometries = abnt2 latitude jp106 kr106
> 
> // Layouts that provide further specializations for the OLPC
>-! $olpclayouts = af am ara br es et fr it kh kz in mn np ru th tr us 
>+! $olpclayouts = af am ara br ca es et it kh kz in mn np ru th tr us 
> 
> ! $macbooks = macbook78 macbook79
> ! $maclaptop = ibook powerbook macbook78 macbook79
>Index: symbols/ca
>===================================================================
>RCS file: /cvs/xlibs/xkbdesc/xkeyboard-config/symbols/ca,v
>retrieving revision 1.16
>diff -u -p -u -p -r1.16 ca
>--- symbols/ca	30 Jan 2008 21:28:12 -0000	1.16
>+++ symbols/ca	4 Mar 2008 19:32:38 -0000
>@@ -478,3 +478,11 @@ xkb_symbols "shs" {
> 
>     include "level3(ralt_switch)"
> };
>+
>+// OLPC Section
>+xkb_symbols "olpc" {
>+
>+    include "fr"
>+
>+    key <AE03>	{ [          3,    slash,          ograve,        Ograve ] };
>+};
>Index: symbols/fr
>===================================================================
>RCS file: /cvs/xlibs/xkbdesc/xkeyboard-config/symbols/fr,v
>retrieving revision 1.18
>diff -u -p -u -p -r1.18 fr
>--- symbols/fr	3 Mar 2008 20:36:02 -0000	1.18
>+++ symbols/fr	4 Mar 2008 19:32:38 -0000
>@@ -755,10 +755,3 @@ xkb_symbols "geo" {
> 
> };
> 
>-// OLPC Section
>-xkb_symbols "olpc" {
>-
>-    include "basic"
>-
>-    key <AE03>	{ [          3,    slash,          ograve,        Ograve ] };
>-};

Actions: View | Splinter Review

Attachments on bug 14749: 14716 | 14780 | 14818

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.