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

Bernardo Innocenti (bernie) fedora-extras-commits at redhat.com
Wed Mar 5 00:03:22 UTC 2008


Author: bernie

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

Modified Files:
	xkeyboard-config-olpc-ca-fr.patch 
	xkeyboard-config-olpc-it.patch xkeyboard-config.spec 
Log Message:
* Tue Mar 04 2008 Bernardo Innocenti <bernie at codewiz.org> 1.1-11.20071130cvs
- Grr... really make these last damn patches apply in the right order


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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xkeyboard-config-olpc-ca-fr.patch	4 Mar 2008 23:36:30 -0000	1.2
+++ xkeyboard-config-olpc-ca-fr.patch	5 Mar 2008 00:03:13 -0000	1.3
@@ -9,8 +9,8 @@
  ! $pcgeometries = abnt2 latitude jp106 kr106
  
  // Layouts that provide further specializations for the OLPC
--! $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 
+-! $olpclayouts = af am ara br es et kh kz in mn np ru th tr us 
++! $olpclayouts = af am ara br ca es et kh kz in mn np ru th tr us 
  
  ! $macbooks = macbook78 macbook79
  ! $maclaptop = ibook powerbook macbook78 macbook79
@@ -22,9 +22,9 @@
 --- symbols/ca	30 Jan 2008 21:28:12 -0000	1.16
 +++ symbols/ca	4 Mar 2008 19:32:38 -0000
 @@ -478,3 +478,11 @@ xkb_symbols "shs" {
- 
-     include "level3(ralt_switch)"
+     include "level5(rctrl_switch)"
  };
+ 
 +
 +// OLPC Section
 +xkb_symbols "olpc" {

xkeyboard-config-olpc-it.patch:

Index: xkeyboard-config-olpc-it.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xkeyboard-config/OLPC-2/xkeyboard-config-olpc-it.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xkeyboard-config-olpc-it.patch	3 Mar 2008 13:29:56 -0000	1.1
+++ xkeyboard-config-olpc-it.patch	5 Mar 2008 00:03:13 -0000	1.2
@@ -9,8 +9,8 @@
  ! $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 
+-! $olpclayouts = af am ara br ca es et 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
  ! $maclaptop = ibook powerbook macbook78 macbook79


Index: xkeyboard-config.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xkeyboard-config/OLPC-2/xkeyboard-config.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- xkeyboard-config.spec	4 Mar 2008 23:36:30 -0000	1.22
+++ xkeyboard-config.spec	5 Mar 2008 00:03:13 -0000	1.23
@@ -5,7 +5,7 @@
 Summary: xkeyboard-config alternative xkb data files
 Name: xkeyboard-config
 Version: 1.1
-Release: 14.%{cvsdate}%{?dist}
+Release: 15.%{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
+- Grr... really make these last damn patches apply in the right order
+
+* 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




More information about the fedora-extras-commits mailing list