rpms/xkeyboard-config/OLPC-2 xkeyboard-config-olpc-fr.patch, NONE, 1.1 xkeyboard-config-olpc-it.patch, NONE, 1.1 xkeyboard-config.spec, 1.19, 1.20

Bernardo Innocenti (bernie) fedora-extras-commits at redhat.com
Mon Mar 3 13:30:34 UTC 2008


Author: bernie

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

Modified Files:
	xkeyboard-config.spec 
Added Files:
	xkeyboard-config-olpc-fr.patch xkeyboard-config-olpc-it.patch 
Log Message:
* Mon Mar 03 2008 Bernardo Innocenti <bernie at codewiz.org> 1.1-11.20071130cvs
- Add xkeyboard-config-olpc-fr.patch
- Add xkeyboard-config-olpc-it.patch


xkeyboard-config-olpc-fr.patch:

--- NEW FILE xkeyboard-config-olpc-fr.patch ---
Index: symbols/fr
===================================================================
RCS file: /cvs/xlibs/xkbdesc/xkeyboard-config/symbols/fr,v
retrieving revision 1.17
diff -u -p -r1.17 fr
--- symbols/fr	2 Jan 2008 21:21:43 -0000	1.17
+++ symbols/fr	29 Feb 2008 13:45:41 -0000
@@ -755,3 +755,10 @@ xkb_symbols "geo" {
 
 };
 
+// OLPC Section
+xkb_symbols "olpc" {
+
+    include "basic"
+
+    key <AE03>	{ [          3,    slash,          ograve,        Ograve ] };
+};
Index: rules/base.lists.part
===================================================================
RCS file: /cvs/xlibs/xkbdesc/xkeyboard-config/rules/base.lists.part,v
retrieving revision 1.58
diff -u -p -r1.58 base.lists.part
--- rules/base.lists.part	4 Feb 2008 23:28:42 -0000	1.58
+++ rules/base.lists.part	3 Mar 2008 07:24:14 -0000
@@ -15,7 +15,7 @@
 ! $pcgeometries = abnt2 latitude jp106 kr106
 
 // Layouts that provide further specializations for the OLPC
-! $olpclayouts = af am ara br es et kh kz in mn np ru th tr us 
+! $olpclayouts = af am ara br es et fr kh kz in mn np ru th tr us 
 
 ! $macbooks = macbook78 macbook79
 ! $maclaptop = ibook powerbook macbook78 macbook79

xkeyboard-config-olpc-it.patch:

--- NEW FILE xkeyboard-config-olpc-it.patch ---
Index: rules/base.lists.part
===================================================================
RCS file: /cvs/xlibs/xkbdesc/xkeyboard-config/rules/base.lists.part,v
retrieving revision 1.59
diff -u -p -u -p -r1.59 base.lists.part
--- rules/base.lists.part	1 Mar 2008 21:01:56 -0000	1.59
+++ rules/base.lists.part	3 Mar 2008 13:19:36 -0000
@@ -15,7 +15,7 @@
 ! $pcgeometries = abnt2 latitude jp106 kr106
 
 // Layouts that provide further specializations for the OLPC
-! $olpclayouts = af am ara br es et fr kh kz in mn np ru th tr us 
+! $olpclayouts = af am ara br es et fr it kh kz in mn np ru th tr us 
 
 ! $macbooks = macbook78 macbook79
 ! $maclaptop = ibook powerbook macbook78 macbook79
Index: symbols/it
===================================================================
RCS file: /cvs/xlibs/xkbdesc/xkeyboard-config/symbols/it,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 it
--- symbols/it	4 Sep 2007 06:39:22 -0000	1.12
+++ symbols/it	3 Mar 2008 13:19:36 -0000
@@ -153,3 +153,13 @@ xkb_symbols "geo" {
 
 };
 
+// OLPC Section
+xkb_symbols "olpc" {
+
+    include "basic"
+
+    key <AE12> { [ igrave,  asciicircum,    asciitilde,     dead_tilde ] };
+    key <BKSL> { [ ugrave,      section,        Egrave,     dead_breve ] };
+    key <I219> { [ less,        greater, guillemotleft, guillemotright ] };
+};
+


Index: xkeyboard-config.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xkeyboard-config/OLPC-2/xkeyboard-config.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- xkeyboard-config.spec	7 Feb 2008 19:18:31 -0000	1.19
+++ xkeyboard-config.spec	3 Mar 2008 13:29:56 -0000	1.20
@@ -5,7 +5,7 @@
 Summary: xkeyboard-config alternative xkb data files
 Name: xkeyboard-config
 Version: 1.1
-Release: 11.%{cvsdate}%{?dist}
+Release: 12.%{cvsdate}%{?dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.x.org
@@ -26,6 +26,8 @@
 Patch10: xkeyboard-config-olpc-misc.patch
 Patch11: xkeyboard-config-olpc-af-AE09.patch
 Patch12: xkeyboard-config-olpc-kh-olpc-section-add.patch
+Patch13: xkeyboard-config-olpc-fr.patch
+Patch14: xkeyboard-config-olpc-it.patch
 
 BuildArch: noarch
 
@@ -67,6 +69,8 @@
 %patch10 -p0 -b .misc
 %patch11 -p0 -b .ae09
 %patch12 -p0 -b .kh
+%patch13 -p0 -b .fr
+%patch14 -p0 -b .it
 
 %build
 %configure \
@@ -106,6 +110,10 @@
 %{_datadir}/X11/xkb/rules/xorg.xml
 
 %changelog
+* Mon Mar 03 2008 Bernardo Innocenti <bernie at codewiz.org> 1.1-11.20071130cvs
+- Add xkeyboard-config-olpc-fr.patch
+- Add xkeyboard-config-olpc-it.patch
+
 * Thu Feb 07 2008 Dennis Gilmore <dennis at ausil.us> 1.1-11.20071130cvs
 - add patches from arjs for http://dev.laptop.org/ticket/6159
 




More information about the fedora-extras-commits mailing list