rpms/xkeyboard-config/OLPC-2 xkeyboard-config-olpc-ca-fr-typofix.patch, 1.2, 1.3 xkeyboard-config.spec, 1.26, 1.27

[Sayamindu Dasgupta (sayamind)]

Author: sayamind

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

Modified Files:
	xkeyboard-config-olpc-ca-fr-typofix.patch 
	xkeyboard-config.spec 
Log Message:
Fix a few issues with the Canadian French layout for the OLPC XO-1 keyboard

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

Index: xkeyboard-config-olpc-ca-fr-typofix.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xkeyboard-config/OLPC-2/xkeyboard-config-olpc-ca-fr-typofix.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xkeyboard-config-olpc-ca-fr-typofix.patch	15 May 2008 19:08:31 -0000	1.2
+++ xkeyboard-config-olpc-ca-fr-typofix.patch	27 May 2008 08:15:11 -0000	1.3
@@ -2,15 +2,24 @@
 ===================================================================
 RCS file: /cvs/xkeyboard-config/xkeyboard-config/symbols/ca,v
 retrieving revision 1.18
-diff -u -p -r1.18 ca
+diff -u -r1.18 ca
 --- symbols/ca	29 Apr 2008 20:38:44 -0000	1.18
-+++ symbols/ca	14 May 2008 17:40:34 -0000
-@@ -476,7 +476,7 @@ xkb_symbols "shs" {
++++ 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 <AE03>	{ [          3,    slash,          ograve,        Ograve ] };
++    
++    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 ] };
  };


Index: xkeyboard-config.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xkeyboard-config/OLPC-2/xkeyboard-config.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- xkeyboard-config.spec	26 May 2008 21:15:12 -0000	1.26
+++ xkeyboard-config.spec	27 May 2008 08:15:11 -0000	1.27
@@ -5,7 +5,7 @@
 Summary: xkeyboard-config alternative xkb data files
 Name: xkeyboard-config
 Version: 1.1
-Release: 18.%{cvsdate}%{?dist}
+Release: 19.%{cvsdate}%{?dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.x.org
@@ -114,6 +114,9 @@
 %{_datadir}/X11/xkb/rules/xorg.xml
 
 %changelog
+* Tue May 27 2008 Sayamindu Dasgupta <sayamindu at gmail.com> 1.1-19.20071130cvs
+-  xkeyboard-config-olpc-ca-fr-typofix.patch: Updated to fix a new set of issues
+
 * Tue May 27 2008 Sayamindu Dasgupta <sayamindu at gmail.com> 1.1-18.20071130cvs
 - Add xkeyboard-config-olpc-tr.patch for Turkish keyboard layout