rpms/xkeyboard-config/OLPC-2 xkeyboard-config-olpc-af-leftout.patch, NONE, 1.1 xkeyboard-config-olpc-af-updated-changes.patch, NONE, 1.1 xkeyboard-config-olpc-af.patch, NONE, 1.1 xkeyboard-config-olpc-mn.patch, NONE, 1.1 xkeyboard-config.spec, 1.16, 1.17

Bernardo Innocenti (bernie) fedora-extras-commits at redhat.com
Sun Feb 3 13:00:09 UTC 2008 

Author: bernie

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

Modified Files:
	xkeyboard-config.spec 
Added Files:
	xkeyboard-config-olpc-af-leftout.patch 
	xkeyboard-config-olpc-af-updated-changes.patch 
	xkeyboard-config-olpc-af.patch xkeyboard-config-olpc-mn.patch 
Log Message:
* Sat Feb 02 2008 Bernardo Innocenti <bernie at codewiz.org> 1.1-10.20071130cvs
- Add xkeyboard-config-olpc-mn.patch
- Add xkeyboard-config-olpc-af.patch
- Add xkeyboard-config-olpc-af-updated-changes.patch


xkeyboard-config-olpc-af-leftout.patch:

--- NEW FILE xkeyboard-config-olpc-af-leftout.patch ---
These changes were updated in one of the variations (olpc-da, olpc-uz, olpc-ps) but not in all other variants

Index: symbols/af
diff -r1.7 symbols/af
286c286
<    key <AE06> { [ 0x10006F6, multiply, circumflex ] }; // Arabic six
---
>    key <AE06> { [ 0x10006F6, multiply, asciicircum ] }; // Arabic six
296c296
<    key <AD03> { [ 0x100062B, 0x100064D, eurosign ] }; // Arabic theh, Arabic kasratan
---
>    key <AD03> { [ 0x100062B, 0x100064D, EuroSign ] }; // Arabic theh, Arabic kasratan
347c347
<    key <AE06> { [ 0x10006F6, multiply, circumflex ] }; // Arabic six
---
>    key <AE06> { [ 0x10006F6, multiply, asciicircum ] }; // Arabic six
357c357
<    key <AD03> { [ 0x100062B, 0x100064D, eurosign ] }; // Arabic theh, Arabic kasratan
---
>    key <AD03> { [ 0x100062B, 0x100064D, EuroSign ] }; // Arabic theh, Arabic kasratan

xkeyboard-config-olpc-af-updated-changes.patch:

--- NEW FILE xkeyboard-config-olpc-af-updated-changes.patch ---
--- symbols/af	2008/01/29 22:20:22	1.5
+++ symbols/af	2008/01/29 22:37:41	1.6
@@ -218,19 +218,19 @@
 
    key <TLDE> { [ 0x100200D, 0x1000654, grave ] }; // zero width joiner, Arabic hamza above
-   key <AE01> { [ 0x10006F1, exclam, tilde ] }; // Arabic one
+   key <AE01> { [ 0x10006F1, exclam, asciitilde ] }; // Arabic one
-   key <AE02> { [ 0x10006F2, 0x100066C. at ] }; // Arabic two, Arabic thousands separator
+   key <AE02> { [ 0x10006F2, 0x100066C, at ] }; // Arabic two, Arabic thousands separator
    key <AE03> { [ 0x10006F3, 0x100066B, numbersign ] }; // Arabic three, Arabic decimal separator
    key <AE04> { [ 0x10006F4, 0x100060B, dollar ] }; // Arabic four, Afghani sign
    key <AE05> { [ 0x10006F5, 0x100066A, percent ] }; // Arabic five, Arabic percent sign
