rpms/xkeyboard-config/OLPC-3 olpc-xkeyboard-config-es.patch, NONE, 1.1 xkeyboard-config-olpc-mn.patch, NONE, 1.1 xkeyboard-config-view_source.patch, NONE, 1.1 xkeyboard-config-olpc-et.patch, 1.1, 1.2 xkeyboard-config.spec, 1.21, 1.22
Daniel Drake
dsd at fedoraproject.org
Tue Jan 27 19:18:56 UTC 2009
- Previous message: rpms/xfce4-mixer/devel sources, 1.11, 1.12 .cvsignore, 1.11, 1.12 xfce4-mixer.spec, 1.22, 1.23
- Next message: rpms/pidgin-privacy-please/F-10 import.log, NONE, 1.1 pidgin-privacy-please.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: dsd
Update of /cvs/pkgs/rpms/xkeyboard-config/OLPC-3
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16846
Modified Files:
xkeyboard-config-olpc-et.patch xkeyboard-config.spec
Added Files:
olpc-xkeyboard-config-es.patch xkeyboard-config-olpc-mn.patch
xkeyboard-config-view_source.patch
Log Message:
OLPC fixes from sayamindu: view source, es, it, mn, et
olpc-xkeyboard-config-es.patch:
--- NEW FILE olpc-xkeyboard-config-es.patch ---
diff --git a/rules/base.ml_s.part b/rules/base.ml_s.part
index 877182b..f06eb37 100644
--- a/rules/base.ml_s.part
+++ b/rules/base.ml_s.part
@@ -19,6 +19,7 @@
macintosh_old * = macintosh_vndr/us(oldmac)+%l%(v)
$macs en_US = pc+macintosh_vndr/us(extended)
$macs $macvendorlayouts = pc+macintosh_vndr/%l%(v)
+ olpc es = olpc+es(%v)
olpc $olpclayouts = olpc+%l%(m)
olpc * = olpc+%l%(v)
thinkpad br = pc+br(thinkpad)
diff --git a/symbols/es b/symbols/es
index 3f73ac0..9f9b80a 100644
--- a/symbols/es
+++ b/symbols/es
@@ -193,3 +193,18 @@ xkb_symbols "olpc" {
include "level3(ralt_switch)"
};
+
+partial alphanumeric_keys
+xkb_symbols "olpc2" {
+
+ // Modified variant of US International layout, specifically for Peru
+ // Contact: Sayamindu Dasgupta <sayamindu at laptop.org>
+
+ include "us(olpc)"
+ name[Group1]="Spain (OLPC2)";
+
+ key <AE03> { [ 3, numbersign, dead_grave, dead_grave] }; // combining grave
+ key <I236> { [ XF86Start ] };
+
+ include "level3(ralt_switch)"
+};
xkeyboard-config-olpc-mn.patch:
--- NEW FILE xkeyboard-config-olpc-mn.patch ---
diff --git a/symbols/mn b/symbols/mn
index 08109b7..af6bc85 100644
--- a/symbols/mn
+++ b/symbols/mn
@@ -76,6 +76,8 @@ xkb_symbols "olpc" {
include "mn(basic)"
+ key <AE07> { [ 7, semicolon, ampersand ] };
+
key <BKSL> { [ backslash, bar, exclam ] };
include "group(olpc)"
xkeyboard-config-view_source.patch:
--- NEW FILE xkeyboard-config-view_source.patch ---
diff --git a/symbols/group b/symbols/group
index 53c046e..17dc457 100644
--- a/symbols/group
+++ b/symbols/group
@@ -331,5 +331,6 @@ xkb_symbols "alt_caps_toggle" {
partial hidden modifier_keys
xkb_symbols "olpc" {
key <I219> { [ ISO_Next_Group, ISO_Prev_Group ] };
+ key <I236> { [ XF86Start ] };
};
xkeyboard-config-olpc-et.patch:
Index: xkeyboard-config-olpc-et.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xkeyboard-config/OLPC-3/xkeyboard-config-olpc-et.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xkeyboard-config-olpc-et.patch 26 Jul 2008 15:05:13 -0000 1.1
+++ xkeyboard-config-olpc-et.patch 27 Jan 2009 19:18:55 -0000 1.2
@@ -1,8 +1,31 @@
-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" {
+diff -Naur xkeyboard-config-1.3/symbols/et xkeyboard-config-1.3.new/symbols/et
+--- xkeyboard-config-1.3/symbols/et 2008-01-25 04:51:06.000000000 +0530
++++ xkeyboard-config-1.3.new/symbols/et 2008-08-23 02:31:46.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
+@@ -55,11 +55,11 @@
key <AC09> { [ 0x01001208, VoidSymbol ] }; // l
key <AC10> { [ 0x01001362, 0x01001361 ] }; // :;
@@ -12,19 +35,19 @@
key <AB01> { [ 0x010012D8, 0x010012E0 ] }; // z
key <AB02> { [ 0x010012A0, 0x010012D0 ] }; // x
- key <AB03> { [ c, C ] }; // c
-+ 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 @@ xkb_symbols "olpc" {
+@@ -67,9 +67,9 @@
key <AB08> { [ 0x01001363, VoidSymbol ] }; // <
key <AB09> { [ 0x01001364, VoidSymbol ] }; // >
- key <AB10> { [ VoidSymbol, question ] }; // ?
-+ key <AB10> { [ 0x01001367, VoidSymbol ] }; // ?
++ key <AB10> { [ 0x01001367, question ] }; // ?
- key <BKSL> { [ backslash, VoidSymbol ] }; // bksl
-+ key <BKSL> { [ VoidSymbol, 0x01002010 ] }; // bksl
++ key <BKSL> { [ backslash, 0x01002010 ] }; // bksl
include "group(olpc)"
};
Index: xkeyboard-config.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xkeyboard-config/OLPC-3/xkeyboard-config.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- xkeyboard-config.spec 17 Nov 2008 07:23:17 -0000 1.21
+++ xkeyboard-config.spec 27 Jan 2009 19:18:55 -0000 1.22
@@ -4,7 +4,7 @@
Summary: xkeyboard-config alternative xkb data files
Name: xkeyboard-config
Version: 1.3
-Release: 3%{?dist}
+Release: 6%{?dist}
License: MIT
Group: User Interface/X
URL: http://www.x.org
@@ -17,7 +17,10 @@
Patch4: xkeyboard-config-olpc-ca-fr-typofix.patch
Patch5: xkeyboard-config-olpc-et.patch
Patch6: xkeyboard-config-olpc-af.patch
-Patch7: xkeyboard-config-olpc-it.patch
+Patch7: xkeyboard-config-view_source.patch
+Patch8: xkeyboard-config-olpc-mn.patch
+Patch9: xkeyboard-config-olpc-it.patch
+Patch10: olpc-xkeyboard-config-es.patch
BuildArch: noarch
@@ -52,7 +55,10 @@
%patch4 -p0 -b .ca
%patch5 -p1 -b .et
%patch6 -p1 -b .af
-%patch7 -p1 -b .it
+%patch7 -p1 -b .group
+%patch8 -p1 -b .mn
+%patch9 -p1 -b .it
+%patch10 -p1 -b .es
%build
%configure \
@@ -92,9 +98,22 @@
%{_datadir}/X11/xkb/rules/xorg.xml
%changelog
-* Sun Nov 17 2008 Bernie Innocenti <bernie at codewiz.org> 1.3-3
+* Tue Dec 23 2008 Sayamindu Dasgupta <sayamindu at laptop.org> 1.3-6
+- Fix the rules file for the previous patch
+
+* Tue Dec 23 2008 Sayamindu Dasgupta <sayamindu at laptop.org> 1.3-5
+- Add olpc-xkeyboard-config-es.patch (dlo #9126)
+
+* Sun Nov 17 2008 Bernie Innocenti <bernie at codewiz.org> 1.3-4
- Add olpc-xkeyboard-config-it.patch
+* Wed Sep 17 2008 Sayamindu Dasgupta <sayamindu at laptop.org> - 1.3-3
+- xkeyboard-config-olpc-mn.patch: Fix Mongolian keybard (dlo #8488)
+- xkeyboard-config-view_source.patch: Make view source work all layouts (dlo #5060)
+
+* Sat Aug 23 2008 Sayamindu Dasgupta <sayamindu at laptop.org> - 1.3-2
+- More fixes for the Amharic keyboard (see OLPC bug #7474 for a discussion)
+
* 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
- Previous message: rpms/xfce4-mixer/devel sources, 1.11, 1.12 .cvsignore, 1.11, 1.12 xfce4-mixer.spec, 1.22, 1.23
- Next message: rpms/pidgin-privacy-please/F-10 import.log, NONE, 1.1 pidgin-privacy-please.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list