rpms/xkeyboard-config/OLPC-2 xkeyboard-config-olpc-et_fix_compose.patch, NONE, 1.1 xkeyboard-config-olpc-group.patch, NONE, 1.1 xkeyboard-config.spec, 1.28, 1.29

[Sayamindu Dasgupta]

Author: sayamind

Update of /cvs/pkgs/rpms/xkeyboard-config/OLPC-2
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17438

Modified Files:
	xkeyboard-config.spec 
Added Files:
	xkeyboard-config-olpc-et_fix_compose.patch 
	xkeyboard-config-olpc-group.patch 
Log Message:
- xkeyboard-config-olpc-et_fix_compose.patch: Fixes for Amharic compose sequences
- xkeyboard-config-olpc-group.patch: Add a olpc section to symbols/group



xkeyboard-config-olpc-et_fix_compose.patch:

--- NEW FILE xkeyboard-config-olpc-et_fix_compose.patch ---
diff -Naur xkeyboard-config-1.1/symbols/et xkeyboard-config-1.1.new/symbols/et
--- xkeyboard-config-1.1/symbols/et	2008-08-31 01:56:41.000000000 +0530
+++ xkeyboard-config-1.1.new/symbols/et	2008-08-31 01:59:48.000000000 +0530
@@ -33,18 +33,18 @@
 
     key <AD01>	{ [        0x01001240,  0x01001250 ]	}; // q
     key <AD02>	{ [        0x010012C8,  VoidSymbol ]	}; // w
-    key <AD03>	{ [        e,           E          ]	}; // e
+    key <AD03>	{ [        0x0100FE69,  0x0100FE70 ]	}; // dead e
     key <AD04>	{ [        0x01001228,  VoidSymbol ]	}; // r
     key <AD05>	{ [        0x01001270,  0x01001320 ]	}; // t
     key <AD06>	{ [        0x010012E8,  VoidSymbol ]	}; // y
-    key <AD07>	{ [        u,           U          ]	}; // u
-    key <AD08>	{ [        i,           I          ]	}; // i
-    key <AD09>	{ [        o,           O          ]	}; // o
+    key <AD07>	{ [        0x0100FE75,  0x0100FE76 ]	}; // dead u
+    key <AD08>	{ [        0x0100FE71,  0x0100FE72 ]	}; // dead i
+    key <AD09>	{ [        0x0100FE73,  0x0100FE74 ]	}; // dead o
     key <AD10>	{ [        0x01001350,  0x01001330 ]	}; // p
     key <AD11>	{ [        0x01001340,  0x01001338 ]	}; // [
     key <AD12>	{ [        0x01001328,  0x01001280 ]	}; // ]
 
-    key <AC01>	{ [        a,           A          ]	}; // a
+    key <AC01>	{ [        0x0100FE67,  0x0100FE68 ]	}; // dead a
     key <AC02>	{ [        0x01001230,  0x01001220 ]	}; // s
     key <AC03>	{ [        0x010012F0,  0x010012F8 ]	}; // d
     key <AC04>	{ [        0x01001348,  VoidSymbol ]	}; // f
@@ -59,7 +59,7 @@
 
     key <AB01>	{ [        0x010012D8,  0x010012E0 ]	}; // z
     key <AB02>	{ [        0x010012A0,  0x010012D0 ]	}; // x
-    key <AB03>	{ [        0x01001278,  VoidSymbol ]	}; // c
+    key <AB03>  { [        0x01001278,  0x0100FE78 ]    }; // c
     key <AB04>	{ [        0x01001238,  0x01001268 ]	}; // v
     key <AB05>	{ [        0x01001260,  VoidSymbol ]	}; // b
     key <AB06>	{ [        0x01001290,  0x01001298 ]	}; // n
@@ -67,9 +67,9 @@
 
     key <AB08>	{ [        0x01001363,  VoidSymbol ]	}; // <
     key <AB09>	{ [        0x01001364,  VoidSymbol ]	}; // >
-    key <AB10>  { [        0x01001367,  VoidSymbol ]    }; // ?
+    key <AB10>  { [        0x01001367,  question   ]    }; // ?
 
-    key <BKSL> {  [        VoidSymbol,  0x01002010 ]    }; // bksl
+    key <BKSL> {  [        backslash,  0x01002010  ]    }; // bksl
 
     key <I219>  { [ ISO_Next_Group, ISO_Prev_Group ]    };
 };

xkeyboard-config-olpc-group.patch:

--- NEW FILE xkeyboard-config-olpc-group.patch ---
diff -Naur xkeyboard-config-1.1/symbols/group xkeyboard-config-1.1.net/symbols/group
--- xkeyboard-config-1.1/symbols/group	2007-10-07 09:14:42.000000000 +0530
+++ xkeyboard-config-1.1.net/symbols/group	2008-08-31 02:10:41.000000000 +0530
@@ -320,3 +320,7 @@
     };
 };
 
+partial hidden modifier_keys
+xkb_symbols "olpc" {
+  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.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- xkeyboard-config.spec	30 May 2008 16:13:44 -0000	1.28
+++ xkeyboard-config.spec	30 Aug 2008 20:46:47 -0000	1.29
@@ -5,7 +5,7 @@
 Summary: xkeyboard-config alternative xkb data files
 Name: xkeyboard-config
 Version: 1.1
-Release: 20.%{cvsdate}%{?dist}
+Release: 21.%{cvsdate}%{?dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.x.org
@@ -31,6 +31,8 @@
 Patch15: xkeyboard-config-olpc-ca-fr-typofix.patch
 Patch16: xkeyboard-config-olpc-tr.patch
 Patch17: xkeyboard-config-olpc-et.patch
+Patch18: xkeyboard-config-olpc-et_fix_compose.patch
+Patch19: xkeyboard-config-olpc-group.patch
 
 BuildArch: noarch
 
@@ -76,7 +78,9 @@
 %patch14 -p0 -b .it
 %patch15 -p0 -b .ca
 %patch16 -p0 -b .tr
-%patch17 -p0 -b .et
+%patch17 -p0 -b .et1
+%patch18 -p1 -b .et2
+%patch19 -p1 -b .group
 
 %build
 %configure \
@@ -116,6 +120,10 @@
 %{_datadir}/X11/xkb/rules/xorg.xml
 
 %changelog
+* Sun Aug 31 2008 Sayamindu Dasgupta <sayamindu at gmail.com> 1.1-21.20071130cvs
+- xkeyboard-config-olpc-et_fix_compose.patch: Fixes for Amharic compose sequences
+- xkeyboard-config-olpc-group.patch: Add a olpc section to symbols/group
+
 * Fri May 30 2008 Sayamindu Dasgupta <sayamindu at gmail.com> 1.1-20.20071130cvs
 - xkeyboard-config-olpc-et.patch: Fixes for the Amharic keyboard