From 5fb336a588635e52c71662d6967b744dfdd74b8e Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Wed, 1 Aug 2007 10:57:41 +0100 Subject: [PATCH] * Update keymaps from console-setup 1.16ubuntu4. Add locale mappings for Esperanto and Latvia, tag Lithuania as non-Latin so that the US keymap is used for it within gfxboot, and switch France to the oss variant. --- debian/changelog | 3 ++ keytables.inc | 112 ++++++++++++++----------------------------- scrape-console-setup | 8 +++- 3 files changed, 45 insertions(+), 78 deletions(-) diff --git a/debian/changelog b/debian/changelog index c54c9f4..59ebab9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,9 @@ gfxboot-theme-ubuntu (0.4.0) UNRELEASED; urgency=low * Use priority=low for d-i expert mode rather than DEBCONF_PRIORITY=low. + * Update keymaps from console-setup 1.16ubuntu4. Add locale mappings for + Esperanto and Latvia, tag Lithuania as non-Latin so that the US keymap + is used for it within gfxboot, and switch France to the oss variant. -- Colin Watson Mon, 16 Apr 2007 19:25:52 +0100 diff --git a/keytables.inc b/keytables.inc index 65a31f4..a8afe4d 100644 --- a/keytables.inc +++ b/keytables.inc @@ -920,8 +920,8 @@ [ 0x56 0x3c 0x3e 0x5c ] ] def -/keymap.fr [ - [ 0x02 0x26 0x31 0xb9 ] +/keymap.fr_oss [ + [ 0x02 0x26 0x31 0x00 ] [ 0x03 0xe9 0x32 0x7e ] [ 0x04 0x22 0x33 0x23 ] [ 0x05 0x27 0x34 0x7b ] @@ -934,38 +934,40 @@ [ 0x0c 0x29 0xb0 0x5d ] [ 0x0d 0x3d 0x2b 0x7d ] [ 0x10 0x61 0x41 0xe6 ] - [ 0x11 0x7a 0x5a 0xab ] + [ 0x11 0x7a 0x5a 0xe2 ] [ 0x12 0x65 0x45 0xa4 ] - [ 0x13 0x72 0x52 0xb6 ] - [ 0x14 0x74 0x54 0xbc ] - [ 0x15 0x79 0x59 0x00 ] - [ 0x16 0x75 0x55 0x00 ] - [ 0x17 0x69 0x49 0x00 ] - [ 0x18 0x6f 0x4f 0xf8 ] - [ 0x19 0x70 0x50 0xfe ] - [ 0x1b 0x24 0xa3 0xa4 ] - [ 0x1e 0x71 0x51 0x40 ] + [ 0x13 0x72 0x52 0xea ] + [ 0x14 0x74 0x54 0xfe ] + [ 0x15 0x79 0x59 0xff ] + [ 0x16 0x75 0x55 0xfb ] + [ 0x17 0x69 0x49 0xee ] + [ 0x18 0x6f 0x4f 0xbd ] + [ 0x19 0x70 0x50 0xf4 ] + [ 0x1b 0x24 0xa3 0xb3 ] + [ 0x1e 0x71 0x51 0xe4 ] [ 0x1f 0x73 0x53 0xdf ] - [ 0x20 0x64 0x44 0xf0 ] - [ 0x21 0x66 0x46 0xf0 ] - [ 0x22 0x67 0x47 0xbf ] - [ 0x23 0x68 0x48 0xb1 ] - [ 0x25 0x6b 0x4b 0xa2 ] - [ 0x26 0x6c 0x4c 0xb3 ] - [ 0x27 0x6d 0x4d 0xb5 ] - [ 0x28 0xf9 0x25 0x00 ] - [ 0x29 0xb2 0x7e 0xac ] - [ 0x2b 0x2a 0xb5 0x00 ] - [ 0x2c 0x77 0x57 0xb3 ] + [ 0x20 0x64 0x44 0xeb ] + [ 0x21 0x66 0x46 0x00 ] + [ 0x22 0x67 0x47 0x00 ] + [ 0x23 0x68 0x48 0xf0 ] + [ 0x24 0x6a 0x4a 0xfc ] + [ 0x25 0x6b 0x4b 0xef ] + [ 0x26 0x6c 0x4c 0x00 ] + [ 0x27 0x6d 0x4d 0xf6 ] + [ 0x28 0xf9 0x25 0xb9 ] + [ 0x29 0xf8 0xd8 0x00 ] + [ 0x2b 0x2a 0xb5 0xb2 ] + [ 0x2c 0x77 0x57 0xab ] [ 0x2d 0x78 0x58 0xbb ] - [ 0x2e 0x63 0x43 0xa2 ] + [ 0x2e 0x63 0x43 0xa9 ] [ 0x2f 0x76 0x56 0x00 ] [ 0x30 0x62 0x42 0x00 ] - [ 0x32 0x2c 0x3f 0x00 ] - [ 0x33 0x3b 0x2e 0x00 ] - [ 0x34 0x3a 0x2f 0xb7 ] - [ 0x35 0x21 0xa7 0x00 ] - [ 0x56 0x3c 0x3e 0x7c ] + [ 0x31 0x6e 0x4e 0xac ] + [ 0x32 0x2c 0x3f 0xbf ] + [ 0x33 0x3b 0x2e 0xd7 ] + [ 0x34 0x3a 0x2f 0xf7 ] + [ 0x35 0x21 0xa7 0xa1 ] + [ 0x56 0x3c 0x3e 0x00 ] ] def /keymap.gb [ @@ -1463,51 +1465,7 @@ ] def /keymap.lt [ - [ 0x02 0xb1 0xa1 0x31 ] - [ 0x03 0xe8 0xc8 0x32 ] - [ 0x04 0xea 0xca 0x33 ] - [ 0x05 0xec 0xcc 0x34 ] - [ 0x06 0xe7 0xc7 0x35 ] - [ 0x07 0xa8 0xa6 0x36 ] - [ 0x08 0xf9 0xd9 0x37 ] - [ 0x09 0xfe 0xde 0x38 ] - [ 0x0a 0x00 0x28 0x39 ] - [ 0x0b 0x00 0x29 0x30 ] - [ 0x0c 0x2d 0x5f 0x5c ] - [ 0x0d 0xb8 0xb4 0x3d ] - [ 0x10 0x71 0x51 0x40 ] - [ 0x11 0x77 0x57 0xb3 ] - [ 0x13 0x72 0x52 0xb6 ] - [ 0x14 0x74 0x54 0xbc ] - [ 0x15 0x79 0x59 0x00 ] - [ 0x16 0x75 0x55 0x00 ] - [ 0x17 0x69 0x49 0x00 ] - [ 0x18 0x6f 0x4f 0xf8 ] - [ 0x19 0x70 0x50 0xfe ] - [ 0x1a 0x5b 0x7b 0x00 ] - [ 0x1b 0x5d 0x7d 0x00 ] - [ 0x1e 0x61 0x41 0xe6 ] - [ 0x1f 0x73 0x53 0xdf ] - [ 0x20 0x64 0x44 0xf0 ] - [ 0x21 0x66 0x46 0xf0 ] - [ 0x22 0x67 0x47 0xbf ] - [ 0x23 0x68 0x48 0xb1 ] - [ 0x25 0x6b 0x4b 0xa2 ] - [ 0x26 0x6c 0x4c 0xb3 ] - [ 0x27 0x3b 0x3a 0x00 ] - [ 0x28 0x27 0x22 0x00 ] - [ 0x29 0x60 0x7e 0xac ] - [ 0x2b 0x5c 0x7c 0x00 ] - [ 0x2c 0x7a 0x5a 0xab ] - [ 0x2d 0x78 0x58 0xbb ] - [ 0x2e 0x63 0x43 0xa2 ] - [ 0x2f 0x76 0x56 0x00 ] - [ 0x30 0x62 0x42 0x00 ] - [ 0x32 0x6d 0x4d 0xb5 ] - [ 0x33 0x2c 0x3c 0x00 ] - [ 0x34 0x2e 0x3e 0xb7 ] - [ 0x35 0x2f 0x3f 0x00 ] - [ 0x56 0x00 0xa4 0x7c ] + [ 0x56 0x3c 0x3e 0x7c ] ] def /keymap.lv [ @@ -2402,12 +2360,12 @@ [ "cz" keymap.cz "Czechia" [ "_CZ" ] .undef ] [ "dk" keymap.dk "Denmark" [ "_DK" ] .undef ] [ "us_dvorak" keymap.us_dvorak "Dvorak" [ ] .undef ] - [ "epo" keymap.epo "Esperanto" [ ] .undef ] + [ "epo" keymap.epo "Esperanto" [ "eo" ] .undef ] [ "ee" keymap.ee "Estonia" [ "_EE" ] .undef ] [ "fo" keymap.fo "Faroe Islands" [ ] .undef ] [ "fi" keymap.fi "Finland" [ "_FI" ] .undef ] [ "fi_smi" keymap.fi_smi "Finland (Saami)" [ "se_FI" ] .undef ] - [ "fr" keymap.fr "France" [ "fr_" ] .undef ] + [ "fr_oss" keymap.fr_oss "France" [ "fr_" ] .undef ] [ "ge" keymap.ge "Georgia" [ "ka_" ] .undef ] [ "de" keymap.de "Germany" [ "de_" ] .undef ] [ "gh" keymap.gh "Ghana" [ ] .undef ] @@ -2429,7 +2387,7 @@ [ "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 ] - [ "lv" keymap.lv "Latvia" [ ] .undef ] + [ "lv" keymap.lv "Latvia" [ "_LV" ] .undef ] [ "lt" keymap.lt "Lithuania" [ "_LT" ] .undef ] [ "mk" keymap.mk "Macedonia" [ "_MK" ] .undef ] [ "in_mal" keymap.in_mal "Malayalam" [ "ml_" ] .undef ] diff --git a/scrape-console-setup b/scrape-console-setup index 47aeb0b..9536054 100755 --- a/scrape-console-setup +++ b/scrape-console-setup @@ -35,6 +35,7 @@ my %keymap_locales = ( 'it' => '_IT', 'jp' => '_JP', 'lt' => '_LT', + 'lv' => '_LV', 'mk' => '_MK', 'nl' => '_NL', 'mn' => '_MN', @@ -59,7 +60,8 @@ my %keymap_locales = ( 'ba' => 'bs_', 'de' => 'de_', 'gr' => 'el_', - 'fr' => 'fr_', + 'epo' => 'eo', # lack of trailing underscore is deliberate + 'fr_oss' => 'fr_', 'in_guj' => 'gu_', 'in' => 'hi_', 'hr' => 'hr_', @@ -78,12 +80,14 @@ my %keymap_locales = ( # Non-top-level layouts to put on the menu. my @show_variants = ( 'ch_fr', + 'fr_oss', 'tr_f', 'us_dvorak', ); # Exclude these keymaps. my @exclude_keymaps = ( + 'fr', 'nec/jp', 'nec_vndr/jp', ); @@ -97,6 +101,7 @@ my %description_overrides = ( 'ch' => 'Swiss German', 'cs' => 'Serbia', 'fi_smi' => 'Finland (Saami)', + 'fr_oss' => 'France', 'in_guj' => 'Gujarati', 'in_guru' => 'Gurmukhi', 'in_kan' => 'Kannada', @@ -135,6 +140,7 @@ my @non_latin = ( 'la', 'lao', 'lk', + 'lt', 'mk', 'mm', 'mn',