-   key <AE06> { [ 0x10006F6, multiply, circumflex ] }; // Arabic six
-   key <AE07> { [ 0x10006F7, guillemontright, ampersand ] }; // Arabic seven
-   key <AE08> { [ 0x10006F8, guillemontleft, 0x100066D ] }; // Arabic eight, Arabic five-pointed star
-   key <AE09> { [ 0x10006F9, parenright, bullet ] }; // Arabic nine
+   key <AE06> { [ 0x10006F6, multiply, asciicircum ] }; // Arabic six
+   key <AE07> { [ 0x10006F7, guillemotright, ampersand ] }; // Arabic seven
+   key <AE08> { [ 0x10006F8, guillemotleft, 0x100066D ] }; // Arabic eight, Arabic five-pointed star
+   key <AE09> { [ 0x10006F9, parenright ] }; // Arabic nine
    key <AE10> { [ 0x10006F0, parenleft, degree ] }; // Arabic zero
    key <AE11> { [ minus, 0x1000640, underscore ] }; // Arabic_tatweel
-   key <AE12> { [ plus, equal, divide ] };
+   key <AE12> { [ plus, equal, slash ] };
 
-   key <AD01> { [ 0x1000636, 0x1000652, eurosign ] }; // Arabic dad, Arabic sukun
+   key <AD01> { [ 0x1000636, 0x1000652, EuroSign ] }; // Arabic dad, Arabic sukun
    key <AD02> { [ 0x1000635, 0x100064C, 0x1000671 ] }; // Arabic sad, Arabic dammatan, Arabic alef walsa
    key <AD03> { [ 0x100062B, 0x100064D, 0x1000649 ] }; // Arabic theh, Arabic kasratan, Arabic alef maksura initial form
    key <AD04> { [ 0x1000642, 0x100064B, 0x100200E ] }; // Arabic qaf, Arabic fathatan, left-to-right mark
@@ -277,15 +277,15 @@
 
    name[Group1]= "Afghanistan - Dari";
 
-   key <TLDE> { [ 0x100200D, divide, tilde ] }; // zero width joiner
+   key <TLDE> { [ 0x100200D, slash, asciitilde ] }; // zero width joiner
    key <AE01> { [ 0x10006F1, exclam, grave ] }; // Arabic one
-   key <AE02> { [ 0x10006F2, 0x100066C. at ] }; // Arabic two, Arabic thousands separator
+   key <AE02> { [ 0x10006F2, 0x100066C, at ] }; // Arabic two, Arabic thousands separator
    key <AE03> { [ 0x10006F3, 0x100066B, numbersign ] }; // Arabic three, Arabic decimal separator
    key <AE04> { [ 0x10006F4, 0x100060B, dollar ] }; // Arabic four, Afghani sign
    key <AE05> { [ 0x10006F5, 0x100066A, percent ] }; // Arabic five, Arabic percent sign
    key <AE06> { [ 0x10006F6, multiply, asciicircum ] }; // Arabic six
    key <AE07> { [ 0x10006F7, 0x100060C, ampersand ] }; // Arabic seven, Arabic comma
-   key <AE08> { [ 0x10006F8, asterisk, bullet ] }; // Arabic eight, 
+   key <AE08> { [ 0x10006F8, asterisk ] }; // Arabic eight, 
    key <AE09> { [ 0x10006F9, parenright, 0x100200E ] }; // Arabic nine, left-to-right mark
    key <AE10> { [ 0x10006F0, parenleft, 0x100200F ] }; // Arabic zero, right-to-left mark
    key <AE11> { [ minus, 0x1000640, underscore ] }; // Arabic_tatweel
@@ -311,8 +311,8 @@
    key <AC05> { [ 0x1000644, 0x1000623, 0x10006B7 ] }; // Arabic lam, Arabic hamza on alef, Arabic alef with hamza above
    key <AC06> { [ 0x1000627, 0x1000622, 0x1000671 ] }; // Arabic alef, Arabic madda on alef, Arabic alef wasla
    key <AC07> { [ 0x100062A, 0x1000629, 0x100067C ] }; // Arabic teh, Arabic teh marbuta, Arabic tteh
