rpms/xkeyboard-config/OLPC-2 olpc-xkeyboard-config-us-accents.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 xkeyboard-config.spec, 1.12, 1.13 olpc-xkeyboard-config-af.patch, 1.1, NONE olpc-xkeyboard-config-kz-group.patch, 1.1, NONE olpc-xkeyboard-config-ng-group.patch, 1.1, NONE olpc-xkeyboard-config-ng-h.patch, 1.1, NONE

[Bernardo Innocenti (bernie)]

Author: bernie

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

Modified Files:
	.cvsignore sources xkeyboard-config.spec 
Added Files:
	olpc-xkeyboard-config-us-accents.patch 
Removed Files:
	olpc-xkeyboard-config-af.patch 
	olpc-xkeyboard-config-kz-group.patch 
	olpc-xkeyboard-config-ng-group.patch 
	olpc-xkeyboard-config-ng-h.patch 
Log Message:
Commit the rest of the package files to match 1.1-6.20071130cvs.

olpc-xkeyboard-config-us-accents.patch:

--- NEW FILE olpc-xkeyboard-config-us-accents.patch ---
diff -u -p -r1.40 us
--- symbols/us	28 Oct 2007 08:10:48 -0000	1.40
+++ symbols/us	30 Nov 2007 19:35:42 -0000
@@ -835,7 +835,7 @@ xkb_symbols "olpc" {
    key <AE05> { [         5,    percent,     0x1000306,  0x1000306 ] }; // combining breve above
    key <AE06> { [         6,asciicircum,     0x100030A,  0x100030A ] }; // combining ring above
    key <AE07> { [         7,  ampersand,     0x1000302,  0x1000302 ] }; // combining circumflex above
-   key <AE08> { [         8,   asterisk,     0x1000324,  0x1000324 ] }; // combining caron above
+   key <AE08> { [         8,   asterisk,     0x100030C,  0x100030C ] }; // combining caron above
    key <AE09> { [         9,  parenleft,     0x1000307,  0x1000307 ] }; // combining dot above
    key <AE10> { [         0, parenright,     0x1000308,  0x1000308 ] }; // combining diaeresis above
    key <AE11> { [     minus, underscore,     0x1000304,  0x1000304 ] }; // combining macron above
@@ -850,12 +850,12 @@ xkb_symbols "olpc" {
    key <AD07> { [         u,          U,    0x100032D,   0x100032D ] }; // combining circumflex below
    key <AD08> { [         i,          I,    0x100032C,   0x100032C ] }; // combining caron below
    key <AD09> { [         o,          O,    0x1000323,   0x1000323 ] }; // combining dot below
-   key <AD10> { [         p,          P,    0x1000304,   0x1000304 ] }; // combining diaeresis below
+   key <AD10> { [         p,          P,    0x1000324,   0x1000324 ] }; // combining diaeresis below
    key <AD11> { [ bracketleft,  braceleft,  0x1000331,   0x1000331 ] }; // combining macron below
    key <AD12> { [bracketright, braceright,  0x1000330,   0x1000330 ] }; // combining tilde below
 
    key <AC01>  { [         a,          A,          ae,               AE ] };
-   key <AC02>  { [         s,          S,      ssharp,           ssharp ] };
+   key <AC02>  { [         s,          S,      ssharp,        0x1001E9C ] }; // uppercase S sharp
    key <AC03>  { [         d,          D,         eth,              ETH ] };
    key <AC04>  { [         f,          F,       thorn,            THORN ] };
    key <AC06>  { [         h,          H,    sterling,         sterling ] };


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xkeyboard-config/OLPC-2/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	20 Nov 2007 07:11:26 -0000	1.3
+++ .cvsignore	1 Dec 2007 04:04:45 -0000	1.4
@@ -1 +1 @@
-xkeyboard-config-1.1-20071120cvs.tar.bz2
+xkeyboard-config-1.1-20071130cvs.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xkeyboard-config/OLPC-2/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	20 Nov 2007 07:11:26 -0000	1.3
+++ sources	1 Dec 2007 04:04:45 -0000	1.4
@@ -1 +1 @@
-cdcefc9bb3ab6031f78f528516d3c5bd  xkeyboard-config-1.1-20071120cvs.tar.bz2
+bc75f196726da349c1c900e8f9becf20  xkeyboard-config-1.1-20071130cvs.tar.bz2


Index: xkeyboard-config.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xkeyboard-config/OLPC-2/xkeyboard-config.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xkeyboard-config.spec	30 Nov 2007 20:39:38 -0000	1.12
+++ xkeyboard-config.spec	1 Dec 2007 04:04:45 -0000	1.13
@@ -82,7 +82,7 @@
 %{_datadir}/X11/xkb/rules/xorg.xml
 
 %changelog
-* Fri Nov 30 2007 Bernardo Innocenti <bernie at codewiz.org> 1.1-5.20071130cvs
+* Fri Nov 30 2007 Bernardo Innocenti <bernie at codewiz.org> 1.1-6.20071130cvs
 - Add olpc-xkeyboard-config-us-accents.patch
 - Upgrade xkeyboard-config snapshot to cvs20071130
 - Drop upstreamed patch olpc-xkeyboard-config-af.patch


--- olpc-xkeyboard-config-af.patch DELETED ---


--- olpc-xkeyboard-config-kz-group.patch DELETED ---


--- olpc-xkeyboard-config-ng-group.patch DELETED ---


--- olpc-xkeyboard-config-ng-h.patch DELETED ---