rpms/xkeyboard-config/OLPC-3 xkeyboard-config-olpc-af.patch, NONE, 1.1 xkeyboard-config-olpc-ca-fr-typofix.patch, NONE, 1.1 xkeyboard-config-olpc-et.patch, NONE, 1.1 xkeyboard-config-olpc-tr.patch, NONE, 1.1 xkeyboard-config.spec, 1.19, 1.20

[Sayamindu Dasgupta (sayamind)]

Author: sayamind

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

Modified Files:
	xkeyboard-config.spec 
Added Files:
	xkeyboard-config-olpc-af.patch 
	xkeyboard-config-olpc-ca-fr-typofix.patch 
	xkeyboard-config-olpc-et.patch xkeyboard-config-olpc-tr.patch 
Log Message:
Various fixes, and porting a few patches from the OLPC-2 branch.



xkeyboard-config-olpc-af.patch:

--- NEW FILE xkeyboard-config-olpc-af.patch ---
diff --git a/symbols/af b/symbols/af
index 3ff8ad4..5693653 100644
--- a/symbols/af
+++ b/symbols/af
@@ -273,7 +273,7 @@ xkb_symbols "olpc-ps" {
 };
 
 partial alphanumeric_keys 
-xkb_symbols "olpc-fa" {
+xkb_symbols "fa-olpc" {
 
    name[Group1]= "Afghanistan - OLPC Dari";
 
@@ -334,7 +334,7 @@ xkb_symbols "olpc-fa" {
 };
 
 partial alphanumeric_keys 
-xkb_symbols "olpc-uz" {
+xkb_symbols "uz-olpc" {
 
    name[Group1]= "Afghanistan - OLPC Southern Uzbek";
 

xkeyboard-config-olpc-ca-fr-typofix.patch:

--- NEW FILE xkeyboard-config-olpc-ca-fr-typofix.patch ---
Index: symbols/ca
===================================================================
RCS file: /cvs/xkeyboard-config/xkeyboard-config/symbols/ca,v
retrieving revision 1.18
diff -u -r1.18 ca
--- symbols/ca	29 Apr 2008 20:38:44 -0000	1.18
+++ symbols/ca	27 May 2008 08:07:57 -0000
@@ -476,7 +476,14 @@
 // OLPC Section
 xkb_symbols "olpc" {
 
-    include "fr"
-
-    key <AE03>	{ [          3,    slash,          ograve,        Ograve ] };
+    include "ca(fr)"
+    
+    key <AE02>	{ [          2,    quotedbl,          ograve,        Ograve ] };
+    key <AE03>	{ [          3,    slash,          at,        VoidSymbol ] };
+    
+    key <AD03>	{ [          e,    E,          EuroSign, VoidSymbol]	};
+        
+    key <AB09>	{ [  period,         period,         0x1002010 ]	};
+    
+    key <I219>  { [  guillemotleft,  guillemotright, degree, VoidSymbol ] };
 };

xkeyboard-config-olpc-et.patch:

--- NEW FILE xkeyboard-config-olpc-et.patch ---
diff --git a/symbols/et b/symbols/et
index e6d1ba7..f3d4a98 100644
--- a/symbols/et
+++ b/symbols/et
@@ -55,11 +55,11 @@ xkb_symbols "olpc" {
     key <AC09>	{ [        0x01001208,  VoidSymbol ]	}; // l
 
     key <AC10>	{ [        0x01001362,  0x01001361 ]	}; // :;
-    key <AC11>	{ [        apostrophe,  quotedbl   ]	}; // '"
+    key <AC11>  { [        0x01001366,  0x01001365 ]    }; // '"
 
     key <AB01>	{ [        0x010012D8,  0x010012E0 ]	}; // z
     key <AB02>	{ [        0x010012A0,  0x010012D0 ]	}; // x
-    key <AB03>	{ [        c,           C          ]	}; // c
+    key <AB03>  { [        0x01001278,  VoidSymbol ]    }; // c
     key <AB04>	{ [        0x01001238,  0x01001268 ]	}; // v
     key <AB05>	{ [        0x01001260,  VoidSymbol ]	}; // b
     key <AB06>	{ [        0x01001290,  0x01001298 ]	}; // n
@@ -67,9 +67,9 @@ xkb_symbols "olpc" {
 
     key <AB08>	{ [        0x01001363,  VoidSymbol ]	}; // <
     key <AB09>	{ [        0x01001364,  VoidSymbol ]	}; // >
-    key <AB10>  { [        VoidSymbol,  question   ]    }; // ?
+    key <AB10>  { [        0x01001367,  VoidSymbol ]    }; // ?
 
-    key <BKSL> {  [        backslash,   VoidSymbol ]    }; // bksl
+    key <BKSL> {  [        VoidSymbol,  0x01002010 ]    }; // bksl
 
     include "group(olpc)"
 };

xkeyboard-config-olpc-tr.patch:

--- NEW FILE xkeyboard-config-olpc-tr.patch ---
Index: symbols/tr
===================================================================
RCS file: /cvs/xkeyboard-config/xkeyboard-config/symbols/tr,v
retrieving revision 1.14
diff -u -r1.14 tr
--- symbols/tr	30 Jan 2008 21:54:00 -0000	1.14
+++ symbols/tr	26 May 2008 21:11:34 -0000
@@ -280,7 +280,21 @@
 partial alphanumeric_keys
 xkb_symbols "olpc" {
     name[Group1]= "Turkey";
-    include "tr(f)"
+    include "tr(intl)"
+
+    key <AE01>	{ [         1,    exclam,    VoidSymbol,    VoidSymbol ] };
+    key <AE06>	{ [         6,  ampersand, VoidSymbol,  VoidSymbol ]	};
+    key <AE12>	{ type[group1] = "FOUR_LEVEL", [     minus, underscore, bar,    VoidSymbol ]	};
+
+
+    key <AB03>  { [         c,           C,     leftdoublequotemark,     VoidSymbol ] };
+    key <AB04>  { [         v,           V,     rightdoublequotemark,     VoidSymbol ] };
+    key <AB05>  { [         b,           B,     VoidSymbol,     VoidSymbol ] };
+    key <AB08>	{ [odiaeresis, Odiaeresis,     VoidSymbol,   VoidSymbol ]	};
+
+    key <AB09>	{ [  ccedilla,   Ccedilla, multiply,     VoidSymbol ] };
+    key <AB10>	{ [    period,      colon, division, dead_abovedot ] };
+
+    key <I219> { [  less,  greater, VoidSymbol, VoidSymbol ] };
 
-    key <I219> { [  less,  greater, bar, brokenbar ] };
 };


Index: xkeyboard-config.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xkeyboard-config/OLPC-3/xkeyboard-config.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- xkeyboard-config.spec	28 May 2008 17:25:53 -0000	1.19
+++ xkeyboard-config.spec	26 Jul 2008 15:05:13 -0000	1.20
@@ -4,7 +4,7 @@
 Summary: xkeyboard-config alternative xkb data files
 Name: xkeyboard-config
 Version: 1.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.x.org
@@ -13,6 +13,10 @@
 Source0: http://xlibs.freedesktop.org/xkbdesc/%{name}-%{version}.tar.bz2
 Patch1: olpc-xkeyboard-config-kz-group.patch
 Patch2: usinet.patch
+Patch3: xkeyboard-config-olpc-tr.patch
+Patch4: xkeyboard-config-olpc-ca-fr-typofix.patch
+Patch5: xkeyboard-config-olpc-et.patch
+Patch6: xkeyboard-config-olpc-af.patch
 
 BuildArch: noarch
 
@@ -43,6 +47,10 @@
 %setup -q
 %patch1 -p1 -b .kzgroup
 %patch2 -p1 -b .usinet
+%patch3 -p0 -b .tr
+%patch4 -p0 -b .ca
+%patch5 -p1 -b .et
+%patch6 -p1 -b .af
 
 %build
 %configure \
@@ -82,6 +90,13 @@
 %{_datadir}/X11/xkb/rules/xorg.xml
 
 %changelog
+* Sat Jul 26 2008 Sayamindu Dasgupta  <sayamindu at laptop.org> - 1.3-2
+- Add xkeyboard-config-olpc-tr.patch from OLPC-2 branch
+- Add xkeyboard-config-olpc-ca-fr-typofix.patch from OLPC-2 branch
+- xkeyboard-config-olpc-et.patch: Fixes for the Amharic keyboard
+- xkeyboard-config-olpc-af.patch: Fixes for the Dari and Uzbek keyboard
+  (matches the OLPC mfg-data now)
+
 * Wed May 28 2008 Matthias Clasen  <mclasen at redhat.com> - 1.3-1
 - Update to 1.3