diff --git a/.cvsignore b/.cvsignore index 0e35297..47e05f4 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xkeyboard-config-1.1.tar.bz2 +xkeyboard-config-1.1-20071120cvs.tar.bz2 diff --git a/olpc-xkeyboard-config-af.patch b/olpc-xkeyboard-config-af.patch new file mode 100644 index 0000000..a272673 --- /dev/null +++ b/olpc-xkeyboard-config-af.patch @@ -0,0 +1,228 @@ +Index: symbols/af +=================================================================== +RCS file: /cvs/xlibs/xkbdesc/xkeyboard-config/symbols/af,v +retrieving revision 1.2 +diff -u -p -r1.2 af +--- symbols/af 11 Oct 2006 19:32:35 -0000 1.2 ++++ symbols/af 20 Nov 2007 04:49:21 -0000 +@@ -211,3 +211,188 @@ xkb_symbols "uz" { + include "level3(ralt_switch)" + }; + ++partial alphanumeric_keys ++xkb_symbols "olpc-ps" { ++ ++ name[Group1]= "Afghanistan - Pashto"; ++ ++ key { [ 0x100200D, 0x1000654, grave ] }; // zero width joiner, Arabic hamza above ++ key { [ 0x10006F1, exclam, tilde ] }; // Arabic one ++ key { [ 0x10006F2, 0x100066C. at ] }; // Arabic two, Arabic thousands separator ++ key { [ 0x10006F3, 0x100066B, numbersign ] }; // Arabic three, Arabic decimal separator ++ key { [ 0x10006F4, 0x100060B, dollar ] }; // Arabic four, Afghani sign ++ key { [ 0x10006F5, 0x100066A, percent ] }; // Arabic five, Arabic percent sign ++ key { [ 0x10006F6, multiply, circumflex ] }; // Arabic six ++ key { [ 0x10006F7, guillemontright, ampersand ] }; // Arabic seven ++ key { [ 0x10006F8, guillemontleft, 0x100066D ] }; // Arabic eight, Arabic five-pointed star ++ key { [ 0x10006F9, parenright, bullet ] }; // Arabic nine ++ key { [ 0x10006F0, parenleft, degree ] }; // Arabic zero ++ key { [ minus, 0x1000640, underscore ] }; // Arabic_tatweel ++ key { [ plus, equal, divide ] }; ++ ++ key { [ 0x1000636, 0x1000652, eurosign ] }; // Arabic dad, Arabic sukun ++ key { [ 0x1000635, 0x100064C, 0x1000671 ] }; // Arabic sad, Arabic dammatan, Arabic alef walsa ++ key { [ 0x100062B, 0x100064D, 0x1000649 ] }; // Arabic theh, Arabic kasratan, Arabic alef maksura initial form ++ key { [ 0x1000642, 0x100064B, 0x100200E ] }; // Arabic qaf, Arabic fathatan, left-to-right mark ++ key { [ 0x1000641, 0x100064F, 0x100200F ] }; // Arabic feh, Arabic damma, right-to-left mark ++ key { [ 0x100063A, 0x1000650, 0x100e653 ] }; // Arabic ghain, Arabic kasra, Arabic alef with madda above ++ key { [ 0x1000639, 0x100064E, 0x100e659 ] }; // Arabic ain, Arabic fatha, Arabic zwarakay ++ key { [ 0x1000647, 0x1000651, 0x1000670 ] }; // Arabic heh, Arabic shadda, Arabic superscript alef ++ key { [ 0x100062E, 0x1000681, apostrophe ] }; // Arabic khah, Arabic hah with hamza above, ++ key { [ 0x100062D, 0x1000685, quotedbl ] }; // Arabic hah, Arabic hah with three dots above ++ key { [ 0x100062C, bracketright, braceleft ] }; // Arabic jeem ++ key { [ 0x1000686, bracketleft, braceright ] }; // Arabic tcheh ++ ++ key { [ 0x1000634, 0x100069A ] }; // Arabic sheen, Arabic seen with dot below and dot above ++ key { [ 0x1000633, 0x10006CD ] }; // Arabic seen, Arabic yeh with tail ++ key { [ 0x10006CC, 0x100064A, 0x10006D2 ] }; // Farsi yeh, Arabic yeh, Arabic yeh barree ++ key { [ 0x1000628, 0x100067E, 0x10006BA ] }; // Arabic beh, Arabic peh, Arabic noon ghunna ++ key { [ 0x1000644, 0x1000623, 0x10006B7 ] }; // Arabic lam, Arabic hamza on alef, Arabic alef with hamza above ++ key { [ 0x1000627, 0x1000622, 0x1000625 ] }; // Arabic alef, Arabic madda on alef, Arabic alef with hamza below ++ key { [ 0x100062A, 0x100067C, 0x1000679 ] }; // Arabic teh, Arabic teh with ring, Arabic tteh ++ key { [ 0x1000646, 0x10006BC, greater ] }; // Arabic noon, Arabic noon with ring ++ key { [ 0x1000645, 0x1000629, less ] }; // Arabic meem, Arabic teh marbuta ++ key { [ 0x10006A9, colon, 0x1000643 ] }; // Arabic keheh, Arabic kaf ++ key { [ 0x10006AB, 0x100061B, 0x10006AF ] }; // Arabic kaf with ring, Arabic semicolon, Arabic gaf ++ ++ key { [ backslash, asterisk, bar ] }; ++ key { [ space, 0x100200C, 0x10000A0 ] }; // zero width non-joiner, no break space ++ ++ key { [ 0x1000638, 0x1000626, question] }; // Arabic zah, Arabic yeh with hamza above ++ key { [ 0x10006D0, 0x1000637, semicolon ] }; // Arabic tah, Arabic E ++ key { [ 0x1000632, 0x1000698 ] }; // Arabic zain, Arabic jeh ++ key { [ 0x1000631, 0x1000621 ] }; // Arabic_ra (reh?), Arabic hamza ++ key { [ 0x1000630, 0x100200C ] }; // Arabic_thal, zero width non-joiner ++ key { [ 0x100062F, 0x1000689, 0x1000688 ] }; // Arabic_dal, Arabic dal with ring, Arabic ddal ++ key { [ 0x1000693, 0x1000624, 0x1000691 ] }; // Arabic reh with ring, Arabic waw with hamza above, Arabic rreh ++ key { [ 0x1000648, period, comma ] }; // Arabic_waw, Arabic comma ++ key { [ 0x1000696, 0x100002E, 0x10006C7 ] }; // Arabic reh with dot below and dot above, full stop, Arabic letter U ++ key { [ slash, 0x100061F, 0x10006C9 ] }; // Arabic question mark, Arabic kirghiz yu ++ ++ //language key ++ key { [ISO_Next_Group , ISO_Prev_Group ] }; ++}; ++ ++partial alphanumeric_keys ++xkb_symbols "olpc-da" { ++ ++ name[Group1]= "Afghanistan - Dari"; ++ ++ key { [ 0x100200D, divide, tilde ] }; // zero width joiner ++ key { [ 0x10006F1, exclam, grave ] }; // Arabic one ++ key { [ 0x10006F2, 0x100066C. at ] }; // Arabic two, Arabic thousands separator ++ key { [ 0x10006F3, 0x100066B, numbersign ] }; // Arabic three, Arabic decimal separator ++ key { [ 0x10006F4, 0x100060B, dollar ] }; // Arabic four, Afghani sign ++ key { [ 0x10006F5, 0x100066A, percent ] }; // Arabic five, Arabic percent sign ++ key { [ 0x10006F6, multiply, circumflex ] }; // Arabic six ++ key { [ 0x10006F7, 0x100060C, ampersand ] }; // Arabic seven, Arabic comma ++ key { [ 0x10006F8, asterisk, bullet ] }; // Arabic eight, ++ key { [ 0x10006F9, parenright, 0x100200E ] }; // Arabic nine, left-to-right mark ++ key { [ 0x10006F0, parenleft, 0x100200F ] }; // Arabic zero, right-to-left mark ++ key { [ minus, 0x1000640, underscore ] }; // Arabic_tatweel ++ key { [ plus, equal ] }; ++ ++ key { [ 0x1000636, 0x1000652, degree ] }; // Arabic dad, Arabic sukun ++ key { [ 0x1000635, 0x100064C ] }; // Arabic sad, Arabic dammatan ++ key { [ 0x100062B, 0x100064D, eurosign ] }; // Arabic theh, Arabic kasratan ++ key { [ 0x1000642, 0x100064B, 0x100FD3E ] }; // Arabic qaf, Arabic fathatan, ornate left paren ++ key { [ 0x1000641, 0x100064F, 0x100FD3F ] }; // Arabic feh, Arabic damma, ornate right paren ++ key { [ 0x100063A, 0x1000650, 0x1000656 ] }; // Arabic ghain, Arabic kasra, Arabic subscript alef ++ key { [ 0x1000639, 0x100064E, 0x100e659 ] }; // Arabic ain, Arabic fatha, Arabic zwarakay ++ key { [ 0x1000647, 0x1000651, 0x1000655 ] }; // Arabic heh, Arabic shadda, Arabic hamza below ++ key { [ 0x100062E, bracketright, apostrophe ] }; // Arabic khah ++ key { [ 0x100062D, bracketleft, quotedbl ] }; // Arabic hah ++ key { [ 0x100062C, braceright, 0x1000681 ] }; // Arabic jeem, Arabic hah with hamza above ++ key { [ 0x1000686, braceleft, 0x1000685 ] }; // Arabic tcheh, Arabic hah with three dots above ++ ++ key { [ 0x1000634, 0x1000624, 0x100069A ] }; // Arabic sheen, Arabic waw with hamza above, Arabic seen with dot below and dot above ++ key { [ 0x1000633, 0x1000626, 0x10006CD ] }; // Arabic seen, Arabic yeh with hamza above, Arabic yeh with tail ++ key { [ 0x10006CC, 0x100064A, 0x1000649 ] }; // Farsi yeh, Arabic yeh, Arabic alef maksura ++ key { [ 0x1000628, 0x1000625, 0x10006D0 ] }; // Arabic beh, Arabic alef with hamza below, Arabic e ++ key { [ 0x1000644, 0x1000623, 0x10006B7 ] }; // Arabic lam, Arabic hamza on alef, Arabic alef with hamza above ++ key { [ 0x1000627, 0x1000622, 0x1000671 ] }; // Arabic alef, Arabic madda on alef, Arabic alef wasla ++ key { [ 0x100062A, 0x1000629, 0x100067C ] }; // Arabic teh, Arabic teh marbuta, Arabic tteh ++ key { [ 0x1000646, guillemontright, 0x10006BC ] }; // Arabic noon, Arabic noon with ring ++ key { [ 0x1000645, guillemontleft, 0x10006BA ] }; // Arabic meem, Arabic noon ghunna ++ key { [ 0x10006A9, colon, semicolon ] }; // Arabic keheh, ++ key { [ 0x10006AF, 0x100061B, 0x10006AB ] }; // Arabic gaf, Arabic semicolon, Arabic kaf with ring ++ ++ key { [ backslash, bar, question ] }; ++ key { [ space, 0x100200C, 0x10000A0 ] }; // zero width non-joiner, no break space ++ ++ key { [ 0x1000638, 0x1000643, 0x10006D2 ] }; // Arabic zah, Arabic kaf, Arabic yeh barree ++ key { [ 0x1000637, 0x1000653, 0x1000691 ] }; // Arabic tah, Arabic maddah above, Arabic rreh ++ key { [ 0x1000632, 0x1000698, 0x1000696 ] }; // Arabic zain, Arabic jeh, Arabic reh with dot below and dot above ++ key { [ 0x1000631, 0x1000670, 0x1000693 ] }; // Arabic_ra (reh?), Arabic superscript alef, Arabic reh with ring ++ key { [ 0x1000630, 0x100200C, 0x1000688 ] }; // Arabic_thal, zero width non-joiner, Arabic ddal ++ key { [ 0x100062F, 0x1000654, 0x1000689 ] }; // Arabic dal, Arabic hamza above, Arabic dal with ring ++ key { [ 0x100067E, 0x1000621, 0x1000679 ] }; // Arabic peh, Arabic hamza, Arabic tteh ++ key { [ 0x1000648, greater, comma ] }; // Arabic_waw ++ key { [ period, less, 0x10006C7 ] }; // Arabic u ++ key { [ slash, 0x100061F, 0x10006C9 ] }; // Arabic question mark, Arabic kirghiz yu ++ ++ //language key ++ key { [ ISO_Next_Group, ISO_Prev_Group ] }; ++}; ++ ++partial alphanumeric_keys ++xkb_symbols "olpc-uz" { ++ ++ name[Group1]= "Afghanistan - Uzbek"; ++ ++ key { [ 0x100200D, divide, tilde ] }; // zero width joiner ++ key { [ 0x10006F1, exclam, grave ] }; // Arabic one ++ key { [ 0x10006F2, 0x100066C. at ] }; // Arabic two, Arabic thousands separator ++ key { [ 0x10006F3, 0x100066B, numbersign ] }; // Arabic three, Arabic decimal separator ++ key { [ 0x10006F4, 0x100060B, dollar ] }; // Arabic four, Afghani sign ++ key { [ 0x10006F5, 0x100066A, percent ] }; // Arabic five, Arabic percent sign ++ key { [ 0x10006F6, multiply, circumflex ] }; // Arabic six ++ key { [ 0x10006F7, 0x100060C, ampersand ] }; // Arabic seven, Arabic comma ++ key { [ 0x10006F8, asterisk, bullet ] }; // Arabic eight, ++ key { [ 0x10006F9, parenright, 0x100200E ] }; // Arabic nine, left-to-right mark ++ key { [ 0x10006F0, parenleft, 0x100200F ] }; // Arabic zero, right-to-left mark ++ key { [ minus, 0x1000640, underscore ] }; // Arabic_tatweel ++ key { [ plus, equal ] }; ++ ++ key { [ 0x1000636, 0x1000652, degree ] }; // Arabic dad, Arabic sukun ++ key { [ 0x1000635, 0x100064C, 0x1000653 ] }; // Arabic sad, Arabic dammatan, Arabic maddah above ++ key { [ 0x100062B, 0x100064D, eurosign ] }; // Arabic theh, Arabic kasratan ++ key { [ 0x1000642, 0x100064B, 0x100FD3E ] }; // Arabic qaf, Arabic fathatan, ornate left paren ++ key { [ 0x1000641, 0x100064F, 0x100FD3F ] }; // Arabic feh, Arabic damma, ornate right paren ++ key { [ 0x100063A, 0x1000650, 0x1000656 ] }; // Arabic ghain, Arabic kasra, Arabic subscript alef ++ key { [ 0x1000639, 0x100064E, 0x100e659 ] }; // Arabic ain, Arabic fatha, Arabic zwarakay ++ key { [ 0x1000647, 0x1000651, 0x1000670 ] }; // Arabic heh, Arabic shadda, Arabic superscript alef ++ key { [ 0x100062E, bracketright, apostrophe ] }; // Arabic khah ++ key { [ 0x100062D, bracketleft, quotedbl ] }; // Arabic hah ++ key { [ 0x100062C, braceright, 0x1000681 ] }; // Arabic jeem, Arabic hah with hamza above ++ key { [ 0x1000686, braceleft, 0x1000685 ] }; // Arabic tcheh, Arabic hah with three dots above ++ ++ key { [ 0x1000634, 0x1000624, 0x100069A ] }; // Arabic sheen, Arabic waw with hamza above, Arabic seen with dot below and dot above ++ key { [ 0x1000633, 0x1000626, 0x10006CD ] }; // Arabic seen, Arabic yeh with hamza above, Arabic yeh with tail ++ key { [ 0x10006CC, 0x100064A, 0x1000649 ] }; // Farsi yeh, Arabic yeh, Arabic alef maksura ++ key { [ 0x1000628, 0x10006D0, 0x1000643 ] }; // Arabic beh, Arabic e, Arabic kaf ++ key { [ 0x1000644, 0x1000623, 0x10006B7 ] }; // Arabic lam, Arabic hamza on alef, Arabic alef with hamza above ++ key { [ 0x1000627, 0x1000622, 0x1000671 ] }; // Arabic alef, Arabic madda on alef, Arabic alef wasla ++ key { [ 0x100062A, 0x1000629, 0x100067C ] }; // Arabic teh, Arabic teh marbuta, Arabic tteh ++ key { [ 0x1000646, guillemontright, 0x10006BC ] }; // Arabic noon, Arabic noon with ring ++ key { [ 0x1000645, guillemontleft, 0x10006BA ] }; // Arabic meem, Arabic noon ghunna ++ key { [ 0x10006A9, colon, semicolon ] }; // Arabic keheh, ++ key { [ 0x10006AF, 0x100061B, 0x10006AB ] }; // Arabic gaf, Arabic semicolon, Arabic kaf with ring ++ ++ key { [ backslash, bar, question ] }; ++ key { [ space, 0x100200C, 0x10000A0 ] }; // zero width non-joiner, no break space ++ ++ key { [ 0x1000638, 0x10006C9, 0x10006D2 ] }; // Arabic zah, Arabic kirghiz yu, Arabic yeh barree ++ key { [ 0x1000637, 0x10006C7, 0x1000691 ] }; // Arabic tah, Arabic u, Arabic rreh ++ key { [ 0x1000632, 0x1000698, 0x1000696 ] }; // Arabic zain, Arabic jeh, Arabic reh with dot below and dot above ++ key { [ 0x1000631, 0x1000625, 0x1000693 ] }; // Arabic_ra (reh?), Arabic alef with hamza below, Arabic reh with ring ++ key { [ 0x1000630, 0x100200C, 0x1000688 ] }; // Arabic_thal, zero width non-joiner, Arabic ddal ++ key { [ 0x100062F, 0x1000654, 0x1000689 ] }; // Arabic dal, Arabic hamza above, Arabic dal with ring ++ key { [ 0x100067E, 0x1000621, 0x1000679 ] }; // Arabic peh, Arabic hamza, Arabic tteh ++ key { [ 0x1000648, greater, comma ] }; // Arabic_waw ++ key { [ period, less ] }; ++ key { [ slash, 0x100061F, 0x1000655 ] }; // Arabic question mark, Arabic hamza below ++ ++ //language key ++ key { [ ISO_Next_Group, ISO_Prev_Group ] }; ++}; +Index: rules/base.xml.in +=================================================================== +RCS file: /cvs/xlibs/xkbdesc/xkeyboard-config/rules/base.xml.in,v +retrieving revision 1.224 +diff -u -p -r1.224 base.xml.in +--- rules/base.xml.in 18 Nov 2007 11:42:54 -0000 1.224 ++++ rules/base.xml.in 20 Nov 2007 04:49:22 -0000 +@@ -1082,6 +1082,24 @@ + <_description>Southern Uzbek + + ++ ++ ++ olpc-ps ++ <_description>OLPC Pashto ++ ++ ++ ++ ++ olpc-da ++ <_description>OLPC Dari ++ ++ ++ ++ ++ olpc-uz ++ <_description>OLPC Southern Uzbek ++ ++ + + + diff --git a/olpc-xkeyboard-config-kz-group.patch b/olpc-xkeyboard-config-kz-group.patch new file mode 100644 index 0000000..71d1249 --- /dev/null +++ b/olpc-xkeyboard-config-kz-group.patch @@ -0,0 +1,13 @@ +Index: symbols/kz +=================================================================== +RCS file: /cvs/xlibs/xkbdesc/xkeyboard-config/symbols/kz,v +retrieving revision 1.3 +diff -u -p -r1.3 kz +--- symbols/kz 7 Oct 2007 10:05:46 -0000 1.3 ++++ symbols/kz 20 Nov 2007 04:25:37 -0000 +@@ -213,4 +213,5 @@ xkb_symbols "olpc" { + + key { [ parenleft, parenright ] }; + key { [ Cyrillic_io, Cyrillic_IO ] }; ++ key { [ ISO_Next_Group, ISO_Prev_Group ] }; + }; diff --git a/olpc-xkeyboard-config-ng-group.patch b/olpc-xkeyboard-config-ng-group.patch new file mode 100644 index 0000000..d88e871 --- /dev/null +++ b/olpc-xkeyboard-config-ng-group.patch @@ -0,0 +1,12 @@ +diff -u -p -r1.4 ng +--- symbols/ng 28 Oct 2007 08:53:29 -0000 1.4 ++++ symbols/ng 20 Nov 2007 06:20:24 -0000 +@@ -111,7 +111,7 @@ xkb_symbols "olpc" { + key { [ period, greater, guillemotright, guillemotright ] }; + key { [ slash, question, questiondown, questiondown ] }; + +- key { [ ISO_Next_Group, ISO_Prev_Group ] }; ++ key { [ multiply, division, ISO_Next_Group, ISO_Prev_Group ] }; + + include "level3(ralt_switch)" + }; diff --git a/olpc-xkeyboard-config-ng-h.patch b/olpc-xkeyboard-config-ng-h.patch new file mode 100644 index 0000000..57bc0de --- /dev/null +++ b/olpc-xkeyboard-config-ng-h.patch @@ -0,0 +1,12 @@ +diff -u -p -u -p -r1.4 ng +--- symbols/ng 28 Oct 2007 08:53:29 -0000 1.4 ++++ symbols/ng 19 Nov 2007 21:51:34 -0000 +@@ -94,7 +94,7 @@ xkb_symbols "olpc" { + key { [ d, D, 0x1000257, 0x100018A ] }; // D with hook + key { [ f, F, 0x1001E0D, 0x1001E0C ] }; // D with dot below + key { [ g, G, 0x1000272, 0x100019D ] }; // N with left hook +- key { [ u, U, 0x1001EE5, 0x1001EE4 ] }; // U with dot below ++ key { [ h, H, 0x1001EE5, 0x1001EE4 ] }; // U with dot below + key { [ j, J, 0x1001ECB, 0x1001ECA ] }; // I with dot below + key { [ k, K, 0x1000199, 0x1000198 ] }; // K with hook + key { [ l, L, 0x10001E37, 0x1001E36 ] }; // L with dot below diff --git a/sources b/sources index ed58154..d1850fd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2c76b91bd31bff78db771566578fe520 xkeyboard-config-1.1.tar.bz2 +cdcefc9bb3ab6031f78f528516d3c5bd xkeyboard-config-1.1-20071120cvs.tar.bz2 diff --git a/xkeyboard-config.spec b/xkeyboard-config.spec index 219a737..e948e7f 100644 --- a/xkeyboard-config.spec +++ b/xkeyboard-config.spec @@ -1,18 +1,22 @@ # INFO: Package contains data-only, no binaries, so no debuginfo is needed %define debug_package %{nil} +%define cvsdate 20071120cvs Summary: xkeyboard-config alternative xkb data files Name: xkeyboard-config Version: 1.1 -Release: 3%{?dist} +Release: 5.%{cvsdate}%{?dist} License: MIT Group: User Interface/X URL: http://www.x.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: http://xlibs.freedesktop.org/xkbdesc/%{name}-%{version}.tar.bz2 -# https://bugs.freedesktop.org/show_bug.cgi?id=12719 -Patch0: dellm65.patch +#Source0: http://xlibs.freedesktop.org/xkbdesc/%{name}-%{version}.tar.bz2 +Source0: %{name}-%{version}-%{cvsdate}.tar.bz2 +Patch0: olpc-xkeyboard-config-af.patch +Patch1: olpc-xkeyboard-config-kz-group.patch +Patch2: olpc-xkeyboard-config-ng-group.patch +Patch3: olpc-xkeyboard-config-ng-h.patch BuildArch: noarch @@ -20,7 +24,6 @@ BuildRequires: pkgconfig BuildRequires: xorg-x11-util-macros BuildRequires: xkbcomp BuildRequires: perl(XML::Parser) -#autoreconf needed for macbook patch BuildRequires: automake intltool # NOTE: Any packages that need xkbdata to be installed should be using @@ -42,7 +45,10 @@ xkeyboard-config alternative xkb data files %prep %setup -q -%patch0 -p1 -b .dellm65 +%patch0 -p0 -b .af +%patch1 -p0 -b .kzgroup +%patch2 -p0 -b .nggroup +%patch3 -p0 -b .ngh %build %configure \ @@ -60,6 +66,9 @@ make install DESTDIR=$RPM_BUILD_ROOT # Remove unnecessary symlink rm -f $RPM_BUILD_ROOT%{_datadir}/X11/xkb/compiled +# Bernie: remove locale stuff +rm -rf $RPM_BUILD_ROOT%{_datadir}/locale + # Create filelist { FILESLIST=${PWD}/files.list @@ -79,6 +88,30 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/X11/xkb/rules/xorg.xml %changelog +* Mon Nov 19 2007 Bernardo Innocenti 1.1-5.20071119cvs +- Upgrade xkeyboard-config snapshot to cvs20071119 +- Add olpc-xkeyboard-config-af.patch +- Add olpc-xkeyboard-config-kz-group.patch +- Add olpc-xkeyboard-config-ng-group.patch +- Add olpc-xkeyboard-config-ng-h.patch +- Remove olpc-xkeyboard-config-ara-fixes.patch (integrated upstream) +- Remove olpc-xkeyboard-config-br-accents.patch (integrated upstream) +- Remove olpc-xkeyboard-config-es-accents.patch (integrated upstream) +- Remove olpc-xkeyboard-config-us-typo.patch (integrated upstream) + +* Sat Oct 27 2007 Bernardo Innocenti 1.1-5.20071009cvs +- Add olpc-xkeyboard-config-ara-fixes.patch +- Add olpc-xkeyboard-config-br-accents.patch +- Add olpc-xkeyboard-config-es-accents.patch +- Add olpc-xkeyboard-config-us-typo.patch + +* Sat Oct 09 2007 Bernardo Innocenti - 1.1-4.20071009cvs +- Upgrade xkeyboard-config snapshot to cvs20071009 + +* Sat Oct 06 2007 Bernardo Innocenti - 1.1-4.20071006cvs +- Resync with Fedora Development +- Upgrade xkeyboard-config snapshot to cvs20071006 + * Sat Oct 6 2007 Matthias Clasen - 1.1-3 - Somehow the Dell M65 model lost its vendor @@ -94,6 +127,35 @@ rm -rf $RPM_BUILD_ROOT - Drop upstreamed patches - Update remaining patches +* Tue Sep 04 2007 Bernardo Innocenti - 0.8.20070829cvs +- Update OLPC patch to take11 (use old evdev key name for the "view source" + key) + +* Tue Sep 04 2007 Bernardo Innocenti - 0.8.20070829cvs +- Downgrade xkeyboard-config snapshot to cvs20070829 to revert + recent evdev changes (the version of xkbcomp we ship chokes on them). + +* Fri Aug 31 2007 Bernardo Innocenti - 0.7.20070831cvs +- Update OLPC patch to take10 (integrate changes requested by + upstream reviewer) + +* Wed Aug 22 2007 Bernardo Innocenti - 0.6.20070820cvs +- Update OLPC patch to take9 (fix 'h' key on us layout) + +* Wed Aug 22 2007 Bernardo Innocenti - 0.5.20070820cvs +- Update OLPC patch to take8 (don't use olpc variant for et layout) + +* Wed Aug 22 2007 Bernardo Innocenti - 0.4.20070820cvs +- Update OLPC patch to take7 + +* Mon Aug 20 2007 Bernardo Innocenti - 0.3.20070820cvs +- Update to CVS snapshot 20070820 + +* Fri Jun 29 2007 Bernardo Innocenti - 0.2.20070629cvs +- Update to CVS snapshot 20070629 +- Add OLPC patch +- Drop patches already integrated upstream + * Fri Sep 1 2006 Alexander Larsson - 0.8-7 - Update macbook patch to be closer to what got in upstream - (kp enter is ralt, not the option key)