rpms/xkeyboard-config/OLPC-2 olpc-xkeyboard-config-am.patch, NONE, 1.1 olpc-xkeyboard-config-et-group-switch.patch, NONE, 1.1 olpc-xkeyboard-config-in-space-fix.patch, NONE, 1.1 xkeyboard-config.spec, 1.15, 1.16

[Bernardo Innocenti (bernie)]

Author: bernie

Update of /cvs/pkgs/rpms/xkeyboard-config/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13126

Modified Files:
	xkeyboard-config.spec 
Added Files:
	olpc-xkeyboard-config-am.patch 
	olpc-xkeyboard-config-et-group-switch.patch 
	olpc-xkeyboard-config-in-space-fix.patch 
Log Message:
* Thu Jan 24 2008 Bernardo Innocenti <bernie at codewiz.org> 1.1-9.20071130cvs
- Add olpc-xkeyboard-config-et-group-switch.patch
- Add olpc-xkeyboard-config-in-space-fix.patch
- Add olpc-xkeyboard-config-am.patch


olpc-xkeyboard-config-am.patch:

--- NEW FILE olpc-xkeyboard-config-am.patch ---
diff -u -r1.54 base.lists.part
--- rules/base.lists.part	11 Jan 2008 22:19:39 -0000	1.54
+++ rules/base.lists.part	24 Jan 2008 11:28:52 -0000
@@ -15,7 +15,7 @@
 ! $pcgeometries = abnt2 latitude jp106 kr106
 
 // Layouts that provide further specializations for the OLPC
-! $olpclayouts = ara br es et kz in np ru th tr us
+! $olpclayouts = am ara br es et kz in np ru th tr us
 
 ! $macbooks = macbook78 macbook79
 ! $maclaptop = ibook powerbook macbook78 macbook79
diff -u -r1.11 am
--- symbols/am	25 Jan 2007 21:08:26 -0000	1.11
+++ symbols/am	24 Jan 2008 11:28:52 -0000
@@ -66,6 +66,15 @@
 
 };
 
+partial alphanumeric_keys
+xkb_symbols "olpc" {
+    include "am(basic)"
+    name[Group1]= "Armenia - OLPC";
+
+   //language key
+   key <I219> { [ ISO_Next_Group,  ISO_Prev_Group ] };
+};
+
 xkb_symbols "phonetic" {
     include "am(basic)"
     name[Group1]= "Armenia - Phonetic";

olpc-xkeyboard-config-et-group-switch.patch:

--- NEW FILE olpc-xkeyboard-config-et-group-switch.patch ---
Add group switch key to Ethiopic keyboard

diff -u -p -u -p -r1.4 et
--- symbols/et	21 Nov 2007 23:02:37 -0000	1.4
+++ symbols/et	24 Jan 2008 10:20:26 -0000
@@ -69,7 +69,7 @@ xkb_symbols "olpc" {
     key <AB09>	{ [        0x01001364,  VoidSymbol ]	}; // >
     key <AB10>  { [        VoidSymbol,  question   ]    }; // ?
 
+    key <BKSL>  { [        backslash,   VoidSymbol ]    }; // bksl
 
-    key <BKSL> {  [        backslash,   VoidSymbol ]    }; // bksl
-
+    key <I219>  { [ ISO_Next_Group, ISO_Prev_Group ]    };
 };

olpc-xkeyboard-config-in-space-fix.patch:

--- NEW FILE olpc-xkeyboard-config-in-space-fix.patch ---
The space key in deva was not mapped completely. The existing mappings have been shifted to alt and shift+alt mapping, and unqualified symbols are mapped to space.


diff -u -r1.17 in
--- symbols/in	11 Jan 2008 22:19:39 -0000	1.17
+++ symbols/in	24 Jan 2008 10:02:48 -0000
@@ -1099,7 +1099,7 @@
   key <AB09> { [	period,		0x1000964 ] }; // DEVANAGARI DANDA
   key <AB10> { [	0x100092F,	0x100095F ] }; // DEVANAGARI LETTER YA; DEVANAGARI LETTER YYA
 
-  key <SPCE> { [	0x100200C,	0x100200D ] }; // ZERO-WIDTH-NON-JOINER (ZWNJ); ZERO-WIDTH-JOINER (ZWJ)
+  key <SPCE> { [	space,		space,	0x100200C,	0x100200D ] }; // ZERO-WIDTH-NON-JOINER (ZWNJ); ZERO-WIDTH-JOINER (ZWJ)
   // language key
   key <I219> {  [ISO_Next_Group  ,  ISO_Prev_Group      ]     };
 };


Index: xkeyboard-config.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xkeyboard-config/OLPC-2/xkeyboard-config.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- xkeyboard-config.spec	11 Jan 2008 23:04:27 -0000	1.15
+++ xkeyboard-config.spec	24 Jan 2008 12:10:59 -0000	1.16
@@ -5,7 +5,7 @@
 Summary: xkeyboard-config alternative xkb data files
 Name: xkeyboard-config
 Version: 1.1
-Release: 8.%{cvsdate}%{?dist}
+Release: 9.%{cvsdate}%{?dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.x.org
@@ -16,6 +16,9 @@
 Patch0: olpc-xkeyboard-config-us-accents.patch
 Patch1: olpc-xkeyboard-config-evdev-keycode-211.patch
 Patch2: olpc-xkeyboard-config-in.patch
+Patch3: olpc-xkeyboard-config-et-group-switch.patch
+Patch4: olpc-xkeyboard-config-in-space-fix.patch
+Patch5: olpc-xkeyboard-config-am.patch
 
 BuildArch: noarch
 
@@ -47,6 +50,9 @@
 %patch0 -p0 -b .usacc
 %patch1 -p0 -b .i211
 %patch2 -p0 -b .in
+%patch3 -p0 -b .et
+%patch4 -p0 -b .insf
+%patch5 -p0 -b .am
 
 %build
 %configure \
@@ -86,6 +92,11 @@
 %{_datadir}/X11/xkb/rules/xorg.xml
 
 %changelog
+* Thu Jan 24 2008 Bernardo Innocenti <bernie at codewiz.org> 1.1-9.20071130cvs
+- Add olpc-xkeyboard-config-et-group-switch.patch
+- Add olpc-xkeyboard-config-in-space-fix.patch
+- Add olpc-xkeyboard-config-am.patch
+
 * Fri Jan 11 2008 Bernardo Innocenti <bernie at codewiz.org> 1.1-8.20071130cvs
 - Add olpc-xkeyboard-config-in.patch