-   key <AC08> { [ 0x1000646, guillemontright, 0x10006BC ] }; // Arabic noon, Arabic noon with ring
-   key <AC09> { [ 0x1000645, guillemontleft, 0x10006BA ] }; // Arabic meem, Arabic noon ghunna
+   key <AC08> { [ 0x1000646, guillemotright, 0x10006BC ] }; // Arabic noon, Arabic noon with ring
+   key <AC09> { [ 0x1000645, guillemotleft, 0x10006BA ] }; // Arabic meem, Arabic noon ghunna
    key <AC10> { [ 0x10006A9, colon, semicolon ] }; // Arabic keheh, 
    key <AC11> { [ 0x10006AF, 0x100061B, 0x10006AB ] }; // Arabic gaf, Arabic semicolon, Arabic kaf with ring
 
@@ -338,15 +338,15 @@
 
    name[Group1]= "Afghanistan - Uzbek";
 
-   key <TLDE> { [ 0x100200D, divide, tilde ] }; // zero width joiner
+   key <TLDE> { [ 0x100200D, slash, asciitilde ] }; // zero width joiner
    key <AE01> { [ 0x10006F1, exclam, grave ] }; // Arabic one
-   key <AE02> { [ 0x10006F2, 0x100066C. at ] }; // Arabic two, Arabic thousands separator
+   key <AE02> { [ 0x10006F2, 0x100066C, at ] }; // Arabic two, Arabic thousands separator
    key <AE03> { [ 0x10006F3, 0x100066B, numbersign ] }; // Arabic three, Arabic decimal separator
    key <AE04> { [ 0x10006F4, 0x100060B, dollar ] }; // Arabic four, Afghani sign
    key <AE05> { [ 0x10006F5, 0x100066A, percent ] }; // Arabic five, Arabic percent sign
    key <AE06> { [ 0x10006F6, multiply, asciicircum ] }; // Arabic six
    key <AE07> { [ 0x10006F7, 0x100060C, ampersand ] }; // Arabic seven, Arabic comma
-   key <AE08> { [ 0x10006F8, asterisk, bullet ] }; // Arabic eight, 
+   key <AE08> { [ 0x10006F8, asterisk ] }; // Arabic eight, 
    key <AE09> { [ 0x10006F9, parenright, 0x100200E ] }; // Arabic nine, left-to-right mark
    key <AE10> { [ 0x10006F0, parenleft, 0x100200F ] }; // Arabic zero, right-to-left mark
    key <AE11> { [ minus, 0x1000640, underscore ] }; // Arabic_tatweel
@@ -372,8 +372,8 @@
    key <AC05> { [ 0x1000644, 0x1000623, 0x10006B7 ] }; // Arabic lam, Arabic hamza on alef, Arabic alef with hamza above
    key <AC06> { [ 0x1000627, 0x1000622, 0x1000671 ] }; // Arabic alef, Arabic madda on alef, Arabic alef wasla
    key <AC07> { [ 0x100062A, 0x1000629, 0x100067C ] }; // Arabic teh, Arabic teh marbuta, Arabic tteh
-   key <AC08> { [ 0x1000646, guillemontright, 0x10006BC ] }; // Arabic noon, Arabic noon with ring
-   key <AC09> { [ 0x1000645, guillemontleft, 0x10006BA ] }; // Arabic meem, Arabic noon ghunna
+   key <AC08> { [ 0x1000646, guillemotright, 0x10006BC ] }; // Arabic noon, Arabic noon with ring
+   key <AC09> { [ 0x1000645, guillemotleft, 0x10006BA ] }; // Arabic meem, Arabic noon ghunna
    key <AC10> { [ 0x10006A9, colon, semicolon ] }; // Arabic keheh, 
    key <AC11> { [ 0x10006AF, 0x100061B, 0x10006AB ] }; // Arabic gaf, Arabic semicolon, Arabic kaf with ring
 

xkeyboard-config-olpc-af.patch:

--- NEW FILE xkeyboard-config-olpc-af.patch ---
Following the standard language name convention olpc-da should correctly be olpc-fa. Also, adding af to olpclayouts.

