From a926a4cbd32f3cac67372540bb229873d1fd426c Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Mon, 24 Nov 2008 03:56:27 +0000 Subject: [PATCH] - Switch to using git patches, modelled after xorg-x11-server. - CVS remove unused patches. --- olpc-xkeyboard-config-af.patch | 228 -------------- olpc-xkeyboard-config-kz-group.patch | 7 + olpc-xkeyboard-config-ng-group.patch | 12 - olpc-xkeyboard-config-ng-h.patch | 12 - usinet.patch | 31 +- xkeyboard-config-1.3-AC11-mapping-is.patch | 13 - xkeyboard-config-1.4-battery.patch | 19 +- xkeyboard-config-1.4-jp-tilde.patch | 20 +- xkeyboard-config-1.4-tj-variant.patch | 348 +++++++++------------ xkeyboard-config.spec | 24 +- 10 files changed, 231 insertions(+), 483 deletions(-) delete mode 100644 olpc-xkeyboard-config-af.patch delete mode 100644 olpc-xkeyboard-config-ng-group.patch delete mode 100644 olpc-xkeyboard-config-ng-h.patch delete mode 100644 xkeyboard-config-1.3-AC11-mapping-is.patch diff --git a/olpc-xkeyboard-config-af.patch b/olpc-xkeyboard-config-af.patch deleted file mode 100644 index a272673..0000000 --- a/olpc-xkeyboard-config-af.patch +++ /dev/null @@ -1,228 +0,0 @@ -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 index 6659987..b420fc0 100644 --- a/olpc-xkeyboard-config-kz-group.patch +++ b/olpc-xkeyboard-config-kz-group.patch @@ -1,3 +1,10 @@ +From ca3dcd5cf50ccb0ffadd8308a7132a14993b16bc Mon Sep 17 00:00:00 2001 +From: Fedora X Ninjas +Date: Mon, 24 Nov 2008 13:01:22 +1000 +Subject: [PATCH] OLPC: map group switching to I219 in symbols(kz) + + +--- diff -up xkeyboard-config-1.2/symbols/kz.kzgroup xkeyboard-config-1.2/symbols/kz --- xkeyboard-config-1.2/symbols/kz.kzgroup 2008-01-24 18:21:06.000000000 -0500 +++ xkeyboard-config-1.2/symbols/kz 2008-02-07 12:23:56.000000000 -0500 diff --git a/olpc-xkeyboard-config-ng-group.patch b/olpc-xkeyboard-config-ng-group.patch deleted file mode 100644 index d88e871..0000000 --- a/olpc-xkeyboard-config-ng-group.patch +++ /dev/null @@ -1,12 +0,0 @@ -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 deleted file mode 100644 index 57bc0de..0000000 --- a/olpc-xkeyboard-config-ng-h.patch +++ /dev/null @@ -1,12 +0,0 @@ -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/usinet.patch b/usinet.patch index 6e39b5d..98c713b 100644 --- a/usinet.patch +++ b/usinet.patch @@ -1,7 +1,18 @@ -diff -up xkeyboard-config-1.2/rules/base.lists.part.usinet xkeyboard-config-1.2/rules/base.lists.part ---- xkeyboard-config-1.2/rules/base.lists.part.usinet 2008-01-11 17:19:47.000000000 -0500 -+++ xkeyboard-config-1.2/rules/base.lists.part 2008-04-14 22:47:19.000000000 -0400 -@@ -52,6 +52,7 @@ +From f6b527515a6eb088c7ff6eb66bda454e20df371e Mon Sep 17 00:00:00 2001 +From: Fedora X Ninjas +Date: Mon, 24 Nov 2008 13:10:56 +1000 +Subject: [PATCH] Add include inet(media_nav_common) by default for pc105 + +--- + rules/base.lists.part | 1 + + symbols/inet | 6 ++++++ + 2 files changed, 7 insertions(+), 0 deletions(-) + +diff --git a/rules/base.lists.part b/rules/base.lists.part +index b08ab24..f9207b6 100644 +--- a/rules/base.lists.part ++++ b/rules/base.lists.part +@@ -53,6 +53,7 @@ microsoftoffice microsoftmult \ mx1998 mx2500 mx2750 \ oretec \ @@ -9,10 +20,11 @@ diff -up xkeyboard-config-1.2/rules/base.lists.part.usinet xkeyboard-config-1.2/ presario propeller \ qtronix \ rapidaccess rapidaccess2 rapidaccess2a thinkpad thinkpad60 \ -diff -up xkeyboard-config-1.2/symbols/inet.usinet xkeyboard-config-1.2/symbols/inet ---- xkeyboard-config-1.2/symbols/inet.usinet 2008-01-07 18:07:51.000000000 -0500 -+++ xkeyboard-config-1.2/symbols/inet 2008-04-14 22:48:23.000000000 -0400 -@@ -2211,3 +2211,9 @@ xkb_symbols "classmate" { +diff --git a/symbols/inet b/symbols/inet +index 54ec241..568cc4a 100644 +--- a/symbols/inet ++++ b/symbols/inet +@@ -2234,3 +2234,9 @@ xkb_symbols "classmate" { key { [ XF86AudioRaiseVolume ] }; }; @@ -22,3 +34,6 @@ diff -up xkeyboard-config-1.2/symbols/inet.usinet xkeyboard-config-1.2/symbols/i +xkb_symbols "pc105" { + include "inet(media_nav_common)" +}; +-- +1.6.0.3 + diff --git a/xkeyboard-config-1.3-AC11-mapping-is.patch b/xkeyboard-config-1.3-AC11-mapping-is.patch deleted file mode 100644 index a4a72e2..0000000 --- a/xkeyboard-config-1.3-AC11-mapping-is.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/symbols/is b/symbols/is -index ce03b3b..d68ae95 100644 ---- a/symbols/is -+++ b/symbols/is -@@ -22,7 +22,7 @@ xkb_symbols "basic" { - key { [apostrophe, question, asciitilde, dead_macron ] }; - - key { [ ae, AE, asciicircum, dead_doubleacute ] }; -- key { [dead_acute, Adiaeresis, dead_circumflex, dead_caron] }; -+ key { [dead_acute, dead_circumflex, dead_circumflex ] }; - key { [ degree, diaeresis, notsign, notsign ] }; - - key { [ plus, asterisk, grave, dead_breve ] }; diff --git a/xkeyboard-config-1.4-battery.patch b/xkeyboard-config-1.4-battery.patch index 9bee494..7aee404 100644 --- a/xkeyboard-config-1.4-battery.patch +++ b/xkeyboard-config-1.4-battery.patch @@ -1,6 +1,16 @@ -diff -up xkeyboard-config-1.4/symbols/inet.orig xkeyboard-config-1.4/symbols/inet ---- xkeyboard-config-1.4/symbols/inet.orig 2008-10-24 11:49:36.000000000 +1030 -+++ xkeyboard-config-1.4/symbols/inet 2008-10-24 11:49:52.000000000 +1030 +From ca3dcd5cf50ccb0ffadd8308a7132a14993b16bc Mon Sep 17 00:00:00 2001 +From: Fedora X Ninjas +Date: Mon, 24 Nov 2008 13:01:22 +1000 +Subject: [PATCH] Map KEY_BATTERY, WLAN, BLUETOOTH, UWB to their XF86<...> keycodes. + +--- + symbols/inet | 7 ++++--- + 1 files changed, 4 insertions(+), 3 deletions(-) + +diff --git a/symbols/inet b/symbols/inet +index 54ec241..50b559b 100644 +--- a/symbols/inet ++++ b/symbols/inet @@ -158,9 +158,10 @@ xkb_symbols "evdev" { key { [ XF86MailForward ] }; key { [ XF86Save ] }; @@ -15,3 +25,6 @@ diff -up xkeyboard-config-1.4/symbols/inet.orig xkeyboard-config-1.4/symbols/ine // key { [ ] }; // KEY_VIDEO_NEXT -- drive next video source // key { [ ] }; // KEY_VIDEO_PREV -- drive previous video source // key { [ ] }; // KEY_BRIGHTNESS_CYCLE -- bright up, max++ == min +-- +1.6.0.3 + diff --git a/xkeyboard-config-1.4-jp-tilde.patch b/xkeyboard-config-1.4-jp-tilde.patch index b56fa4a..b76219c 100644 --- a/xkeyboard-config-1.4-jp-tilde.patch +++ b/xkeyboard-config-1.4-jp-tilde.patch @@ -1,6 +1,17 @@ -diff -up xkeyboard-config-1.4/symbols/jp.orig xkeyboard-config-1.4/symbols/jp ---- xkeyboard-config-1.4/symbols/jp.orig 2008-11-11 11:19:41.000000000 +1000 -+++ xkeyboard-config-1.4/symbols/jp 2008-11-11 11:37:53.000000000 +1000 +From 824ce3a400a452929f90a038033c83055c01a2d7 Mon Sep 17 00:00:00 2001 +From: Fedora X Ninjas +Date: Mon, 24 Nov 2008 12:59:09 +1000 +Subject: [PATCH] Map TLDE to Zenkaku/Hankaku in jp, and BKSL to bracket/brace right (#469537). + +This patch is only needed for jp on a non-jp106 keyboard model. +--- + symbols/jp | 7 +++++++ + 1 files changed, 7 insertions(+), 0 deletions(-) + +diff --git a/symbols/jp b/symbols/jp +index 694090c..ef0b0f7 100644 +--- a/symbols/jp ++++ b/symbols/jp @@ -24,6 +24,13 @@ xkb_symbols "common" { symbols[Group1]= [ Zenkaku_Hankaku, Kanji ] }; @@ -15,3 +26,6 @@ diff -up xkeyboard-config-1.4/symbols/jp.orig xkeyboard-config-1.4/symbols/jp key { [ 1, exclam ] }; key { [ 2, quotedbl ] }; key { [ 3, numbersign ] }; +-- +1.6.0.3 + diff --git a/xkeyboard-config-1.4-tj-variant.patch b/xkeyboard-config-1.4-tj-variant.patch index 3dd5b8a..3a2b0df 100644 --- a/xkeyboard-config-1.4-tj-variant.patch +++ b/xkeyboard-config-1.4-tj-variant.patch @@ -1,8 +1,18 @@ +From 39107a296f89fc61ede5b88ba97e9d6eb311c004 Mon Sep 17 00:00:00 2001 +From: Fedora X Ninjas +Date: Mon, 24 Nov 2008 13:06:10 +1000 +Subject: [PATCH] Add legacy and basic tj layouts (#455796) + +--- + rules/base.xml.in | 9 ++- + symbols/tj | 197 ++++++++++++++++++++++++++++++++++------------------ + 2 files changed, 137 insertions(+), 69 deletions(-) + diff --git a/rules/base.xml.in b/rules/base.xml.in -index 5040879..5b12f9f 100644 +index 8d0aa92..1fefc62 100644 --- a/rules/base.xml.in +++ b/rules/base.xml.in -@@ -3594,7 +3594,20 @@ i +@@ -3580,7 +3580,14 @@ <_description>Tajikistan tgk @@ -10,12 +20,6 @@ index 5040879..5b12f9f 100644 + + + -+ std -+ <_description>Standard -+ -+ -+ -+ + legacy + <_description>Legacy + @@ -25,172 +29,10 @@ index 5040879..5b12f9f 100644 diff --git a/symbols/tj b/symbols/tj -index f07b290..d9e5ff6 100644 +index f07b290..a72b18d 100644 --- a/symbols/tj +++ b/symbols/tj -@@ -76,3 +76,140 @@ xkb_symbols "basic" { - // End alphanumeric section - - }; -+// 17/07/2008 -+// ------------------------------------------------------------- -+// Standard Tojiki Keyboard Layout, Official Standard -+// ------------------------------------------------------------- -+// Created by Victor Ibragimov -+// Tajik Fedora & Software Localization Team -+// ------------------------------------------------------------- -+// DUAL INPUT METHOD -+// -------------------------------------------------------------------- -+// -------------- Tajiki Official Keyboard Layout---------------------- -+// -------------------------------------------------------------------- -+// -+ -+partial alphanumeric_keys -+xkb_symbols "std" -+{ -+ name[Group1] = "Tajikistan - Standard"; -+ -+ include "keypad(comma)" -+ include "level3(ralt_switch)" -+ -+ key { [ Cyrillic_ya, Cyrillic_YA ] }; // я Я -+ key { [ Cyrillic_che, Cyrillic_CHE ] }; // ч Ч -+ key { [ Cyrillic_es, Cyrillic_ES ] }; // с С -+ key { [ Cyrillic_em, Cyrillic_EM ] }; // м М -+ key { [ Cyrillic_i, Cyrillic_I ] }; // и И -+ key { [ Cyrillic_te, Cyrillic_TE ] }; // т Т -+ key { [ 0x10004e3, 0x10004e2 ] }; // ӣ Ӣ -+ key { [ Cyrillic_be, Cyrillic_BE ] }; // б Б -+ key { [ Cyrillic_yu, Cyrillic_YU ] }; // ю Ю -+ key { [ period, comma ] }; // . , -+ key { [ Cyrillic_ef, Cyrillic_EF ] }; // ф Ф -+ key { [ 0x10004b7, 0x10004b6 ] }; // ҷ Ҷ -+ key { [ Cyrillic_ve, Cyrillic_VE ] }; // в В -+ key { [ Cyrillic_a, Cyrillic_A ] }; // а А -+ key { [ Cyrillic_pe, Cyrillic_PE ] }; // п П -+ key { [ Cyrillic_er, Cyrillic_ER ] }; // р Р -+ key { [ Cyrillic_o, Cyrillic_O ] }; // о О -+ key { [ Cyrillic_el, Cyrillic_EL ] }; // л Л -+ key { [ Cyrillic_de, Cyrillic_DE ] }; // д Д -+ key { [ Cyrillic_zhe, Cyrillic_ZHE ] }; // ж Ж -+ key { [ Cyrillic_e, Cyrillic_E ] }; // э Э -+ key { [ Cyrillic_shorti, Cyrillic_SHORTI ] }; // й Й -+ key { [ 0x100049b, 0x100049a ] }; // қ Қ -+ key { [ Cyrillic_u, Cyrillic_U ] }; // у У -+ key { [ Cyrillic_ka, Cyrillic_KA ] }; // к К -+ key { [ Cyrillic_ie, Cyrillic_IE ] }; // е Е -+ key { [ Cyrillic_en, Cyrillic_EN ] }; // н Н -+ key { [ Cyrillic_ghe, Cyrillic_GHE ] }; // г Г -+ key { [ Cyrillic_sha, Cyrillic_SHA ] }; // ш Ш -+ key { [ 0x10004b3, 0x10004b2 ] }; // ҳ Ҳ -+ key { [ Cyrillic_ze, Cyrillic_ZE ] }; // з З -+ key { [ Cyrillic_ha, Cyrillic_HA ] }; // х Х -+ key { [ Cyrillic_hardsign, Cyrillic_HARDSIGN ] }; // ъ Ъ -+ key { [ 1, exclam, 0x10000a7 ] }; // 1 ! § -+ key { [ 2, quotedbl, 0x10000ab, 0x10000bb ] }; // 2 " « » -+ key { [ 3, numerosign ] }; // 3 № -+ key { [ 4, semicolon ] }; // 4 ; -+ key { [ 5, percent ] }; // 5 % -+ key { [ 6, colon, 0x1002013 ] }; // 6 : – -+ key { [ 7, question, ampersand ] }; // 7 ? & -+ key { [ 8, asterisk ] }; // 8 * -+ key { [ 9, parenleft ] }; // 9 ( -+ key { [ 0, parenright, 0x10000b0 ] }; // 0 ) ° -+ key { [ 0x1000493, 0x1000492, minus, underscore ] }; // ғ Ғ - _ -+ key { [ 0x10004ef, 0x10004ee, equal, plus ] }; // ӯ Ӯ = + -+ key { [ backslash, slash ] }; // \ / -+ key { [ slash, bar ] }; // / | -+ key { [ Cyrillic_io, Cyrillic_IO ] }; // ё Ё -+}; -+ -+// -------------------------------------------------------------------- -+// -------------- Tojiki Rusi Keyboard Layout-------------------------- -+// -------------------------------------------------------------------- -+// AEN -+// 2001/12/23 by Leon Kanter -+// 2005/12/09 Valery Inozemtsev -+// Pablo Saratxaga (for the dead keys changes) -+// -------------------------------------------------------------------- -+ -+xkb_symbols "legacy" -+{ -+ name[Group1] = "Tajikistan - Legacy"; -+ -+ include "keypad(comma)" -+ include "level3(ralt_switch)" -+ -+ key { [ Cyrillic_ya, Cyrillic_YA ] }; // я Я -+ key { [ Cyrillic_che, Cyrillic_CHE, 0x10004b7, 0x10004b6 ] }; // ч Ч ҷ Ҷ -+ key { [ Cyrillic_es, Cyrillic_ES ] }; // с С -+ key { [ Cyrillic_em, Cyrillic_EM ] }; // м М -+ key { [ Cyrillic_i, Cyrillic_I, 0x10004e3, 0x10004e2 ] }; // и И ӣ Ӣ -+ key { [ Cyrillic_te, Cyrillic_TE ] }; // т Т -+ key { [ Cyrillic_softsign, Cyrillic_SOFTSIGN ] }; // ь Ь -+ key { [ Cyrillic_be, Cyrillic_BE ] }; // б Б -+ key { [ Cyrillic_yu, Cyrillic_YU ] }; // ю Ю -+ key { [ period, comma ] }; // . , -+ key { [ Cyrillic_ef, Cyrillic_EF ] }; // ф Ф -+ key { [ Cyrillic_yeru, Cyrillic_YERU ] }; // ы Ы -+ key { [ Cyrillic_ve, Cyrillic_VE ] }; // в В -+ key { [ Cyrillic_a, Cyrillic_A ] }; // а А -+ key { [ Cyrillic_pe, Cyrillic_PE ] }; // п П -+ key { [ Cyrillic_er, Cyrillic_ER ] }; // р Р -+ key { [ Cyrillic_o, Cyrillic_O ] }; // о О -+ key { [ Cyrillic_el, Cyrillic_EL ] }; // л Л -+ key { [ Cyrillic_de, Cyrillic_DE ] }; // д Д -+ key { [ Cyrillic_zhe, Cyrillic_ZHE ] }; // ж Ж -+ key { [ Cyrillic_e, Cyrillic_E ] }; // э Э -+ key { [ Cyrillic_shorti, Cyrillic_SHORTI ] }; // й Й -+ key { [ Cyrillic_tse, Cyrillic_TSE ] }; // ц Ц -+ key { [ Cyrillic_u, Cyrillic_U, 0x10004ef, 0x10004ee ] }; // у У ӯ Ӯ -+ key { [ Cyrillic_ka, Cyrillic_KA, 0x100049b, 0x100049a ] }; // к К қ Қ -+ key { [ Cyrillic_ie, Cyrillic_IE ] }; // е Е -+ key { [ Cyrillic_en, Cyrillic_EN ] }; // н Н -+ key { [ Cyrillic_ghe, Cyrillic_GHE, 0x1000493, 0x1000492 ] }; // г Г ғ Ғ -+ key { [ Cyrillic_sha, Cyrillic_SHA ] }; // ш Ш -+ key { [ Cyrillic_shcha, Cyrillic_SHCHA ] }; // щ Щ -+ key { [ Cyrillic_ze, Cyrillic_ZE ] }; // з З -+ key { [ Cyrillic_ha, Cyrillic_HA, 0x10004b3, 0x10004b2 ] }; // х Х ҳ Ҳ -+ key { [ Cyrillic_hardsign, Cyrillic_HARDSIGN ] }; // ъ Ъ -+ key { [ 1, exclam, 0x10000a7 ] }; // 1 ! § -+ key { [ 2, quotedbl, 0x10000ab, 0x10000bb ] }; // 2 " « » -+ key { [ 3, numerosign ] }; // 3 № -+ key { [ 4, semicolon ] }; // 4 ; -+ key { [ 5, percent ] }; // 5 % -+ key { [ 6, colon, 0x1002013 ] }; // 6 : – -+ key { [ 7, question, ampersand ] }; // 7 ? & -+ key { [ 8, asterisk ] }; // 8 * -+ key { [ 9, parenleft ] }; // 9 ( -+ key { [ 0, parenright ] }; // 0 ) -+ key { [ minus, underscore ] }; // - _ -+ key { [ equal, plus ] }; // = + -+ key { [ backslash, slash ] }; // \ / -+ key { [ slash, bar ] }; // / | -+ key { [ Cyrillic_io, Cyrillic_IO ] }; // ё Ё -+}; -+ -diff --git a/rules/base.xml.in b/rules/base.xml.in -index 13ba046..c770633 100644 ---- a/rules/base.xml.in -+++ b/rules/base.xml.in -@@ -3597,12 +3597,6 @@ - - - -- std -- <_description>Standard -- -- -- -- - legacy - <_description>Legacy - -diff --git a/symbols/tj b/symbols/tj -index d9e5ff6..fcb884d 100644 ---- a/symbols/tj -+++ b/symbols/tj -@@ -1,81 +1,5 @@ +@@ -1,78 +1,139 @@ // $XKeyboardConfig$ -// based on @@ -204,20 +46,95 @@ index d9e5ff6..fcb884d 100644 -// it requires proper dead_cedilla and dead_macron entries in Compose file -// it also allows to use Mode_switch when in cyrillic mode to enter -// special letters by doing Mode_switch + base letter --// ++// 17/07/2008 ++// ------------------------------------------------------------- ++// Standard Tojiki Keyboard Layout, Official Standard ++// ------------------------------------------------------------- ++// Created by Victor Ibragimov ++// Tajik Fedora & Software Localization Team ++// ------------------------------------------------------------- ++// DUAL INPUT METHOD ++// -------------------------------------------------------------------- ++// -------------- Tajiki Official Keyboard Layout---------------------- ++// -------------------------------------------------------------------- + // -// AEN (for the Russian layout) -// Pablo Saratxaga (for the dead keys changes) -// -// 2008-06-22 -// Changed so that RightAlt allows to type the extra Tajik keys and that -// SHCHA is back to normal again -- -- + ++partial default alphanumeric_keys ++xkb_symbols "basic" ++{ ++ name[Group1] = "Tajikistan"; ++ ++ include "keypad(comma)" ++ include "level3(ralt_switch)" + -partial default alphanumeric_keys -xkb_symbols "basic" { -- ++ key { [ Cyrillic_ya, Cyrillic_YA ] }; // я Я ++ key { [ Cyrillic_che, Cyrillic_CHE ] }; // ч Ч ++ key { [ Cyrillic_es, Cyrillic_ES ] }; // с С ++ key { [ Cyrillic_em, Cyrillic_EM ] }; // м М ++ key { [ Cyrillic_i, Cyrillic_I ] }; // и И ++ key { [ Cyrillic_te, Cyrillic_TE ] }; // т Т ++ key { [ 0x10004e3, 0x10004e2 ] }; // ӣ Ӣ ++ key { [ Cyrillic_be, Cyrillic_BE ] }; // б Б ++ key { [ Cyrillic_yu, Cyrillic_YU ] }; // ю Ю ++ key { [ period, comma ] }; // . , ++ key { [ Cyrillic_ef, Cyrillic_EF ] }; // ф Ф ++ key { [ 0x10004b7, 0x10004b6 ] }; // ҷ Ҷ ++ key { [ Cyrillic_ve, Cyrillic_VE ] }; // в В ++ key { [ Cyrillic_a, Cyrillic_A ] }; // а А ++ key { [ Cyrillic_pe, Cyrillic_PE ] }; // п П ++ key { [ Cyrillic_er, Cyrillic_ER ] }; // р Р ++ key { [ Cyrillic_o, Cyrillic_O ] }; // о О ++ key { [ Cyrillic_el, Cyrillic_EL ] }; // л Л ++ key { [ Cyrillic_de, Cyrillic_DE ] }; // д Д ++ key { [ Cyrillic_zhe, Cyrillic_ZHE ] }; // ж Ж ++ key { [ Cyrillic_e, Cyrillic_E ] }; // э Э ++ key { [ Cyrillic_shorti, Cyrillic_SHORTI ] }; // й Й ++ key { [ 0x100049b, 0x100049a ] }; // қ Қ ++ key { [ Cyrillic_u, Cyrillic_U ] }; // у У ++ key { [ Cyrillic_ka, Cyrillic_KA ] }; // к К ++ key { [ Cyrillic_ie, Cyrillic_IE ] }; // е Е ++ key { [ Cyrillic_en, Cyrillic_EN ] }; // н Н ++ key { [ Cyrillic_ghe, Cyrillic_GHE ] }; // г Г ++ key { [ Cyrillic_sha, Cyrillic_SHA ] }; // ш Ш ++ key { [ 0x10004b3, 0x10004b2 ] }; // ҳ Ҳ ++ key { [ Cyrillic_ze, Cyrillic_ZE ] }; // з З ++ key { [ Cyrillic_ha, Cyrillic_HA ] }; // х Х ++ key { [ Cyrillic_hardsign, Cyrillic_HARDSIGN ] }; // ъ Ъ ++ key { [ 1, exclam, 0x10000a7 ] }; // 1 ! § ++ key { [ 2, quotedbl, 0x10000ab, 0x10000bb ] }; // 2 " « » ++ key { [ 3, numerosign ] }; // 3 № ++ key { [ 4, semicolon ] }; // 4 ; ++ key { [ 5, percent ] }; // 5 % ++ key { [ 6, colon, 0x1002013 ] }; // 6 : – ++ key { [ 7, question, ampersand ] }; // 7 ? & ++ key { [ 8, asterisk ] }; // 8 * ++ key { [ 9, parenleft ] }; // 9 ( ++ key { [ 0, parenright, 0x10000b0 ] }; // 0 ) ° ++ key { [ 0x1000493, 0x1000492, minus, underscore ] }; // ғ Ғ - _ ++ key { [ 0x10004ef, 0x10004ee, equal, plus ] }; // ӯ Ӯ = + ++ key { [ backslash, slash ] }; // \ / ++ key { [ slash, bar ] }; // / | ++ key { [ Cyrillic_io, Cyrillic_IO ] }; // ё Ё ++}; + - name[Group1]= "Tajikistan"; -- ++// -------------------------------------------------------------------- ++// -------------- Tojiki Rusi Keyboard Layout-------------------------- ++// -------------------------------------------------------------------- ++// AEN ++// 2001/12/23 by Leon Kanter ++// 2005/12/09 Valery Inozemtsev ++// Pablo Saratxaga (for the dead keys changes) ++// -------------------------------------------------------------------- + - key { [ Cyrillic_ya, Cyrillic_YA ] }; - key { [ Cyrillic_che, Cyrillic_CHE, 0x010004b7, 0x010004b6 ] }; - key { [ Cyrillic_es, Cyrillic_ES ] }; @@ -265,27 +182,64 @@ index d9e5ff6..fcb884d 100644 - key { [ equal, plus ] }; - key { [ bar, brokenbar ] }; - key { [ Cyrillic_io, Cyrillic_IO ] }; -- ++xkb_symbols "legacy" ++{ ++ name[Group1] = "Tajikistan - Legacy"; + - // End alphanumeric section -- --}; - // 17/07/2008 - // ------------------------------------------------------------- - // Standard Tojiki Keyboard Layout, Official Standard -@@ -89,10 +13,10 @@ xkb_symbols "basic" { - // -------------------------------------------------------------------- - // ++ include "keypad(comma)" ++ include "level3(ralt_switch)" --partial alphanumeric_keys --xkb_symbols "std" -+partial default alphanumeric_keys -+xkb_symbols "basic" - { -- name[Group1] = "Tajikistan - Standard"; -+ name[Group1] = "Tajikistan"; - - include "keypad(comma)" - include "level3(ralt_switch)" ++ key { [ Cyrillic_ya, Cyrillic_YA ] }; // я Я ++ key { [ Cyrillic_che, Cyrillic_CHE, 0x10004b7, 0x10004b6 ] }; // ч Ч ҷ Ҷ ++ key { [ Cyrillic_es, Cyrillic_ES ] }; // с С ++ key { [ Cyrillic_em, Cyrillic_EM ] }; // м М ++ key { [ Cyrillic_i, Cyrillic_I, 0x10004e3, 0x10004e2 ] }; // и И ӣ Ӣ ++ key { [ Cyrillic_te, Cyrillic_TE ] }; // т Т ++ key { [ Cyrillic_softsign, Cyrillic_SOFTSIGN ] }; // ь Ь ++ key { [ Cyrillic_be, Cyrillic_BE ] }; // б Б ++ key { [ Cyrillic_yu, Cyrillic_YU ] }; // ю Ю ++ key { [ period, comma ] }; // . , ++ key { [ Cyrillic_ef, Cyrillic_EF ] }; // ф Ф ++ key { [ Cyrillic_yeru, Cyrillic_YERU ] }; // ы Ы ++ key { [ Cyrillic_ve, Cyrillic_VE ] }; // в В ++ key { [ Cyrillic_a, Cyrillic_A ] }; // а А ++ key { [ Cyrillic_pe, Cyrillic_PE ] }; // п П ++ key { [ Cyrillic_er, Cyrillic_ER ] }; // р Р ++ key { [ Cyrillic_o, Cyrillic_O ] }; // о О ++ key { [ Cyrillic_el, Cyrillic_EL ] }; // л Л ++ key { [ Cyrillic_de, Cyrillic_DE ] }; // д Д ++ key { [ Cyrillic_zhe, Cyrillic_ZHE ] }; // ж Ж ++ key { [ Cyrillic_e, Cyrillic_E ] }; // э Э ++ key { [ Cyrillic_shorti, Cyrillic_SHORTI ] }; // й Й ++ key { [ Cyrillic_tse, Cyrillic_TSE ] }; // ц Ц ++ key { [ Cyrillic_u, Cyrillic_U, 0x10004ef, 0x10004ee ] }; // у У ӯ Ӯ ++ key { [ Cyrillic_ka, Cyrillic_KA, 0x100049b, 0x100049a ] }; // к К қ Қ ++ key { [ Cyrillic_ie, Cyrillic_IE ] }; // е Е ++ key { [ Cyrillic_en, Cyrillic_EN ] }; // н Н ++ key { [ Cyrillic_ghe, Cyrillic_GHE, 0x1000493, 0x1000492 ] }; // г Г ғ Ғ ++ key { [ Cyrillic_sha, Cyrillic_SHA ] }; // ш Ш ++ key { [ Cyrillic_shcha, Cyrillic_SHCHA ] }; // щ Щ ++ key { [ Cyrillic_ze, Cyrillic_ZE ] }; // з З ++ key { [ Cyrillic_ha, Cyrillic_HA, 0x10004b3, 0x10004b2 ] }; // х Х ҳ Ҳ ++ key { [ Cyrillic_hardsign, Cyrillic_HARDSIGN ] }; // ъ Ъ ++ key { [ 1, exclam, 0x10000a7 ] }; // 1 ! § ++ key { [ 2, quotedbl, 0x10000ab, 0x10000bb ] }; // 2 " « » ++ key { [ 3, numerosign ] }; // 3 № ++ key { [ 4, semicolon ] }; // 4 ; ++ key { [ 5, percent ] }; // 5 % ++ key { [ 6, colon, 0x1002013 ] }; // 6 : – ++ key { [ 7, question, ampersand ] }; // 7 ? & ++ key { [ 8, asterisk ] }; // 8 * ++ key { [ 9, parenleft ] }; // 9 ( ++ key { [ 0, parenright ] }; // 0 ) ++ key { [ minus, underscore ] }; // - _ ++ key { [ equal, plus ] }; // = + ++ key { [ backslash, slash ] }; // \ / ++ key { [ slash, bar ] }; // / | ++ key { [ Cyrillic_io, Cyrillic_IO ] }; // ё Ё + }; ++ -- -1.5.4.3 +1.6.0.3 diff --git a/xkeyboard-config.spec b/xkeyboard-config.spec index 0daf993..509f75b 100644 --- a/xkeyboard-config.spec +++ b/xkeyboard-config.spec @@ -4,7 +4,7 @@ Summary: X Keyboard Extension configuration data Name: xkeyboard-config Version: 1.4 -Release: 6%{?dist} +Release: 7%{?dist} License: MIT Group: User Interface/X URL: http://www.freedesktop.org/wiki/Software/XKeyboardConfig @@ -28,6 +28,7 @@ BuildRequires: xkbcomp BuildRequires: perl(XML::Parser) BuildRequires: intltool BuildRequires: gettext +BuildRequires: git-core # NOTE: Any packages that need xkbdata to be installed should be using # the following "Requires: xkbdata" virtual provide, and not directly depending @@ -49,12 +50,17 @@ This package contains configuration data used by the X Keyboard Extension interface. %prep -%setup -q -%patch1 -p1 -b .kzgroup -%patch2 -p1 -b .usinet -%patch3 -p1 -b .tj-variants -%patch4 -p1 -b .battery -%patch5 -p1 -b .jp-tilde +%setup -q -n %{name}-%{version} + +git init-db +if [ -z "$GIT_COMMITTER_NAME" ]; then + git config user.email "x@fedoraproject.org" + git config user.name "Fedora X Ninjas" +fi +git add . +git commit -a -q -m "%{version} baseline." + +git am -p1 $(awk '/^Patch.*:/ { print "%{_sourcedir}/"$2 }' %{_specdir}/%{name}.spec) %build %configure \ @@ -94,6 +100,10 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/X11/xkb/rules/xorg.xml %changelog +* Mon Nov 24 2008 Peter Hutterer - 1.4-7 +- Switch to using git patches, modelled after xorg-x11-server. +- CVS remove unused patches. + * Sat Nov 22 2008 Matthias Clasen - 1.4-6 - Improve %%summary and %%description - Better URL