rpms/xkeyboard-config/OLPC-2 xkeyboard-config-olpc-ca-fr.patch, 1.1, 1.2 xkeyboard-config.spec, 1.21, 1.22

[Bernardo Innocenti (bernie)]

Author: bernie

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

Modified Files:
	xkeyboard-config-olpc-ca-fr.patch xkeyboard-config.spec 
Log Message:
* Tue Mar 04 2008 Bernardo Innocenti <bernie at codewiz.org> 1.1-11.20071130cvs
- Rebase xkeyboard-config-olpc-ca-fr.patch


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

Index: xkeyboard-config-olpc-ca-fr.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xkeyboard-config/OLPC-2/xkeyboard-config-olpc-ca-fr.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xkeyboard-config-olpc-ca-fr.patch	4 Mar 2008 19:36:29 -0000	1.1
+++ xkeyboard-config-olpc-ca-fr.patch	4 Mar 2008 23:36:30 -0000	1.2
@@ -9,7 +9,7 @@
  ! $pcgeometries = abnt2 latitude jp106 kr106
  
  // Layouts that provide further specializations for the OLPC
--! $olpclayouts = af am ara br es et fr it kh kz in mn np ru th tr us 
+-! $olpclayouts = af am ara br es et it kh kz in mn np ru th tr us 
 +! $olpclayouts = af am ara br ca es et it kh kz in mn np ru th tr us 
  
  ! $macbooks = macbook78 macbook79
@@ -33,21 +33,3 @@
 +
 +    key <AE03>	{ [          3,    slash,          ograve,        Ograve ] };
 +};
-Index: symbols/fr
-===================================================================
-RCS file: /cvs/xlibs/xkbdesc/xkeyboard-config/symbols/fr,v
-retrieving revision 1.18
-diff -u -p -u -p -r1.18 fr
---- symbols/fr	3 Mar 2008 20:36:02 -0000	1.18
-+++ symbols/fr	4 Mar 2008 19:32:38 -0000
-@@ -755,10 +755,3 @@ xkb_symbols "geo" {
- 
- };
- 
--// OLPC Section
--xkb_symbols "olpc" {
--
--    include "basic"
--
--    key <AE03>	{ [          3,    slash,          ograve,        Ograve ] };
--};


Index: xkeyboard-config.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xkeyboard-config/OLPC-2/xkeyboard-config.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- xkeyboard-config.spec	4 Mar 2008 19:36:29 -0000	1.21
+++ xkeyboard-config.spec	4 Mar 2008 23:36:30 -0000	1.22
@@ -5,7 +5,7 @@
 Summary: xkeyboard-config alternative xkb data files
 Name: xkeyboard-config
 Version: 1.1
-Release: 13.%{cvsdate}%{?dist}
+Release: 14.%{cvsdate}%{?dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.x.org
@@ -111,6 +111,9 @@
 
 %changelog
 * Tue Mar 04 2008 Bernardo Innocenti <bernie at codewiz.org> 1.1-11.20071130cvs
+- Rebase xkeyboard-config-olpc-ca-fr.patch
+
+* Tue Mar 04 2008 Bernardo Innocenti <bernie at codewiz.org> 1.1-11.20071130cvs
 - Replace bogus xkeyboard-config-olpc-fr.patch with
   xkeyboard-config-olpc-ca-fr.patch