diff --git a/kbd-1.08-compose.patch b/kbd-1.08-compose.patch new file mode 100644 index 0000000..eeff3c8 --- /dev/null +++ b/kbd-1.08-compose.patch @@ -0,0 +1,49 @@ +Map the PrintScreen key and Alt+AltGr to Compose. + +--- kbd-1.08/data/keymaps/i386/include/compose.inc 2002-10-04 14:48:04.000000000 -0400 ++++ kbd-1.08/data/keymaps/i386/include/compose.inc 2002-11-22 17:36:32.000000000 -0500 +@@ -0,0 +1,8 @@ ++# We map the PrintScreen key (useless) and Alt+AltGr to the Compose key... ++# A really useful thing not found on normal keyboards. :/ ++# ++# (c) 2001 Bernhard Rosenkränzer ++ ++keycode 99 = Compose # SysRq/PrintScrn ++keycode 100 = AltGr ++alt keycode 100 = Compose +--- kbd-1.08/data/keymaps/i386/include/qwerty-layout.inc 2002-10-11 07:08:50.000000000 -0400 ++++ kbd-1.08/data/keymaps/i386/include/qwerty-layout.inc 2002-11-22 17:36:32.000000000 -0500 +@@ -28,3 +28,4 @@ + keycode 49 = n + keycode 50 = m + # ++include "compose" +--- kbd-1.08/data/keymaps/i386/include/qwertz-layout.inc 2002-10-11 07:08:50.000000000 -0400 ++++ kbd-1.08/data/keymaps/i386/include/qwertz-layout.inc 2002-11-22 17:36:32.000000000 -0500 +@@ -28,3 +28,4 @@ + keycode 49 = n + keycode 50 = m + # ++include "compose" +--- kbd-1.08/data/keymaps/i386/include/linux-with-alt-and-altgr.inc 2002-10-11 07:08:50.000000000 -0400 ++++ kbd-1.08/data/keymaps/i386/include/linux-with-alt-and-altgr.inc 2002-11-22 17:36:32.000000000 -0500 +@@ -1,6 +1,7 @@ + include "linux-keys-bare" + + keycode 100 = AltGr ++alt keycode 100 = Compose + + altgr keycode 70 = Show_Registers + alt keycode 70 = Scroll_Lock +--- kbd-1.08/data/keymaps/i386/include/linux-keys-bare.inc 2002-10-12 20:14:06.000000000 -0400 ++++ kbd-1.08/data/keymaps/i386/include/linux-keys-bare.inc 2002-11-22 17:42:04.000000000 -0500 +@@ -148,7 +148,8 @@ + # The three system keys + # + keycode 84 = Last_Console # Alt+SysRq/PrintScrn +-keycode 99 = VoidSymbol # SysRq/PrintScrn ++#keycode 99 = VoidSymbol # SysRq/PrintScrn ++keycode 99 = Compose # SysRq/PrintScrn + alt keycode 99 = Control_backslash + control keycode 99 = Control_backslash + diff --git a/kbd-1.08-rukbd.patch b/kbd-1.08-rukbd.patch new file mode 100644 index 0000000..c305aba --- /dev/null +++ b/kbd-1.08-rukbd.patch @@ -0,0 +1,898 @@ +--- kbd-1.08/data/keymaps/i386/qwerty/ru.map.orig 2003-07-30 12:00:51.000000000 -0400 ++++ kbd-1.08/data/keymaps/i386/qwerty/ru.map 2003-07-30 12:01:08.000000000 -0400 +@@ -1,287 +1,609 @@ +-! Russian Cyrillic keyboard.map. "Cyrillic" mode is toggled by +-! Right_Ctrl key and shifted by AltGr key. +-keymaps 0-4,6,8,10,12 +-strings as usual ++# ru-uni_ct_sh.kmap is a Russian UTF-8 keymap for a 102 key keyboard. ++# ++# WARNING: This keymap contain only Russian characters (GOST 19768-74). ++# ++# Both Ctrl+Shift is used to change rus/lat ++# ++# Made by Sergey A. Sukiyazov ++# Engenering Center Micom Ltd., Russia, Rostov-on-Don ++# ++#------------------------------------------------------------------------------- ++ keycode 0 = ++ keycode 1 = Escape ++ shift keycode 1 = Escape ++ alt keycode 1 = Meta_Escape ++altgr keycode 1 = Escape ++altgr shift keycode 1 = Escape ++altgr alt keycode 1 = Meta_Escape ++ keycode 2 = one ++ shift keycode 2 = exclam ++ alt keycode 2 = Meta_one ++ shift alt keycode 2 = Meta_exclam ++altgr keycode 2 = one ++altgr shift keycode 2 = exclam ++altgr alt keycode 2 = Meta_one ++altgr shift alt keycode 2 = Meta_exclam ++ keycode 3 = two ++ shift keycode 3 = at ++ alt keycode 3 = Meta_two ++ shift alt keycode 3 = Meta_at ++ control keycode 3 = nul ++altgr keycode 3 = two ++altgr shift keycode 3 = quotedbl ++altgr alt keycode 3 = Meta_two ++altgr shift alt keycode 3 = Meta_at ++altgr control keycode 3 = nul ++ keycode 4 = three ++ shift keycode 4 = numbersign ++ alt keycode 4 = Meta_three ++ shift alt keycode 4 = Meta_numbersign ++ control keycode 4 = Escape ++altgr keycode 4 = three ++altgr shift keycode 4 = numbersign ++altgr alt keycode 4 = Meta_three ++altgr shift alt keycode 4 = Meta_numbersign ++altgr control keycode 4 = Escape ++ keycode 5 = four ++ shift keycode 5 = dollar ++ alt keycode 5 = Meta_four ++ shift alt keycode 5 = Meta_dollar ++ control keycode 5 = Control_backslash ++altgr keycode 5 = four ++altgr shift keycode 5 = semicolon ++altgr alt keycode 5 = Meta_four ++altgr shift alt keycode 5 = Meta_dollar ++altgr control keycode 5 = Control_backslash ++ keycode 6 = five ++ shift keycode 6 = percent ++ alt keycode 6 = Meta_five ++ shift alt keycode 6 = Meta_percent ++ control keycode 6 = Control_bracketright ++altgr keycode 6 = five ++altgr shift keycode 6 = percent ++altgr alt keycode 6 = Meta_five ++altgr shift alt keycode 6 = Meta_percent ++altgr control keycode 6 = Control_bracketright ++ keycode 7 = six ++ shift keycode 7 = asciicircum ++ alt keycode 7 = Meta_six ++ shift alt keycode 7 = Meta_asciicircum ++ control keycode 7 = Control_asciicircum ++altgr keycode 7 = six ++altgr shift keycode 7 = colon ++altgr alt keycode 7 = Meta_six ++altgr shift alt keycode 7 = Meta_asciicircum ++altgr control keycode 7 = Control_asciicircum ++ keycode 8 = seven ++ shift keycode 8 = ampersand ++ alt keycode 8 = Meta_seven ++ shift alt keycode 8 = Meta_ampersand ++ control keycode 8 = Control_underscore ++altgr keycode 8 = seven ++altgr shift keycode 8 = question ++altgr alt keycode 8 = Meta_seven ++altgr shift alt keycode 8 = Meta_ampersand ++altgr control keycode 8 = Control_underscore ++ keycode 9 = eight ++ shift keycode 9 = asterisk ++ alt keycode 9 = Meta_eight ++ shift alt keycode 9 = Meta_asterisk ++ control keycode 9 = Delete ++altgr keycode 9 = eight ++altgr shift keycode 9 = asterisk ++altgr alt keycode 9 = Meta_eight ++altgr shift alt keycode 9 = Meta_asterisk ++altgr control keycode 9 = Delete ++ keycode 10 = nine ++ shift keycode 10 = parenleft ++ alt keycode 10 = Meta_nine ++ shift alt keycode 10 = Meta_parenleft ++altgr keycode 10 = nine ++altgr shift keycode 10 = parenleft ++altgr alt keycode 10 = Meta_nine ++altgr shift alt keycode 10 = Meta_parenleft ++ keycode 11 = zero ++ shift keycode 11 = parenright ++ alt keycode 11 = Meta_zero ++ shift alt keycode 11 = Meta_parenright ++altgr keycode 11 = zero ++altgr shift keycode 11 = parenright ++altgr alt keycode 11 = Meta_zero ++altgr shift alt keycode 11 = Meta_parenright ++ keycode 12 = minus ++ shift keycode 12 = underscore ++ alt keycode 12 = Meta_minus ++ shift alt keycode 12 = Meta_underscore ++ control keycode 12 = Control_underscore ++altgr keycode 12 = minus ++altgr shift keycode 12 = underscore ++altgr alt keycode 12 = Meta_minus ++altgr shift alt keycode 12 = Meta_underscore ++altgr control keycode 12 = Control_underscore ++ keycode 13 = equal ++ shift keycode 13 = plus ++ alt keycode 13 = Meta_equal ++ shift alt keycode 13 = Meta_plus ++altgr keycode 13 = equal ++altgr shift keycode 13 = plus ++altgr alt keycode 13 = Meta_equal ++altgr shift alt keycode 13 = Meta_plus ++ keycode 14 = Delete ++ shift keycode 14 = Delete ++ alt keycode 14 = Meta_Delete ++altgr keycode 14 = Delete ++altgr shift keycode 14 = Delete ++altgr alt keycode 14 = Meta_Delete ++ keycode 15 = Tab ++ shift keycode 15 = Tab ++ alt keycode 15 = Meta_Tab ++altgr keycode 15 = Tab ++altgr shift keycode 15 = Tab ++altgr alt keycode 15 = Meta_Tab ++ keycode 16 = +q ++ shift keycode 16 = +Q ++altgr keycode 16 = U+0439 # CYRILLIC SMALL LETTER SHORT I ++altgr shift keycode 16 = U+0419 # CYRILLIC CAPITAL LETTER SHORT I ++ keycode 17 = +w ++ shift keycode 17 = +W ++altgr keycode 17 = U+0446 # CYRILLIC SMALL LETTER TSE ++altgr shift keycode 17 = U+0426 # CYRILLIC CAPITAL LETTER TSE ++ keycode 18 = +e ++ shift keycode 18 = +E ++altgr keycode 18 = U+0443 # CYRILLIC SMALL LETTER U ++altgr shift keycode 18 = U+0423 # CYRILLIC CAPITAL LETTER U ++ keycode 19 = +r ++ shift keycode 19 = +R ++altgr keycode 19 = U+043A # CYRILLIC SMALL LETTER KA ++altgr shift keycode 19 = U+041A # CYRILLIC CAPITAL LETTER KA ++ keycode 20 = +t ++ shift keycode 20 = +T ++altgr keycode 20 = U+0435 # CYRILLIC SMALL LETTER IE ++altgr shift keycode 20 = U+0415 # CYRILLIC CAPITAL LETTER IE ++ keycode 21 = +y ++ shift keycode 21 = +Y ++altgr keycode 21 = U+043D # CYRILLIC SMALL LETTER EN ++altgr shift keycode 21 = U+041D # CYRILLIC CAPITAL LETTER EN ++ keycode 22 = +u ++ shift keycode 22 = +U ++altgr keycode 22 = U+0433 # CYRILLIC SMALL LETTER GHE ++altgr shift keycode 22 = U+0413 # CYRILLIC CAPITAL LETTER GHE ++ keycode 23 = +i ++ shift keycode 23 = +I ++altgr keycode 23 = U+0448 # CYRILLIC SMALL LETTER SHA ++altgr shift keycode 23 = U+0428 # CYRILLIC CAPITAL LETTER SHA ++ keycode 24 = +o ++ shift keycode 24 = +O ++altgr keycode 24 = U+0449 # CYRILLIC SMALL LETTER SHCHA ++altgr shift keycode 24 = U+0429 # CYRILLIC CAPITAL LETTER SHCHA ++ keycode 25 = +p ++ shift keycode 25 = +P ++altgr keycode 25 = U+0437 # CYRILLIC SMALL LETTER ZE ++altgr shift keycode 25 = U+0417 # CYRILLIC CAPITAL LETTER ZE ++ keycode 26 = bracketleft ++ shift keycode 26 = braceleft ++ alt keycode 26 = Meta_bracketleft ++ control keycode 26 = Escape ++altgr keycode 26 = U+0445 # CYRILLIC SMALL LETTER HA ++altgr shift keycode 26 = U+0425 # CYRILLIC CAPITAL LETTER HA ++altgr alt keycode 26 = Meta_bracketleft ++altgr control keycode 26 = Escape ++ keycode 27 = bracketright ++ shift keycode 27 = braceright ++ alt keycode 27 = Meta_bracketright ++ control keycode 27 = Control_bracketright ++altgr keycode 27 = U+044A # CYRILLIC SMALL LETTER HARD SIGN ++altgr shift keycode 27 = U+042A # CYRILLIC CAPITAL LETTER HARD SIGN ++altgr alt keycode 27 = Meta_bracketright ++altgr control keycode 27 = Control_bracketright ++ keycode 28 = Return ++ shift keycode 28 = Return ++ alt keycode 28 = 0x080d ++ control keycode 28 = Linefeed ++altgr keycode 28 = Return ++altgr shift keycode 28 = Return ++altgr alt keycode 28 = 0x080d ++altgr control keycode 28 = Linefeed ++ keycode 29 = Control ++ shift keycode 29 = AltGr_Lock ++altgr shift keycode 29 = AltGr_Lock ++ keycode 30 = +a ++ shift keycode 30 = +A ++altgr keycode 30 = U+0444 # CYRILLIC SMALL LETTER EF ++altgr shift keycode 30 = U+0424 # CYRILLIC CAPITAL LETTER EF ++ keycode 31 = +s ++ shift keycode 31 = +S ++altgr keycode 31 = U+044B # CYRILLIC SMALL LETTER YERU ++altgr shift keycode 31 = U+042B # CYRILLIC CAPITAL LETTER YERU ++ keycode 32 = +d ++ shift keycode 32 = +D ++altgr keycode 32 = U+0432 # CYRILLIC SMALL LETTER VE ++altgr shift keycode 32 = U+0412 # CYRILLIC CAPITAL LETTER VE ++ keycode 33 = +f ++ shift keycode 33 = +F ++altgr keycode 33 = U+0430 # CYRILLIC SMALL LETTER A ++altgr shift keycode 33 = U+0410 # CYRILLIC CAPITAL LETTER A ++ keycode 34 = +g ++ shift keycode 34 = +G ++altgr keycode 34 = U+043F # CYRILLIC SMALL LETTER PE ++altgr shift keycode 34 = U+041F # CYRILLIC CAPITAL LETTER PE ++ keycode 35 = +h ++ shift keycode 35 = +H ++altgr keycode 35 = U+0440 # CYRILLIC SMALL LETTER ER ++altgr shift keycode 35 = U+0420 # CYRILLIC CAPITAL LETTER ER ++ keycode 36 = +j ++ shift keycode 36 = +J ++altgr keycode 36 = U+043E # CYRILLIC SMALL LETTER O ++altgr shift keycode 36 = U+041E # CYRILLIC CAPITAL LETTER O ++ keycode 37 = +k ++ shift keycode 37 = +K ++altgr keycode 37 = U+043B # CYRILLIC SMALL LETTER EL ++altgr shift keycode 37 = U+041B # CYRILLIC CAPITAL LETTER EL ++ keycode 38 = +l ++ shift keycode 38 = +L ++altgr keycode 38 = U+0434 # CYRILLIC SMALL LETTER DE ++altgr shift keycode 38 = U+0414 # CYRILLIC CAPITAL LETTER DE ++ keycode 39 = semicolon ++ shift keycode 39 = colon ++ alt keycode 39 = Meta_semicolon ++altgr keycode 39 = U+0436 # CYRILLIC SMALL LETTER ZHE ++altgr shift keycode 39 = U+0416 # CYRILLIC CAPITAL LETTER ZHE ++altgr alt keycode 39 = Meta_semicolon ++ keycode 40 = apostrophe ++ shift keycode 40 = quotedbl ++ alt keycode 40 = Meta_apostrophe ++ control keycode 40 = Control_g ++altgr keycode 40 = U+044D # CYRILLIC SMALL LETTER E ++altgr shift keycode 40 = U+042D # CYRILLIC CAPITAL LETTER E ++altgr alt keycode 40 = Meta_apostrophe ++altgr control keycode 40 = Control_g ++ keycode 41 = grave ++ shift keycode 41 = asciitilde ++ alt keycode 41 = Meta_grave ++ control keycode 41 = nul ++altgr keycode 41 = U+0451 # CYRILLIC SMALL LETTER IO ++altgr shift keycode 41 = U+0401 # CYRILLIC CAPITAL LETTER IO ++altgr alt keycode 41 = Meta_grave ++ keycode 42 = Shift ++ control keycode 42 = AltGr_Lock ++altgr control keycode 42 = AltGr_Lock ++ keycode 43 = backslash ++ shift keycode 43 = bar ++ alt keycode 43 = Meta_backslash ++ shift alt keycode 43 = Meta_bar ++ control keycode 43 = Control_backslash ++altgr keycode 43 = backslash ++altgr shift keycode 43 = bar ++altgr alt keycode 43 = Meta_backslash ++altgr shift alt keycode 43 = Meta_bar ++altgr control keycode 43 = Control_backslash ++ keycode 44 = +z ++ shift keycode 44 = +Z ++altgr keycode 44 = U+044F # CYRILLIC SMALL LETTER YA ++altgr shift keycode 44 = U+042F # CYRILLIC CAPITAL LETTER YA ++ keycode 45 = +x ++ shift keycode 45 = +X ++altgr keycode 45 = U+0447 # CYRILLIC SMALL LETTER CHE ++altgr shift keycode 45 = U+0427 # CYRILLIC CAPITAL LETTER CHE ++ keycode 46 = +c ++ shift keycode 46 = +C ++altgr keycode 46 = U+0441 # CYRILLIC SMALL LETTER ES ++altgr shift keycode 46 = U+0421 # CYRILLIC CAPITAL LETTER ES ++ keycode 47 = +v ++ shift keycode 47 = +V ++altgr keycode 47 = U+043C # CYRILLIC SMALL LETTER EM ++altgr shift keycode 47 = U+041C # CYRILLIC CAPITAL LETTER EM ++ keycode 48 = +b ++ shift keycode 48 = +B ++altgr keycode 48 = U+0438 # CYRILLIC SMALL LETTER I ++altgr shift keycode 48 = U+0418 # CYRILLIC CAPITAL LETTER I ++ keycode 49 = +n ++ shift keycode 49 = +N ++altgr keycode 49 = U+0442 # CYRILLIC SMALL LETTER TE ++altgr shift keycode 49 = U+0422 # CYRILLIC CAPITAL LETTER TE ++ keycode 50 = +m ++ shift keycode 50 = +M ++altgr keycode 50 = U+044C # CYRILLIC SMALL LETTER SOFT SIGN ++altgr shift keycode 50 = U+042C # CYRILLIC CAPITAL LETTER SOFT SIGN ++ keycode 51 = comma ++ shift keycode 51 = less ++ alt keycode 51 = Meta_comma ++ shift alt keycode 51 = Meta_less ++altgr keycode 51 = U+0431 # CYRILLIC SMALL LETTER BE ++altgr shift keycode 51 = U+0411 # CYRILLIC CAPITAL LETTER BE ++altgr alt keycode 51 = Meta_comma ++altgr shift alt keycode 51 = Meta_less ++ keycode 52 = period ++ shift keycode 52 = greater ++ alt keycode 52 = Meta_period ++ shift alt keycode 52 = Meta_greater ++altgr keycode 52 = U+044E # CYRILLIC SMALL LETTER YU ++altgr shift keycode 52 = U+042E # CYRILLIC CAPITAL LETTER YU ++altgr alt keycode 52 = Meta_period ++altgr shift alt keycode 52 = Meta_greater ++ keycode 53 = slash ++ shift keycode 53 = question ++ alt keycode 53 = Meta_slash ++ shift alt keycode 53 = Meta_question ++ control keycode 53 = Delete ++altgr keycode 53 = period ++altgr shift keycode 53 = comma ++altgr alt keycode 53 = Meta_slash ++altgr shift alt keycode 53 = Meta_question ++altgr control keycode 53 = Delete ++ keycode 54 = Shift ++ control keycode 54 = AltGr_Lock ++altgr control keycode 54 = AltGr_Lock ++ keycode 55 = KP_Multiply ++ keycode 56 = Alt ++ keycode 57 = space ++ shift keycode 57 = space ++ alt keycode 57 = Meta_space ++ control keycode 57 = nul ++altgr keycode 57 = space ++altgr shift keycode 57 = space ++altgr alt keycode 57 = Meta_space ++altgr control keycode 57 = nul ++ keycode 58 = Caps_Lock ++ keycode 59 = F1 ++ shift keycode 59 = F11 ++ alt keycode 59 = Console_1 ++ control keycode 59 = F1 ++ control alt keycode 59 = Console_1 ++altgr keycode 59 = F1 ++altgr shift keycode 59 = F11 ++altgr alt keycode 59 = Console_1 ++altgr control keycode 59 = F1 ++altgr control alt keycode 59 = Console_1 ++ keycode 60 = F2 ++ shift keycode 60 = F12 ++ alt keycode 60 = Console_2 ++ control keycode 60 = F2 ++ control alt keycode 60 = Console_2 ++altgr keycode 60 = F2 ++altgr shift keycode 60 = F12 ++altgr alt keycode 60 = Console_2 ++altgr control keycode 60 = F2 ++altgr control alt keycode 60 = Console_2 ++ keycode 61 = F3 ++ shift keycode 61 = F13 ++ alt keycode 61 = Console_3 ++ control keycode 61 = F3 ++ control alt keycode 61 = Console_3 ++altgr keycode 61 = F3 ++altgr shift keycode 61 = F13 ++altgr alt keycode 61 = Console_3 ++altgr control keycode 61 = F3 ++altgr control alt keycode 61 = Console_3 ++ keycode 62 = F4 ++ shift keycode 62 = F14 ++ alt keycode 62 = Console_4 ++ control keycode 62 = F4 ++ control alt keycode 62 = Console_4 ++altgr keycode 62 = F4 ++altgr shift keycode 62 = F14 ++altgr alt keycode 62 = Console_4 ++altgr control keycode 62 = F4 ++altgr control alt keycode 62 = Console_4 ++ keycode 63 = F5 ++ shift keycode 63 = F15 ++ alt keycode 63 = Console_5 ++ control keycode 63 = F5 ++ control alt keycode 63 = Console_5 ++altgr keycode 63 = F5 ++altgr shift keycode 63 = F15 ++altgr alt keycode 63 = Console_5 ++altgr control keycode 63 = F5 ++altgr control alt keycode 63 = Console_5 ++ keycode 64 = F6 ++ shift keycode 64 = F16 ++ alt keycode 64 = Console_6 ++ control keycode 64 = F6 ++ control alt keycode 64 = Console_6 ++altgr keycode 64 = F6 ++altgr shift keycode 64 = F16 ++altgr alt keycode 64 = Console_6 ++altgr control keycode 64 = F6 ++altgr control alt keycode 64 = Console_6 ++ keycode 65 = F7 ++ shift keycode 65 = F17 ++ alt keycode 65 = Console_7 ++ control keycode 65 = F7 ++ control alt keycode 65 = Console_7 ++altgr keycode 65 = F7 ++altgr shift keycode 65 = F17 ++altgr alt keycode 65 = Console_7 ++altgr control keycode 65 = F7 ++altgr control alt keycode 65 = Console_7 ++ keycode 66 = F8 ++ shift keycode 66 = F18 ++ alt keycode 66 = Console_8 ++ control keycode 66 = F8 ++ control alt keycode 66 = Console_8 ++altgr keycode 66 = F8 ++altgr shift keycode 66 = F18 ++altgr alt keycode 66 = Console_8 ++altgr control keycode 66 = F8 ++altgr control alt keycode 66 = Console_8 ++ keycode 67 = F9 ++ shift keycode 67 = F19 ++ alt keycode 67 = Console_9 ++ control keycode 67 = F9 ++ control alt keycode 67 = Console_9 ++altgr keycode 67 = F9 ++altgr shift keycode 67 = F19 ++altgr alt keycode 67 = Console_9 ++altgr control keycode 67 = F9 ++altgr control alt keycode 67 = Console_9 ++ keycode 68 = F10 ++ shift keycode 68 = F20 ++ alt keycode 68 = Console_10 ++ control keycode 68 = F10 ++ control alt keycode 68 = Console_10 ++altgr keycode 68 = F10 ++altgr shift keycode 68 = F20 ++altgr alt keycode 68 = Console_10 ++altgr control keycode 68 = F10 ++altgr control alt keycode 68 = Console_10 ++ keycode 69 = Num_Lock ++ keycode 70 = Scroll_Lock ++ shift keycode 70 = Show_Memory ++ alt keycode 70 = Show_Registers ++ control keycode 70 = Show_State ++altgr keycode 70 = Scroll_Lock ++altgr shift keycode 70 = Show_Memory ++altgr alt keycode 70 = Show_Registers ++altgr control keycode 70 = Show_State ++ keycode 71 = KP_7 ++ alt keycode 71 = Ascii_7 ++altgr alt keycode 71 = Ascii_7 ++ keycode 72 = KP_8 ++ alt keycode 72 = Ascii_8 ++altgr alt keycode 72 = Ascii_8 ++ keycode 73 = KP_9 ++ alt keycode 73 = Ascii_9 ++altgr alt keycode 73 = Ascii_9 ++ keycode 74 = KP_Subtract ++ keycode 75 = KP_4 ++ alt keycode 75 = Ascii_4 ++altgr alt keycode 75 = Ascii_4 ++ keycode 76 = KP_5 ++ alt keycode 76 = Ascii_5 ++altgr alt keycode 76 = Ascii_5 ++ keycode 77 = KP_6 ++ alt keycode 77 = Ascii_6 ++altgr alt keycode 77 = Ascii_6 ++ keycode 78 = KP_Add ++ keycode 79 = KP_1 ++ alt keycode 79 = Ascii_1 ++altgr alt keycode 79 = Ascii_1 ++ keycode 80 = KP_2 ++ alt keycode 80 = Ascii_2 ++altgr alt keycode 80 = Ascii_2 ++ keycode 81 = KP_3 ++ alt keycode 81 = Ascii_3 ++altgr alt keycode 81 = Ascii_3 ++ keycode 82 = KP_0 ++ alt keycode 82 = Ascii_0 ++altgr alt keycode 82 = Ascii_0 ++ keycode 83 = KP_Period ++ control alt keycode 83 = Boot ++altgr control keycode 83 = Boot ++altgr control alt keycode 83 = Boot ++ keycode 84 = Last_Console ++ keycode 85 = ++ keycode 86 = less ++ shift keycode 86 = greater ++ alt keycode 86 = Meta_less ++altgr keycode 86 = bar ++altgr shift keycode 86 = greater ++altgr alt keycode 86 = Meta_less ++ keycode 87 = F11 ++ shift keycode 87 = F11 ++ alt keycode 87 = Console_11 ++ control keycode 87 = F11 ++ control alt keycode 87 = Console_11 ++altgr keycode 87 = F11 ++altgr shift keycode 87 = F11 ++altgr alt keycode 87 = Console_11 ++altgr control keycode 87 = F11 ++altgr control alt keycode 87 = Console_11 ++ keycode 88 = F12 ++ shift keycode 88 = F12 ++ alt keycode 88 = Console_12 ++ control keycode 88 = F12 ++ control alt keycode 88 = Console_12 ++altgr keycode 88 = F12 ++altgr shift keycode 88 = F12 ++altgr alt keycode 88 = Console_12 ++altgr control keycode 88 = F12 ++altgr control alt keycode 88 = Console_12 ++ keycode 89 = ++ keycode 90 = ++ keycode 91 = ++ keycode 92 = ++ keycode 93 = ++ keycode 94 = ++ keycode 95 = ++ keycode 96 = KP_Enter ++ keycode 97 = Control ++ shift keycode 97 = AltGr_Lock ++altgr shift keycode 97 = AltGr_Lock ++ keycode 98 = KP_Divide ++ keycode 99 = Control_backslash ++ alt keycode 99 = Control_backslash ++ control keycode 99 = Control_backslash ++altgr keycode 99 = Control_backslash ++altgr alt keycode 99 = Control_backslash ++altgr control keycode 99 = Control_backslash ++ keycode 100 = AltGr ++ keycode 101 = Break ++ keycode 102 = Find ++ keycode 103 = Up ++ keycode 104 = Prior ++ shift keycode 104 = Scroll_Backward ++altgr shift keycode 104 = Scroll_Backward ++ keycode 105 = Left ++ alt keycode 105 = Decr_Console ++altgr alt keycode 105 = Decr_Console ++ keycode 106 = Right ++ alt keycode 106 = Incr_Console ++altgr alt keycode 106 = Incr_Console ++ keycode 107 = Select ++ keycode 108 = Down ++ keycode 109 = Next ++ shift keycode 109 = Scroll_Forward ++altgr shift keycode 109 = Scroll_Forward ++ keycode 110 = Insert ++ keycode 111 = Remove ++ control alt keycode 111 = Boot ++altgr control keycode 111 = Boot ++altgr control alt keycode 111 = Boot ++ keycode 112 = ++ keycode 113 = ++ keycode 114 = ++ keycode 115 = ++ keycode 116 = ++ keycode 117 = ++ keycode 118 = ++ keycode 119 = ++ keycode 120 = ++ keycode 121 = ++ keycode 122 = ++ keycode 123 = ++ keycode 124 = ++ keycode 125 = ++ keycode 126 = ++ keycode 127 = + +- keycode 1 = Escape Escape Escape Escape +- alt keycode 1 = Meta_Escape +- keycode 2 = one exclam one exclam +- alt keycode 2 = Meta_one +- keycode 3 = two at two quotedbl +- control keycode 3 = nul +- alt keycode 3 = Meta_two +- keycode 4 = three numbersign three question +- control keycode 4 = Escape +- alt keycode 4 = Meta_three +- keycode 5 = four dollar four semicolon +- control keycode 5 = Control_backslash +- alt keycode 5 = Meta_four +- keycode 6 = five percent five colon +- control keycode 6 = Control_bracketright +- alt keycode 6 = Meta_five +- keycode 7 = six asciicircum six comma +- control keycode 7 = Control_asciicircum +- alt keycode 7 = Meta_six +- keycode 8 = seven ampersand seven period +- control keycode 8 = Control_underscore +- alt keycode 8 = Meta_seven +- keycode 9 = eight asterisk eight asterisk +- control keycode 9 = Delete +- alt keycode 9 = Meta_eight +- keycode 10 = nine parenleft nine parenleft +- alt keycode 10 = Meta_nine +- keycode 11 = zero parenright zero parenright +- alt keycode 11 = Meta_zero +- keycode 12 = minus underscore minus underscore +- control keycode 12 = Control_underscore +- alt keycode 12 = Meta_minus +- keycode 13 = equal plus equal plus +- alt keycode 13 = Meta_equal +- keycode 14 = BackSpace BackSpace BackSpace BackSpace +- alt keycode 14 = Meta_Delete +- keycode 15 = Tab Tab Tab Tab +- alt keycode 15 = Meta_Tab +- keycode 16 = +q +Q +202 +234 +- control keycode 16 = Control_q +-altgr control keycode 16 = Control_q +- keycode 17 = +w +W +195 +227 +- control keycode 17 = Control_w +-altgr control keycode 17 = Control_w +- keycode 18 = +e +E +213 +245 +- control keycode 18 = Control_e +-altgr control keycode 18 = Control_e +- keycode 19 = +r +R +203 +235 +- control keycode 19 = Control_r +-altgr control keycode 19 = Control_r +- keycode 20 = +t +T +197 +229 +- control keycode 20 = Control_t +-altgr control keycode 20 = Control_t +- keycode 21 = +y +Y +206 +238 +- control keycode 21 = Control_y +-altgr control keycode 21 = Control_y +- keycode 22 = +u +U +199 +231 +- control keycode 22 = Control_u +-altgr control keycode 22 = Control_u +- keycode 23 = +i +I +219 +251 +- control keycode 23 = Tab +-altgr control keycode 23 = Tab +- keycode 24 = +o +O +221 +253 +- control keycode 24 = Control_o +-altgr control keycode 24 = Control_o +- keycode 25 = +p +P +218 +250 +- control keycode 25 = Control_p +-altgr control keycode 25 = Control_p +- keycode 26 = bracketleft braceleft +200 +232 +- control keycode 26 = Escape +-altgr control keycode 26 = Escape +- alt keycode 26 = Meta_bracketleft +- keycode 27 = bracketright braceright bracketleft bracketright +- control keycode 27 = Control_bracketright +-altgr control keycode 27 = Control_bracketright +- alt keycode 27 = Meta_bracketright +- keycode 28 = Return +- alt keycode 28 = Meta_Control_m +- keycode 29 = Control +- keycode 30 = +a +A +198 +230 +- control keycode 30 = Control_a +-altgr control keycode 30 = Control_a +- keycode 31 = +s +S +217 +249 +- control keycode 31 = Control_s +-altgr control keycode 31 = Control_s +- keycode 32 = +d +D +215 +247 +- control keycode 32 = Control_d +-altgr control keycode 32 = Control_d +- keycode 33 = +f +F +193 +225 +- control keycode 33 = Control_f +-altgr control keycode 33 = Control_f +- keycode 34 = +g +G +208 +240 +- control keycode 34 = Control_g +-altgr control keycode 34 = Control_g +- keycode 35 = +h +H +210 +242 +- control keycode 35 = BackSpace +-altgr control keycode 35 = BackSpace +- keycode 36 = +j +J +207 +239 +- control keycode 36 = Linefeed +-altgr control keycode 36 = Linefeed +- keycode 37 = +k +K +204 +236 +- control keycode 37 = Control_k +-altgr control keycode 37 = Control_k +- keycode 38 = +l +L +196 +228 +- control keycode 38 = Control_l +-altgr control keycode 38 = Control_l +- keycode 39 = semicolon colon +214 +246 +- alt keycode 39 = Meta_semicolon +- keycode 40 = apostrophe quotedbl +220 +252 +- control keycode 40 = Control_g +-altgr control keycode 40 = Control_g +- alt keycode 40 = Meta_apostrophe +- keycode 41 = grave asciitilde +223 +255 +- control keycode 41 = nul +- alt keycode 41 = Meta_grave +- keycode 42 = Shift +- keycode 43 = backslash bar backslash bar +- control keycode 43 = Control_backslash +- alt keycode 43 = Meta_backslash +- keycode 44 = +z +Z +209 +241 +- control keycode 44 = Control_z +-altgr control keycode 44 = Control_z +- keycode 45 = +x +X +222 +254 +- control keycode 45 = Control_x +-altgr control keycode 45 = Control_x +- keycode 46 = +c +C +211 +243 +- control keycode 46 = Control_c +-altgr control keycode 46 = Control_c +- keycode 47 = +v +V +205 +237 +- control keycode 47 = Control_v +-altgr control keycode 47 = Control_v +- keycode 48 = +b +B +201 +233 +- control keycode 48 = Control_b +-altgr control keycode 48 = Control_b +- keycode 49 = +n +N +212 +244 +- control keycode 49 = Control_n +-altgr control keycode 49 = Control_n +- keycode 50 = +m +M +216 +248 +- control keycode 50 = Control_m +-altgr control keycode 50 = Control_m +- keycode 51 = comma less +194 +226 +- alt keycode 51 = Meta_comma +- keycode 52 = period greater +192 +224 +- alt keycode 52 = Meta_period +- keycode 53 = slash question +163 +179 +- control keycode 53 = Delete +- alt keycode 53 = Meta_slash +- keycode 54 = Shift +- keycode 55 = KP_Multiply +- keycode 56 = Alt +- keycode 57 = space space space space +- control keycode 57 = nul +- alt keycode 57 = Meta_space +- keycode 58 = Caps_Lock +- keycode 59 = F1 F11 F1 F11 +- control keycode 59 = F1 +- alt keycode 59 = Console_1 +-altgr alt keycode 59 = Console_1 +- keycode 60 = F2 F12 F2 F12 +- control keycode 60 = F2 +- alt keycode 60 = Console_2 +-altgr alt keycode 60 = Console_2 +- keycode 61 = F3 F13 F3 F13 +- control keycode 61 = F3 +- alt keycode 61 = Console_3 +-altgr alt keycode 61 = Console_3 +- keycode 62 = F4 F14 F4 F14 +- control keycode 62 = F4 +- alt keycode 62 = Console_4 +-altgr alt keycode 62 = Console_4 +- keycode 63 = F5 F15 F5 F15 +- control keycode 63 = F5 +- alt keycode 63 = Console_5 +-altgr alt keycode 63 = Console_5 +- keycode 64 = F6 F16 F6 F16 +- control keycode 64 = F6 +- alt keycode 64 = Console_6 +-altgr alt keycode 64 = Console_6 +- keycode 65 = F7 F17 F7 F17 +- control keycode 65 = F7 +- alt keycode 65 = Console_7 +-altgr alt keycode 65 = Console_7 +- keycode 66 = F8 F18 F8 F18 +- control keycode 66 = F8 +- alt keycode 66 = Console_8 +-altgr alt keycode 66 = Console_8 +- keycode 67 = F9 F19 F9 F19 +- control keycode 67 = F9 +- alt keycode 67 = Console_9 +-altgr alt keycode 67 = Console_9 +- keycode 68 = F10 F20 F10 F20 +- control keycode 68 = F10 +- alt keycode 68 = Console_10 +-altgr alt keycode 68 = Console_10 +- keycode 69 = Num_Lock +- keycode 70 = Scroll_Lock Show_Memory Show_Registers +- control keycode 70 = Show_State +- alt keycode 70 = Scroll_Lock +- keycode 71 = KP_7 +- alt keycode 71 = Ascii_7 +- keycode 72 = KP_8 +- alt keycode 72 = Ascii_8 +- keycode 73 = KP_9 +- alt keycode 73 = Ascii_9 +- keycode 74 = KP_Subtract +- keycode 75 = KP_4 +- alt keycode 75 = Ascii_4 +- keycode 76 = KP_5 +- alt keycode 76 = Ascii_5 +- keycode 77 = KP_6 +- alt keycode 77 = Ascii_6 +- keycode 78 = KP_Add +- keycode 79 = KP_1 +- alt keycode 79 = Ascii_1 +- keycode 80 = KP_2 +- alt keycode 80 = Ascii_2 +- keycode 81 = KP_3 +- alt keycode 81 = Ascii_3 +- keycode 82 = KP_0 +- alt keycode 82 = Ascii_0 +- keycode 83 = KP_Period +-altgr control keycode 83 = Boot +-control alt keycode 83 = Boot +- keycode 84 = Last_Console +- keycode 85 = +- keycode 86 = less greater bar +- alt keycode 86 = Meta_less +- keycode 87 = F11 F11 F11 F11 +- control keycode 87 = F11 +- alt keycode 87 = Console_11 +-altgr alt keycode 87 = Console_11 +- keycode 88 = F12 F12 F12 F12 +- control keycode 88 = F12 +- alt keycode 88 = Console_12 +-altgr alt keycode 88 = Console_12 +- keycode 89 = +- keycode 90 = +- keycode 91 = +- keycode 92 = +- keycode 93 = +- keycode 94 = +- keycode 95 = +- keycode 96 = KP_Enter +- keycode 97 = AltGr_Lock +- keycode 98 = KP_Divide +- keycode 99 = VoidSymbol +- control keycode 99 = Control_backslash +- alt keycode 99 = Control_backslash +- keycode 100 = AltGr +- keycode 101 = Break +- keycode 102 = Find +- keycode 103 = Up +- keycode 104 = Prior +- shift keycode 104 = Scroll_Backward +- keycode 105 = Left +- alt keycode 105 = Decr_Console +- keycode 106 = Right +- alt keycode 106 = Incr_Console +- keycode 107 = Select +- keycode 108 = Down +- keycode 109 = Next +- shift keycode 109 = Scroll_Forward +- keycode 110 = Insert +- keycode 111 = Remove +-altgr control keycode 111 = Boot +-control alt keycode 111 = Boot +- keycode 112 = +- keycode 113 = +- keycode 114 = +- keycode 115 = +- keycode 116 = +- keycode 117 = +- keycode 118 = +- keycode 119 = +- keycode 120 = +- keycode 121 = +- keycode 122 = +- keycode 123 = +- keycode 124 = +- keycode 125 = +- keycode 126 = +- keycode 127 = ++string F1 = "\033[[A" ++string F2 = "\033[[B" ++string F3 = "\033[[C" ++string F4 = "\033[[D" ++string F5 = "\033[[E" ++string F6 = "\033[17~" ++string F7 = "\033[18~" ++string F8 = "\033[19~" ++string F9 = "\033[20~" ++string F10 = "\033[21~" ++string F11 = "\033[23~" ++string F12 = "\033[24~" ++string F13 = "\033[25~" ++string F14 = "\033[26~" ++string F15 = "\033[28~" ++string F16 = "\033[29~" ++string F17 = "\033[31~" ++string F18 = "\033[32~" ++string F19 = "\033[33~" ++string F20 = "\033[34~" ++string Find = "\033[1~" ++string Insert = "\033[2~" ++string Remove = "\033[3~" ++string Select = "\033[4~" ++string Prior = "\033[5~" ++string Next = "\033[6~" ++string F21 = "" ++string F22 = "" ++string F23 = "" ++string F24 = "" ++string F25 = "" ++string F26 = "" diff --git a/kbd-1.08-terminal.patch b/kbd-1.08-terminal.patch new file mode 100644 index 0000000..13aeeec --- /dev/null +++ b/kbd-1.08-terminal.patch @@ -0,0 +1,31 @@ +Output terminal control sequences only when output is a terminal. + +--- kbd-1.08/src/unicode_start 2002-11-22 19:23:00.000000000 -0500 ++++ kbd-1.08/src/unicode_start 2002-11-22 19:24:34.000000000 -0500 +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/bin/bash + # Enables Unicode processing in the current console. + # + # 1. The input side: the keyboard driver. +@@ -25,7 +25,9 @@ + # Tell the console output driver that the bytes arriving are UTF-8 + # encoded multibyte sequences. + +-echo -n -e '\033%G' ++if test -t 1 -a -t 2 ; then ++ echo -n -e '\033%G' ++fi + + # Tell the graphics card how to display Unicode characters not + # contained in the IBM 437 character set (on PCs). The font should +--- kbd-1.08/src/unicode_stop 2002-11-22 19:23:30.000000000 -0500 ++++ kbd-1.08/src/unicode_stop 2002-11-22 19:24:15.000000000 -0500 +@@ -1,4 +1,6 @@ + #!/bin/sh + # stop unicode + kbd_mode -a +-echo -n -e '\033%@' ++if test -t ; then ++ echo -n -e '\033%@' ++fi diff --git a/kbd-1.12-Meta_utf8.patch b/kbd-1.12-Meta_utf8.patch new file mode 100644 index 0000000..9bc68b6 --- /dev/null +++ b/kbd-1.12-Meta_utf8.patch @@ -0,0 +1,11 @@ +--- kbd-1.12/src/ksyms.c.org 2005-01-11 16:38:32.000000000 +0100 ++++ kbd-1.12/src/ksyms.c 2005-01-11 16:46:19.000000000 +0100 +@@ -1710,6 +1710,8 @@ + keycode = ksymtocode(s+5); + if (KTYP(keycode) == KT_LATIN) + return K(KT_META, KVAL(keycode)); ++ else if(prefer_unicode) ++ return (0); + /* fall through to error printf */ + } + diff --git a/kbd-1.12-alias.patch b/kbd-1.12-alias.patch new file mode 100644 index 0000000..30be4fa --- /dev/null +++ b/kbd-1.12-alias.patch @@ -0,0 +1,47 @@ +diff -u kbd-1.12/src/psffontop.c kbd-1.12/src/psffontop.c +--- kbd-1.12/src/psffontop.c 2005-03-12 00:48:30.075310872 +0100 ++++ kbd-1.12/src/psffontop.c 2005-05-14 10:49:59.000000000 +0900 +@@ -59,7 +59,6 @@ + + static unsigned int + assemble_ucs2(char **inptr, int cnt) { +- unsigned char **in = (unsigned char **) inptr; + unsigned int u1, u2; + + if (cnt < 2) { +@@ -68,8 +67,8 @@ + exit(EX_DATAERR); + } + +- u1 = *(*in)++; +- u2 = *(*in)++; ++ u1 = (unsigned char)*(*inptr)++; ++ u2 = (unsigned char)*(*inptr)++; + return (u1 | (u2 << 8)); + } + +@@ -110,7 +109,6 @@ + */ + static void + get_uni_entry(char **inptr, char **endptr, struct unicode_list *up, int utf8) { +- unsigned char **in = (unsigned char **) inptr; + unsigned char uc; + unicode unichar; + int inseq = 0; +@@ -126,14 +124,14 @@ + exit(EX_DATAERR); + } + if (utf8) { +- uc = *(*in)++; ++ uc = *(*inptr)++; + if (uc == PSF2_SEPARATOR) + break; + if (uc == PSF2_STARTSEQ) { + inseq = 1; + continue; + } +- --(*in); ++ --(*inptr); + unichar = assemble_utf8(inptr, *endptr - *inptr); + } else { + unichar = assemble_ucs2(inptr, *endptr - *inptr); diff --git a/kbd-1.12-dir.patch b/kbd-1.12-dir.patch new file mode 100644 index 0000000..0befee4 --- /dev/null +++ b/kbd-1.12-dir.patch @@ -0,0 +1,56 @@ +--- kbd-1.12/src/findfile.c.dir 2004-01-16 20:45:31.000000000 +0100 ++++ kbd-1.12/src/findfile.c 2005-05-20 15:36:45.000000000 +0200 +@@ -92,6 +92,7 @@ + if (d == NULL) + return NULL; + while ((de = readdir(d)) != NULL) { ++ struct stat statbuf; + int okdir; + + if (strcmp(de->d_name, ".") == 0 || +@@ -104,7 +105,6 @@ + okdir = (ff && strcmp(de->d_name, fdir) == 0); + + if ((secondpass && recdepth) || okdir) { +- struct stat statbuf; + char *a; + + a = xmalloc(strlen(dir) + strlen(de->d_name) + 2); +@@ -136,6 +136,8 @@ + continue; + + sprintf(pathname, "%s/%s", dir, de->d_name); ++ if (stat(pathname, &statbuf) != 0 || !S_ISREG(statbuf.st_mode)) ++ continue; + + /* Does tail consist of a known suffix and possibly + a compression suffix? */ +@@ -180,13 +182,16 @@ + /* Test for full pathname - opening it failed, so need suffix */ + /* (This is just nonsense, for backwards compatibility.) */ + if (*fnam == '/') { ++ struct stat statbuf; ++ + for (sp = suffixes; *sp; sp++) { + if (strlen(fnam) + strlen(*sp) + 1 > sizeof(pathname)) + continue; + if (*sp == 0) + continue; /* we tried it already */ + sprintf(pathname, "%s%s", fnam, *sp); +- if((fp = fopen(pathname, "r")) != NULL) ++ if(stat(pathname, &statbuf) == 0 && S_ISREG(statbuf.st_mode) ++ && (fp = fopen(pathname, "r")) != NULL) + return fp; + } + +@@ -196,7 +201,9 @@ + + strlen(dc->ext) + 1 > sizeof(pathname)) + continue; + sprintf(pathname, "%s%s%s", fnam, *sp, dc->ext); +- if ((fp = fopen(pathname, "r")) != NULL) { ++ if (stat(pathname, &statbuf) == 0 ++ && S_ISREG(statbuf.st_mode) ++ && (fp = fopen(pathname, "r")) != NULL) { + fclose(fp); + return pipe_open(dc); + } diff --git a/kbd.spec b/kbd.spec index f91ce53..edbf6d0 100644 --- a/kbd.spec +++ b/kbd.spec @@ -1,24 +1,32 @@ Summary: Tools for configuring the console (keyboard, virtual terminals, etc.) Name: kbd -Version: 1.13 -Release: 2%{?dist} +Version: 1.12 +Release: 30%{?dist} # Except possibly for the restrictions mentioned in the directory consolefonts License: GPL+ Group: System Environment/Base -Source0: ftp://ftp.altlinux.org/pub/people/legion/kbd/kbd-%{version}wip.tar.gz +Source0: ftp://ftp.kernel.org/pub/linux/utils/kbd/kbd-%{version}.tar.bz2 +Source1: ftp://ftp.kernel.org/pub/linux/utils/kbd/kbd-%{version}.tar.bz2.sign Source2: kbd-latsun-fonts.tar.bz2 Source3: kbd-sun12x22-fixed.tar.bz2 Source4: ro_maps.tar.bz2 Source5: terminus.tar.bz2 +Source6: kbd-latarcyrheb-16-fixed.tar.bz2 BuildRequires: bison, flex, gettext BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch0: kbd-1.12-sparc.patch -Patch1: kbd-1.12-setfont-man.patch -Patch2: kbd-1.12-nostrip.patch -Patch3: kbd-1.12-no-user-map.patch -Patch4: kbd-1.12-gr-el.patch -Patch5: kbd-1.12-keycodes-man.patch -Patch6: kbd-1.12-resizecon-x86.patch +Patch1: kbd-1.08-compose.patch +Patch2: kbd-1.08-terminal.patch +Patch3: kbd-1.08-rukbd.patch +Patch4: kbd-1.12-setfont-man.patch +Patch5: kbd-1.12-Meta_utf8.patch +Patch6: kbd-1.12-nostrip.patch +Patch7: kbd-1.12-alias.patch +Patch8: kbd-1.12-dir.patch +Patch9: kbd-1.12-no-user-map.patch +Patch10: kbd-1.12-gr-el.patch +Patch11: kbd-1.12-keycodes-man.patch +Patch12: kbd-1.12-resizecon-x86.patch Obsoletes: console-tools open Provides: console-tools open Conflicts: util-linux < 2.11r-9 @@ -31,14 +39,20 @@ system's console's behavior, including the keyboard, the screen fonts, the virtual terminals and font files. %prep -%setup -q -a 2 -a 3 -a 4 -a 5 +%setup -q -a 2 -a 3 -a 4 -a 5 -a 6 %patch0 -p1 -b .sparc -%patch1 -p1 -b .man -%patch2 -p1 -b .nostrip -%patch3 -p1 -b .no-user-map -%patch4 -p1 -b .gr-el -%patch5 -p1 -b .keycodes-man -%patch6 -p1 -b .resizecon-x86 +%patch1 -p1 +%patch2 -p1 -b .terminal +%patch3 -p1 +%patch4 -p1 -b .man +%patch5 -p1 -b .Meta_utf8 +%patch6 -p1 -b .nostrip +%patch7 -p1 -b .alias +%patch8 -p1 -b .dir +%patch9 -p1 -b .no-user-map +%patch10 -p1 -b .gr-el +%patch11 -p1 -b .keycodes-man +%patch12 -p1 -b .resizecon-x86 # 7-bit maps are obsolete; so are non-euro maps pushd data/keymaps/i386 @@ -113,11 +127,8 @@ rm -rf ${RPM_BUILD_ROOT} /lib/kbd %changelog -* Wed Feb 20 2008 Fedora Release Engineering - 1.13-2 -- Autorebuild for GCC 4.3 - -* Mon Dec 10 2007 Vitezslav Crhonek - 1.13-1 -- Update to 1.13 +* Fri Feb 22 2008 Vitezslav Crhonek - 1.12-30 +- Rebuild fo GCC 4.3 * Tue Nov 27 2007 Vitezslav Crhonek - 1.12-29 - Stop kbdrate using consolehelper diff --git a/sources b/sources index d31d0fe..ad85eb6 100644 --- a/sources +++ b/sources @@ -3,4 +3,4 @@ e56c7766760c16d4c7cbc16fc722c7f9 kbd-sun12x22-fixed.tar.bz2 06ac1d4a6c014f6de9a29222497d70c8 ro_maps.tar.bz2 0d894c1c024f531eb6d247ecc2bc4523 terminus.tar.bz2 -771ab076ce9fea625ae5c410ceffbf2b kbd-1.13wip.tar.gz +884fdbb0b952b2e3e8389a0c40a3e301 kbd-latarcyrheb-16-fixed.tar.bz2