From e108b7a3b4618dbacb8d97db519d24b167d83e1a Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Sat, 24 Mar 2007 18:21:25 +0000 Subject: [PATCH] * Fetch keymaps from /usr/share/console-setup/KeyboardNames.pl rather than from a console-setup source tree. * Update keymaps from console-setup 1.13ubuntu9, adding Congo, Iraq, Korea, Nepal, and Nigeria, and updating several others. --- debian/changelog | 4 ++ keytables.inc | 151 +++++++++++++++++++++++++++---------------- scrape-console-setup | 10 +-- 3 files changed, 102 insertions(+), 63 deletions(-) diff --git a/debian/changelog b/debian/changelog index dd73094..f839940 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,10 @@ gfxboot-theme-ubuntu (0.3.3) UNRELEASED; urgency=low and Malayalam, removing Icelandic, Irish, Kazakh, Malagasy, Persian, Welsh, and Xhosa, and updating localised names for Belarusian and Finnish (LP: #93233). + * Fetch keymaps from /usr/share/console-setup/KeyboardNames.pl rather than + from a console-setup source tree. + * Update keymaps from console-setup 1.13ubuntu9, adding Congo, Iraq, + Korea, Nepal, and Nigeria, and updating several others. -- Colin Watson Fri, 23 Mar 2007 18:30:43 +0000 diff --git a/keytables.inc b/keytables.inc index 01f6f83..43ca0d6 100644 --- a/keytables.inc +++ b/keytables.inc @@ -286,6 +286,7 @@ [ 0x34 0x2e 0x3e 0xb7 ] [ 0x35 0x3b 0x3a 0x00 ] [ 0x56 0x5c 0x7c 0xba ] + [ 0x59 0x2f 0x3f 0xb0 ] [ 0x79 keyDel keyDel keyDel ] ] def @@ -326,6 +327,37 @@ [ 0x56 0xab 0xbb 0xb0 ] ] def +/keymap.cd [ + [ 0x02 0x26 0x31 0x23 ] + [ 0x03 0x00 0x32 0x40 ] + [ 0x04 0x00 0x33 0xab ] + [ 0x05 0x28 0x34 0x5b ] + [ 0x06 0x7b 0x35 0x3c ] + [ 0x07 0x7d 0x36 0x3e ] + [ 0x08 0x29 0x37 0x5d ] + [ 0x09 0x00 0x38 0xbb ] + [ 0x0a 0x00 0x39 0x00 ] + [ 0x0b 0x00 0x30 0x00 ] + [ 0x0c 0x2d 0x5f 0x25 ] + [ 0x0d 0x3d 0x2b 0xd7 ] + [ 0x10 0x61 0x41 0x61 ] + [ 0x16 0x75 0x55 0x00 ] + [ 0x17 0x69 0x49 0x00 ] + [ 0x18 0x6f 0x4f 0xf8 ] + [ 0x1b 0x2a 0x5e 0x24 ] + [ 0x1e 0x71 0x51 0x71 ] + [ 0x27 0x6d 0x4d 0x6d ] + [ 0x29 0x60 0x7e 0x00 ] + [ 0x2b 0x22 0x5c 0x7c ] + [ 0x2e 0x63 0x43 0xe7 ] + [ 0x32 0x2c 0x2e 0x2c ] + [ 0x33 0x3b 0x3a 0x3b ] + [ 0x34 0x21 0x3f 0x21 ] + [ 0x35 0x27 0x2f 0x00 ] + [ 0x39 0x20 0x20 0xa0 ] + [ 0x56 0x5c 0x7c 0x7c ] +] def + /keymap.ch [ [ 0x02 0x31 0x2b 0x7c ] [ 0x03 0x32 0x22 0x40 ] @@ -997,13 +1029,13 @@ ] def /keymap.hr [ - [ 0x02 0x00 0x21 0x00 ] + [ 0x02 0x31 0x21 0x7e ] [ 0x03 0x00 0x22 0x00 ] - [ 0x04 0x00 0x23 0x00 ] + [ 0x04 0x33 0x23 0x5e ] [ 0x05 0x00 0x24 0x00 ] - [ 0x06 0x00 0x25 0x00 ] + [ 0x06 0x35 0x25 0xb0 ] [ 0x07 0x00 0x26 0x00 ] - [ 0x08 0x00 0x2f 0x00 ] + [ 0x08 0x37 0x2f 0x60 ] [ 0x09 0x00 0x28 0x00 ] [ 0x0a 0x00 0x29 0x00 ] [ 0x0b 0x00 0x3d 0x00 ] @@ -1034,7 +1066,7 @@ [ 0x32 0x00 0x00 0x5e ] [ 0x33 0x00 0x3b 0x00 ] [ 0x34 0x00 0x3a 0x00 ] - [ 0x35 0x00 0x5f 0x00 ] + [ 0x35 0x2d 0x5f 0x00 ] [ 0x56 0x3c 0x3e 0x7c ] ] def @@ -1149,12 +1181,6 @@ ] def /keymap.in_guj [ - [ 0x04 0x00 0x23 0x00 ] - [ 0x05 0x00 0x24 0x00 ] - [ 0x06 0x00 0x25 0x00 ] - [ 0x07 0x00 0x5e 0x00 ] - [ 0x08 0x00 0x26 0x00 ] - [ 0x09 0x00 0x2a 0x00 ] [ 0x0a 0x00 0x28 0x00 ] [ 0x0b 0x00 0x29 0x00 ] [ 0x0c 0x2d 0x00 0x2d ] @@ -1165,34 +1191,16 @@ ] def /keymap.in_guru [ - [ 0x02 0x00 0x21 0x00 ] - [ 0x03 0x00 0x40 0x00 ] - [ 0x04 0x00 0x23 0x00 ] - [ 0x05 0x00 0x24 0x00 ] - [ 0x06 0x00 0x25 0x00 ] - [ 0x07 0x00 0x5e 0x00 ] - [ 0x08 0x00 0x26 0x00 ] - [ 0x09 0x00 0x2a 0x00 ] [ 0x0a 0x00 0x28 0x00 ] [ 0x0b 0x00 0x29 0x00 ] - [ 0x0c 0x00 0x5f 0x00 ] [ 0x34 0x2e 0x00 0x2e ] [ 0x35 0x00 0x3f 0x00 ] [ 0x56 0x3c 0x3e 0x7c ] ] def /keymap.in_kan [ - [ 0x04 0x00 0x23 0x00 ] - [ 0x05 0x00 0x24 0x00 ] - [ 0x06 0x00 0x25 0x00 ] - [ 0x07 0x00 0x5e 0x00 ] - [ 0x08 0x00 0x26 0x00 ] - [ 0x09 0x00 0x2a 0x00 ] - [ 0x0a 0x00 0x28 0x00 ] - [ 0x0b 0x00 0x29 0x00 ] - [ 0x0c 0x00 0x5f 0x00 ] [ 0x33 0x2c 0x00 0x2c ] - [ 0x34 0x2e 0x00 0x2e ] + [ 0x34 0x2e 0x2e 0x2e ] [ 0x35 0x00 0x40 0x00 ] [ 0x56 0x3c 0x3e 0x7c ] ] def @@ -1205,25 +1213,17 @@ [ 0x06 0x00 0x25 0x00 ] [ 0x07 0x00 0x5e 0x00 ] [ 0x08 0x00 0x26 0x00 ] + [ 0x09 0x00 0x2a 0x00 ] [ 0x0a 0x00 0x28 0x00 ] [ 0x0b 0x00 0x29 0x00 ] [ 0x0c 0x2d 0x00 0x2d ] - [ 0x2b 0x00 0x7c 0x00 ] [ 0x33 0x2c 0x00 0x2c ] - [ 0x34 0x2e 0x00 0x2e ] + [ 0x34 0x2e 0x2e 0x2e ] [ 0x35 0x00 0x3f 0x00 ] [ 0x56 0x3c 0x3e 0x7c ] ] def /keymap.in_tam [ - [ 0x02 0x00 0x21 0x00 ] - [ 0x03 0x00 0x40 0x00 ] - [ 0x04 0x00 0x23 0x00 ] - [ 0x05 0x00 0x24 0x00 ] - [ 0x06 0x00 0x25 0x00 ] - [ 0x07 0x00 0x5e 0x00 ] - [ 0x08 0x00 0x26 0x00 ] - [ 0x09 0x00 0x2a 0x00 ] [ 0x0a 0x00 0x28 0x00 ] [ 0x0b 0x00 0x29 0x00 ] [ 0x0d 0x00 0x2b 0x00 ] @@ -1244,11 +1244,32 @@ [ 0x0b 0x00 0x29 0x00 ] [ 0x0c 0x00 0x5f 0x00 ] [ 0x33 0x2c 0x00 0x2c ] - [ 0x34 0x2e 0x00 0x2e ] + [ 0x34 0x2e 0x2e 0x2e ] [ 0x35 0x00 0x40 0x00 ] [ 0x56 0x3c 0x3e 0x7c ] ] def +/keymap.iq [ + [ 0x16 0x00 0x60 0x00 ] + [ 0x17 0x00 0xf7 0x00 ] + [ 0x18 0x00 0xd7 0x00 ] + [ 0x1a 0x00 0x7b 0x00 ] + [ 0x1b 0x00 0x7d 0x00 ] + [ 0x1e 0x00 0x5c 0x00 ] + [ 0x1f 0x00 0x53 0x00 ] + [ 0x20 0x00 0x5b 0x00 ] + [ 0x21 0x00 0x5d 0x00 ] + [ 0x26 0x00 0x2f 0x00 ] + [ 0x27 0x00 0x3a 0x00 ] + [ 0x28 0x00 0x22 0x00 ] + [ 0x2b 0x3c 0x3e 0x3c ] + [ 0x2c 0x00 0x7e 0x00 ] + [ 0x32 0x00 0x27 0x00 ] + [ 0x33 0x00 0x2c 0x00 ] + [ 0x34 0x00 0x2e 0x00 ] + [ 0x56 0x7c 0xa6 0x7c ] +] def + /keymap.ir [ [ 0x56 0x3c 0x3e 0x7c ] ] def @@ -1371,6 +1392,10 @@ [ 0x56 0x3c 0x3e 0x7c ] ] def +/keymap.kr [ + [ 0x56 0x3c 0x3e 0x7c ] +] def + /keymap.kz [ [ 0x02 0x00 0x21 0x00 ] [ 0x07 0x2c 0x3b 0x2c ] @@ -1635,6 +1660,11 @@ [ 0x56 0x3c 0x3e 0x7c ] ] def +/keymap.ng [ + [ 0x05 0x34 0x00 0x24 ] + [ 0x56 0x3c 0x3e 0x7c ] +] def + /keymap.nl [ [ 0x02 0x31 0x21 0xb9 ] [ 0x03 0x32 0x22 0xb2 ] @@ -1784,6 +1814,14 @@ [ 0x56 0xb8 0xb4 0x00 ] ] def +/keymap.np [ + [ 0x0c 0x2d 0x00 0x2d ] + [ 0x0d 0x3d 0x00 0x3d ] + [ 0x33 0x2c 0x00 0x2c ] + [ 0x35 0x00 0x3f 0x00 ] + [ 0x56 0x3c 0x3e 0x7c ] +] def + /keymap.pk [ [ 0x56 0x3c 0x3e 0x7c ] ] def @@ -2280,19 +2318,17 @@ ] def /keymap.vn [ - [ 0x02 0x31 0x21 0xe3 ] - [ 0x03 0x32 0x40 0xe2 ] - [ 0x04 0x33 0x23 0xea ] - [ 0x05 0x34 0x24 0xf4 ] - [ 0x06 0x35 0x25 0x00 ] - [ 0x07 0x36 0x5e 0x00 ] - [ 0x08 0x37 0x26 0x00 ] - [ 0x09 0x38 0x2a 0x00 ] - [ 0x0a 0x39 0x28 0x00 ] - [ 0x0b 0x30 0x29 0xf0 ] - [ 0x0d 0x3d 0x2b 0x00 ] - [ 0x1a 0x5b 0x7b 0x00 ] - [ 0x1b 0x5d 0x7d 0x00 ] + [ 0x02 0xe3 0xc3 0xe3 ] + [ 0x03 0xe2 0xc2 0xe2 ] + [ 0x04 0xea 0xca 0xea ] + [ 0x05 0xf4 0xd4 0xf4 ] + [ 0x06 0x00 0x25 0x00 ] + [ 0x07 0x00 0x5e 0x00 ] + [ 0x08 0x00 0x26 0x00 ] + [ 0x09 0x00 0x2a 0x00 ] + [ 0x0a 0x00 0x28 0x00 ] + [ 0x0b 0xf0 0xd0 0xf0 ] + [ 0x0d 0x00 0x2b 0x00 ] [ 0x56 0x3c 0x3e 0x7c ] ] def @@ -2361,6 +2397,7 @@ [ "bg" keymap.bg "Bulgaria" [ "_BG" ] .undef ] [ "kh" keymap.kh "Cambodia" [ ] .undef ] [ "ca" keymap.ca "Canada" [ "_CA" ] .undef ] + [ "cd" keymap.cd "Congo, Democratic Republic of the" [ ] .undef ] [ "hr" keymap.hr "Croatia" [ "hr_" ] .undef ] [ "cz" keymap.cz "Czechia" [ "_CZ" ] .undef ] [ "dk" keymap.dk "Denmark" [ "_DK" ] .undef ] @@ -2381,12 +2418,14 @@ [ "is" keymap.is "Iceland" [ "_IS" ] .undef ] [ "in" keymap.in "India" [ "hi_" ] .undef ] [ "ir" keymap.ir "Iran" [ "_IR" ] .undef ] + [ "iq" keymap.iq "Iraq" [ ] .undef ] [ "ie" keymap.ie "Ireland" [ "_IE" ] .undef ] [ "il" keymap.il "Israel" [ "_IL" ] .undef ] [ "it" keymap.it "Italy" [ "_IT" ] .undef ] [ "jp" keymap.jp "Japan" [ "_JP" ] "jp106" ] [ "in_kan" keymap.in_kan "Kannada" [ "kn_" ] .undef ] [ "kz" keymap.kz "Kazakhstan" [ ] .undef ] + [ "kr" keymap.kr "Korea, Republic of" [ ] .undef ] [ "kg" keymap.kg "Kyrgyzstan" [ ] .undef ] [ "la" keymap.la "Laos" [ "lo_" ] .undef ] [ "latam" keymap.latam "Latin American" [ "_AR" "_BO" "_CL" "_CO" "_CR" "_DO" "_EC" "_GT" "_HN" "_MX" "_NI" "_PA" "_PE" "es_PR" "_PY" "_SV" "es_US" "_UY" "_VE" ] .undef ] @@ -2399,7 +2438,9 @@ [ "mao" keymap.mao "Maori" [ ] .undef ] [ "mn" keymap.mn "Mongolia" [ "_MN" ] .undef ] [ "mm" keymap.mm "Myanmar" [ ] .undef ] + [ "np" keymap.np "Nepal" [ ] .undef ] [ "nl" keymap.nl "Netherlands" [ "_NL" ] .undef ] + [ "ng" keymap.ng "Nigeria" [ ] .undef ] [ "no" keymap.no "Norway" [ "_NO" ] .undef ] [ "no_smi" keymap.no_smi "Norway (Saami)" [ "se_NO" ] .undef ] [ "pk" keymap.pk "Pakistan" [ ] .undef ] @@ -2432,4 +2473,4 @@ ] def % set to "us" for safety -/config.keymap keymaps 78 get def +/config.keymap keymaps 83 get def diff --git a/scrape-console-setup b/scrape-console-setup index 83f4789..0760a86 100755 --- a/scrape-console-setup +++ b/scrape-console-setup @@ -3,14 +3,8 @@ use strict; use File::Find; -BEGIN { - if (@ARGV != 1) { - print STDERR "Usage: $0 console-setup-source-tree\n"; - exit 1; - } - do "$ARGV[0]/Keyboard/KeyboardNames.pl" - or die "can't load $ARGV[0]/Keyboard/KeyboardNames.pl"; -} +do "/usr/share/console-setup/KeyboardNames.pl" + or die "can't load /usr/share/console-setup/KeyboardNames.pl"; # Horrible hardcoded mess for now; please keep this in the same order as in # console-setup/debian/config.proto. The values are substrings since that