Index: rules/base.lists.part
===================================================================
RCS file: /cvs/xkeyboard-config/xkeyboard-config/rules/base.lists.part,v
retrieving revision 1.56
diff -r1.56 base.lists.part
18c18
< ! $olpclayouts = am ara br es et kz in np ru th tr us
---
> ! $olpclayouts = af am ara br es et kz in mn np ru th tr us 
Index: rules/base.xml.in
===================================================================
RCS file: /cvs/xkeyboard-config/xkeyboard-config/rules/base.xml.in,v
retrieving revision 1.240
diff -r1.240 base.xml.in
1121c1121
<             <name>olpc-da</name>
---
>             <name>olpc-fa</name>
Index: symbols/af
===================================================================
RCS file: /cvs/xkeyboard-config/xkeyboard-config/symbols/af,v
retrieving revision 1.8
diff -r1.8 af
276c276
< xkb_symbols "olpc-da" {
---
> xkb_symbols "olpc-fa" {

xkeyboard-config-olpc-mn.patch:

--- NEW FILE xkeyboard-config-olpc-mn.patch ---
diff -u -r1.11 mn
--- symbols/mn	25 Jan 2007 21:08:26 -0000	1.11
+++ symbols/mn	24 Jan 2008 11:28:52 -0000
@@ -14,7 +14,7 @@
   key <AE01> { [ 1,                numerosign,        	multiply        ] };
   key <AE02> { [ 2,                minus,              	division        ] };
   key <AE03> { [ 3,                quotedbl,        	plusminus       ] };
-  key <AE04> { [ 4,                U20ae,  		notsign         ] };
+  key <AE04> { [ 4,                U20ae,  		notsign         ] }; // Tugrik sign
   key <AE05> { [ 5,                colon,		NoSymbol       	] };
   key <AE06> { [ 6,                period,              notequal        ] };
   key <AE07> { [ 7,                underscore,          ampersand    	] };
@@ -68,3 +68,15 @@
 
   include "level3(ralt_switch)"
 };
+
+partial alphanumeric_keys
+xkb_symbols "olpc" {
+
+// Contact: Walter Bender <walter at laptop.org>
+
+  include "mn(basic)"
+
+  key <BKSL> { [ backslash,         bar,     		exclam          ] };
+  key <I219> { [ ISO_Next_Group, ISO_Prev_Group	] }; // language key for OLPC
+};
+


Index: xkeyboard-config.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xkeyboard-config/OLPC-2/xkeyboard-config.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- xkeyboard-config.spec	24 Jan 2008 12:10:59 -0000	1.16
+++ xkeyboard-config.spec	3 Feb 2008 12:59:32 -0000	1.17
@@ -5,7 +5,7 @@
 Summary: xkeyboard-config alternative xkb data files
 Name: xkeyboard-config
 Version: 1.1
-Release: 9.%{cvsdate}%{?dist}
+Release: 10.%{cvsdate}%{?dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.x.org
@@ -19,6 +19,10 @@
 Patch3: olpc-xkeyboard-config-et-group-switch.patch
 Patch4: olpc-xkeyboard-config-in-space-fix.patch
 Patch5: olpc-xkeyboard-config-am.patch
+Patch6: xkeyboard-config-olpc-mn.patch
+Patch7: xkeyboard-config-olpc-af.patch
+Patch8: xkeyboard-config-olpc-af-leftout.patch 
+Patch9: xkeyboard-config-olpc-af-updated-changes.patch
 
 BuildArch: noarch
 
@@ -53,6 +57,10 @@
 %patch3 -p0 -b .et
 %patch4 -p0 -b .insf
 %patch5 -p0 -b .am
+%patch6 -p0 -b .mn
+%patch7 -p0 -b .af
+%patch8 -p0 -b .afl
+%patch9 -p0 -b .afuc
 
 %build
 %configure \
@@ -92,6 +100,11 @@
 %{_datadir}/X11/xkb/rules/xorg.xml
 
 %changelog
+* Sat Feb 02 2008 Bernardo Innocenti <bernie at codewiz.org> 1.1-10.20071130cvs
+- Add xkeyboard-config-olpc-mn.patch
+- Add xkeyboard-config-olpc-af.patch
+- Add xkeyboard-config-olpc-af-updated-changes.patch
+
 * 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

More information about the fedora-extras-commits mailing list