diff --git a/package/base/kbd/bg_keymaps.patch b/package/base/kbd/bg_keymaps.patch new file mode 100644 index 000000000..d88db8ad9 --- /dev/null +++ b/package/base/kbd/bg_keymaps.patch @@ -0,0 +1,319 @@ +--- ./data/keymaps/i386/qwerty/bg_bds-cp1251.map.orig 2002-10-14 02:39:32.000000000 +0300 ++++ ./data/keymaps/i386/qwerty/bg_bds-cp1251.map 2004-01-13 14:05:59.000000000 +0200 +@@ -1,12 +1,12 @@ +-### Ver 0.2 - 20021013 ++### Ver 1.0 - 20040109 + ### Linux console Bulgarian keymap, BDS (Bulgarian National Standart) cyrillic layout. + ### Charset: CP1251 + ### Author: Peter Georgiev + ### + ### Temporary switching between CYR and LAT is done with AltGr (R_Alt) key or the L_WIN key. + ### AltGr (R_Alt), kakto i L_WIN prevkliuchvat vremenno mezhdu CYR i LAT. +-### Permanent switching between CYR and LAT is done with Ctrl+Shift, or the WIN_MENU key. +-### Ctrl+Shift, kakto i WIN_MENU prevkliuchvat mezhdu CYR i LAT. ++### Permanent switching between CYR and LAT is done with Left Shift+Alt, or the WIN_MENU key. ++### Levi Shift+Alt, kakto i WIN_MENU prevkliuchvat mezhdu CYR i LAT. + ### + ### Compose key is R_WIN key. + ### +@@ -65,6 +65,7 @@ + shift control keycode 8 = Control_underscore + altgr control keycode 8 = Control_underscore + shift altgr control keycode 8 = Control_underscore ++ altgr control alt keycode 8 = ampersand + keycode 9 = eight + shift keycode 9 = asterisk + shift altgr keycode 9 = slash +@@ -73,7 +74,7 @@ + altgr control keycode 9 = Delete + shift altgr control keycode 9 = Delete + keycode 10 = nine parenleft nine underscore +-keycode 11 = zero parenright zero +0xB9 ++keycode 11 = zero parenright zero 0xB9 + keycode 12 = minus + shift keycode 12 = underscore + shift altgr keycode 12 = I +@@ -113,13 +114,13 @@ + altgr keycode 18 = +0xE5 + shift altgr keycode 18 = +0xC5 + control keycode 18 = Control_e +- control alt keycode 18 = +0x88 ++ control alt keycode 18 = 0x88 + shift control keycode 18 = Control_e + altgr control keycode 18 = Control_e + shift altgr control keycode 18 = Control_e + altgr alt keycode 18 = Meta_e + shift altgr alt keycode 18 = Meta_E +- altgr control alt keycode 18 = +0x88 ++ altgr control alt keycode 18 = 0x88 + keycode 19 = +r + shift keycode 19 = +R + altgr keycode 19 = +0xE8 +@@ -220,8 +221,6 @@ + altgr control alt keycode 28 = Meta_Control_m + shift altgr control alt keycode 28 = Meta_Control_m + keycode 29 = Control +- shift keycode 29 = AltGr_Lock +- shift altgr keycode 29 = AltGr_Lock + keycode 30 = +a + shift keycode 30 = +A + altgr keycode 30 = +0xFC +@@ -326,8 +325,8 @@ + altgr alt keycode 41 = Meta_grave + shift altgr alt keycode 41 = Meta_asciitilde + keycode 42 = Shift +- control keycode 42 = AltGr_Lock +- altgr control keycode 42 = AltGr_Lock ++ alt keycode 42 = AltGr_Lock ++ altgr alt keycode 42 = AltGr_Lock + keycode 43 = backslash + shift keycode 43 = bar + altgr keycode 43 = parenleft +@@ -417,10 +416,10 @@ + altgr control keycode 53 = Delete + shift 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 56 = Alt ++ shift keycode 56 = AltGr_Lock ++ shift altgr keycode 56 = AltGr_Lock + keycode 57 = space + control keycode 57 = nul + shift control keycode 57 = nul +@@ -630,8 +629,6 @@ + keycode 95 = + keycode 96 = KP_Enter + keycode 97 = Control +- shift keycode 97 = AltGr_Lock +- shift altgr keycode 97 = AltGr_Lock + keycode 98 = KP_Divide + keycode 99 = Control_backslash + keycode 100 = AltGr +--- ./data/keymaps/i386/qwerty/bg_bds-utf8.map.orig 2002-10-13 20:13:51.000000000 +0300 ++++ ./data/keymaps/i386/qwerty/bg_bds-utf8.map 2004-01-13 14:06:18.000000000 +0200 +@@ -1,12 +1,12 @@ +-### Ver 0.1 - 20021013 ++### Ver 1.0 - 20040109 + ### Linux console Bulgarian keymap, BDS (Bulgarian National Standart) cyrillic layout. + ### Charset: UTF-8 + ### Author: Peter Georgiev + ### + ### Temporary switching between CYR and LAT is done with AltGr (R_Alt) key or the L_WIN key. + ### AltGr (R_Alt), kakto i L_WIN prevkliuchvat vremenno mezhdu CYR i LAT. +-### Permanent switching between CYR and LAT is done with Ctrl+Shift, or the WIN_MENU key. +-### Ctrl+Shift, kakto i WIN_MENU prevkliuchvat mezhdu CYR i LAT. ++### Permanent switching between CYR and LAT is done with Left Shift+Alt, or the WIN_MENU key. ++### Levi Shift+Alt, kakto i WIN_MENU prevkliuchvat mezhdu CYR i LAT. + ### + ### Compose key is R_WIN key. + ### +@@ -65,6 +65,7 @@ + shift control keycode 8 = Control_underscore + altgr control keycode 8 = Control_underscore + shift altgr control keycode 8 = Control_underscore ++ altgr control alt keycode 8 = ampersand + keycode 9 = eight + shift keycode 9 = asterisk + shift altgr keycode 9 = slash +@@ -202,7 +203,7 @@ + shift altgr alt keycode 26 = Meta_braceleft + keycode 27 = bracketright + shift keycode 27 = braceright +- altgr keycode 27 = colon ++ altgr keycode 27 = semicolon + shift altgr keycode 27 = U+00A7 + control keycode 27 = Control_bracketright + shift control keycode 27 = Control_bracketright +@@ -220,8 +221,6 @@ + altgr control alt keycode 28 = Meta_Control_m + shift altgr control alt keycode 28 = Meta_Control_m + keycode 29 = Control +- shift keycode 29 = AltGr_Lock +- shift altgr keycode 29 = AltGr_Lock + keycode 30 = +a + shift keycode 30 = +A + altgr keycode 30 = U+044C +@@ -326,8 +325,8 @@ + altgr alt keycode 41 = Meta_grave + shift altgr alt keycode 41 = Meta_asciitilde + keycode 42 = Shift +- control keycode 42 = AltGr_Lock +- altgr control keycode 42 = AltGr_Lock ++ alt keycode 42 = AltGr_Lock ++ altgr alt keycode 42 = AltGr_Lock + keycode 43 = backslash + shift keycode 43 = bar + altgr keycode 43 = parenleft +@@ -417,10 +416,10 @@ + altgr control keycode 53 = Delete + shift 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 56 = Alt ++ shift keycode 56 = AltGr_Lock ++ altgr shift keycode 56 = AltGr_Lock + keycode 57 = space + control keycode 57 = nul + shift control keycode 57 = nul +@@ -630,8 +629,6 @@ + keycode 95 = + keycode 96 = KP_Enter + keycode 97 = Control +- shift keycode 97 = AltGr_Lock +- shift altgr keycode 97 = AltGr_Lock + keycode 98 = KP_Divide + keycode 99 = Control_backslash + keycode 100 = AltGr +--- ./data/keymaps/i386/qwerty/bg_pho-cp1251.map.orig 2002-10-14 02:38:59.000000000 +0300 ++++ ./data/keymaps/i386/qwerty/bg_pho-cp1251.map 2004-01-09 19:11:09.000000000 +0200 +@@ -1,12 +1,12 @@ +-### Ver 0.2 - 20021013 ++### Ver 1.0 - 20040109 + ### Linux console Bulgarian keymap, phonetic cyrillic layout. + ### Charset: CP1251 + ### Author: Peter Georgiev + ### + ### Temporary switching between CYR and LAT is done with AltGr (R_Alt) key or the L_WIN key. + ### AltGr (R_Alt), kakto i L_WIN prevkliuchvat vremenno mezhdu CYR i LAT. +-### Permanent switching between CYR and LAT is done with Ctrl+Shift, or the WIN_MENU key. +-### Ctrl+Shift, kakto i WIN_MENU prevkliuchvat mezhdu CYR i LAT. ++### Permanent switching between CYR and LAT is done with Left Shift+Alt, or the WIN_MENU key. ++### Levi Shift+Alt, kakto i WIN_MENU prevkliuchvat mezhdu CYR i LAT. + ### + ### Compose key is R_WIN key. + ### +@@ -72,8 +72,8 @@ + shift altgr control keycode 9 = Delete + keycode 10 = nine parenleft nine parenleft + keycode 11 = zero parenright zero parenright +- control alt keycode 11 = +0xB9 +- altgr control alt keycode 11 = +0xB9 ++ control alt keycode 11 = 0xB9 ++ altgr control alt keycode 11 = 0xB9 + keycode 12 = minus + shift keycode 12 = underscore + shift altgr keycode 12 = underscore +@@ -113,13 +113,13 @@ + altgr keycode 18 = +0xE5 + shift altgr keycode 18 = +0xC5 + control keycode 18 = Control_e +- control alt keycode 18 = +0x88 ++ control alt keycode 18 = 0x88 + shift control keycode 18 = Control_e + altgr control keycode 18 = Control_e + shift altgr control keycode 18 = Control_e + altgr alt keycode 18 = Meta_e + shift altgr alt keycode 18 = Meta_E +- altgr control alt keycode 18 = +0x88 ++ altgr control alt keycode 18 = 0x88 + keycode 19 = +r + shift keycode 19 = +R + altgr keycode 19 = +0xF0 +@@ -220,8 +220,6 @@ + altgr control alt keycode 28 = Meta_Control_m + shift altgr control alt keycode 28 = Meta_Control_m + keycode 29 = Control +- shift keycode 29 = AltGr_Lock +- shift altgr keycode 29 = AltGr_Lock + keycode 30 = +a + shift keycode 30 = +A + altgr keycode 30 = +0xE0 +@@ -331,8 +329,8 @@ + altgr alt keycode 41 = Meta_grave + shift altgr alt keycode 41 = Meta_asciitilde + keycode 42 = Shift +- control keycode 42 = AltGr_Lock +- altgr control keycode 42 = AltGr_Lock ++ alt keycode 42 = AltGr_Lock ++ altgr alt keycode 42 = AltGr_Lock + keycode 43 = backslash + shift keycode 43 = bar + altgr keycode 43 = +0xFE +@@ -424,10 +422,10 @@ + altgr control keycode 53 = Delete + shift 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 ++ shift keycode 56 = AltGr_Lock ++ shift altgr keycode 56 = AltGr_Lock + keycode 57 = space + control keycode 57 = nul + shift control keycode 57 = nul +@@ -637,8 +635,6 @@ + keycode 95 = + keycode 96 = KP_Enter + keycode 97 = Control +- shift keycode 97 = AltGr_Lock +- shift altgr keycode 97 = AltGr_Lock + keycode 98 = KP_Divide + keycode 99 = Control_backslash + keycode 100 = AltGr +--- ./data/keymaps/i386/qwerty/bg_pho-utf8.map.orig 2002-10-13 20:13:51.000000000 +0300 ++++ ./data/keymaps/i386/qwerty/bg_pho-utf8.map 2004-01-09 19:18:04.000000000 +0200 +@@ -1,12 +1,12 @@ +-### Ver 0.2 - 20021013 ++### Ver 1.0 - 20040109 + ### Linux console Bulgarian keymap, phonetic cyrillic layout. + ### Charset: UTF-8 + ### Author: Peter Georgiev + ### + ### Temporary switching between CYR and LAT is done with AltGr (R_Alt) key or the L_WIN key. + ### AltGr (R_Alt), kakto i L_WIN prevkliuchvat vremenno mezhdu CYR i LAT. +-### Permanent switching between CYR and LAT is done with Ctrl+Shift, or the WIN_MENU key. +-### Ctrl+Shift, kakto i WIN_MENU prevkliuchvat mezhdu CYR i LAT. ++### Permanent switching between CYR and LAT is done with Left Shift+Alt, or the WIN_MENU key. ++### Levi Shift+Alt, kakto i WIN_MENU prevkliuchvat mezhdu CYR i LAT. + ### + ### Compose key is R_WIN key. + ### +@@ -220,8 +220,6 @@ + altgr control alt keycode 28 = Meta_Control_m + shift altgr control alt keycode 28 = Meta_Control_m + keycode 29 = Control +- shift keycode 29 = AltGr_Lock +- shift altgr keycode 29 = AltGr_Lock + keycode 30 = +a + shift keycode 30 = +A + altgr keycode 30 = U+0430 +@@ -331,8 +329,8 @@ + altgr alt keycode 41 = Meta_grave + shift altgr alt keycode 41 = Meta_asciitilde + keycode 42 = Shift +- control keycode 42 = AltGr_Lock +- altgr control keycode 42 = AltGr_Lock ++ alt keycode 42 = AltGr_Lock ++ altgr alt keycode 42 = AltGr_Lock + keycode 43 = backslash + shift keycode 43 = bar + altgr keycode 43 = U+044E +@@ -424,10 +422,10 @@ + altgr control keycode 53 = Delete + shift 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 ++ shift keycode 56 = AltGr_Lock ++ shift altgr keycode 56 = AltGr_Lock + keycode 57 = space + control keycode 57 = nul + shift control keycode 57 = nul +@@ -637,8 +635,6 @@ + keycode 95 = + keycode 96 = KP_Enter + keycode 97 = Control +- shift keycode 97 = AltGr_Lock +- shift altgr keycode 97 = AltGr_Lock + keycode 98 = KP_Divide + keycode 99 = Control_backslash + keycode 100 = AltGr diff --git a/package/base/kbd/kbd.conf b/package/base/kbd/kbd.conf index 624081084..4a15bc11a 100644 --- a/package/base/kbd/kbd.conf +++ b/package/base/kbd/kbd.conf @@ -20,7 +20,5 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- -premake="bzcat $archdir/bg-cp1251.map.bz2 > data/keymaps/i386/qwerty/bg-cp1251.map" -# this ./configure is very unusual, study it before touching the following line -datadir="${datadir#$root/$prefix}/$pkg" ; mandir="${mandir#$root/$prefix}" -# always check for new directory options when upgrading to a newer kbd version! +premake="rm -f data/keymaps/i386/qwerty/bg-cp1251.map" +datadir="$datadir/$pkg" diff --git a/package/base/kbd/kbd.desc b/package/base/kbd/kbd.desc index c09d0941c..183496385 100644 --- a/package/base/kbd/kbd.desc +++ b/package/base/kbd/kbd.desc @@ -34,9 +34,8 @@ [L] GPL [S] Stable -[V] 1.08 +[V] 1.10 [P] X -----5---9 746.000 -[D] 2183007649 kbd-1.08.tar.bz2 ftp://ftp.kernel.org/pub/linux/utils/kbd/ -[D] 2266324640 bg-cp1251.map.gz http://gsmp.tfh-berlin.de/ftp/software/kbd/ +[D] 2552370824 kbd-1.10.tar.bz2 ftp://ftp.kernel.org/pub/linux/utils/kbd/