From 9f82451c319a937c5d2cb9e7045320ccb0203168 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@canonical.com>
Date: Thu, 1 Oct 2009 20:48:59 +0100
Subject: [PATCH] Sync with console-setup 1.34ubuntu4: add Asturian, Catalan,
 Senegal, and Turkmenistan layouts.

---
 debian/changelog     |   7 ++
 keytables.inc        | 192 +++++++++++++++++++++++++++++++++++++++----
 scrape-console-setup |   7 ++
 3 files changed, 190 insertions(+), 16 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f043de0..b4bd8c1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+gfxboot-theme-ubuntu (0.8.5) UNRELEASED; urgency=low
+
+  * Sync with console-setup 1.34ubuntu4: add Asturian, Catalan, Senegal, and
+    Turkmenistan layouts.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Thu, 01 Oct 2009 20:48:01 +0100
+
 gfxboot-theme-ubuntu (0.8.4) karmic; urgency=low
 
   * Use gfxboot-compile instead of mkbootmsg if it's present, in order to
diff --git a/keytables.inc b/keytables.inc
index 6850a30..434f267 100644
--- a/keytables.inc
+++ b/keytables.inc
@@ -734,6 +734,104 @@
   [ 0x56 0x3c 0x3e 0x7c ]
 ] def
 
+/keymap.es_ast [
+  [ 0x02 0x31 0x21 0x7c ]
+  [ 0x03 0x32 0x22 0x40 ]
+  [ 0x04 0x33 0xb7 0x23 ]
+  [ 0x05 0x34 0x24 0x7e ]
+  [ 0x06 0x35 0x25 0xbd ]
+  [ 0x07 0x36 0x26 0xac ]
+  [ 0x08 0x37 0x2f 0x7b ]
+  [ 0x09 0x38 0x28 0x5b ]
+  [ 0x0a 0x39 0x29 0x5d ]
+  [ 0x0b 0x30 0x3d 0x7d ]
+  [ 0x0c 0x27 0x3f 0x5c ]
+  [ 0x0d 0xa1 0xbf 0x7e ]
+  [ 0x10 0x71 0x51 0x40 ]
+  [ 0x11 0x77 0x57 0x00 ]
+  [ 0x12 0x65 0x45 0x00 ]
+  [ 0x13 0x72 0x52 0xb6 ]
+  [ 0x14 0x74 0x54 0x00 ]
+  [ 0x15 0x79 0x59 0x00 ]
+  [ 0x16 0x75 0x55 0x00 ]
+  [ 0x17 0x69 0x49 0x00 ]
+  [ 0x18 0x6f 0x4f 0xf8 ]
+  [ 0x19 0x70 0x50 0xfe ]
+  [ 0x1a 0x00 0x00 0x5b ]
+  [ 0x1b 0x2b 0x2a 0x5d ]
+  [ 0x1e 0x61 0x41 0xe6 ]
+  [ 0x1f 0x73 0x53 0xdf ]
+  [ 0x20 0x64 0x44 0xf0 ]
+  [ 0x21 0x66 0x46 0x00 ]
+  [ 0x22 0x67 0x47 0x00 ]
+  [ 0x23 0x68 0x48 0x00 ]
+  [ 0x25 0x6b 0x4b 0x00 ]
+  [ 0x26 0x6c 0x4c 0x00 ]
+  [ 0x27 0xf1 0xd1 0x7e ]
+  [ 0x28 0x00 0x00 0x7b ]
+  [ 0x29 0xba 0xaa 0x5c ]
+  [ 0x2b 0xe7 0xc7 0x7d ]
+  [ 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 0x3b 0x00 ]
+  [ 0x34 0x2e 0x3a 0xb7 ]
+  [ 0x35 0x2d 0x5f 0x00 ]
+  [ 0x56 0x3c 0x3e 0x7c ]
+] def
+
+/keymap.es_cat [
+  [ 0x02 0x31 0x21 0x7c ]
+  [ 0x03 0x32 0x22 0x40 ]
+  [ 0x04 0x33 0xb7 0x23 ]
+  [ 0x05 0x34 0x24 0x7e ]
+  [ 0x06 0x35 0x25 0xbd ]
+  [ 0x07 0x36 0x26 0xac ]
+  [ 0x08 0x37 0x2f 0x7b ]
+  [ 0x09 0x38 0x28 0x5b ]
+  [ 0x0a 0x39 0x29 0x5d ]
+  [ 0x0b 0x30 0x3d 0x7d ]
+  [ 0x0c 0x27 0x3f 0x5c ]
+  [ 0x0d 0xa1 0xbf 0x7e ]
+  [ 0x10 0x71 0x51 0x40 ]
+  [ 0x11 0x77 0x57 0x00 ]
+  [ 0x12 0x65 0x45 0x00 ]
+  [ 0x13 0x72 0x52 0xb6 ]
+  [ 0x14 0x74 0x54 0x00 ]
+  [ 0x15 0x79 0x59 0x00 ]
+  [ 0x16 0x75 0x55 0x00 ]
+  [ 0x17 0x69 0x49 0x00 ]
+  [ 0x18 0x6f 0x4f 0xf8 ]
+  [ 0x19 0x70 0x50 0xfe ]
+  [ 0x1a 0x00 0x00 0x5b ]
+  [ 0x1b 0x2b 0x2a 0x5d ]
+  [ 0x1e 0x61 0x41 0xe6 ]
+  [ 0x1f 0x73 0x53 0xdf ]
+  [ 0x20 0x64 0x44 0xf0 ]
+  [ 0x21 0x66 0x46 0x00 ]
+  [ 0x22 0x67 0x47 0x00 ]
+  [ 0x23 0x68 0x48 0x00 ]
+  [ 0x25 0x6b 0x4b 0x00 ]
+  [ 0x26 0x6c 0x4c 0x00 ]
+  [ 0x27 0xf1 0xd1 0x7e ]
+  [ 0x28 0x00 0x00 0x7b ]
+  [ 0x29 0xba 0xaa 0x5c ]
+  [ 0x2b 0xe7 0xc7 0x7d ]
+  [ 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 0x3b 0x00 ]
+  [ 0x34 0x2e 0x3a 0xb7 ]
+  [ 0x35 0x2d 0x5f 0x00 ]
+  [ 0x56 0x3c 0x3e 0x7c ]
+] def
+
 /keymap.et [
   [ 0x56 0x3c 0x3e 0x7c ]
 ] def
@@ -1409,6 +1507,7 @@
   [ 0x27 0x3b 0x2b 0x3b ]
   [ 0x28 0x3a 0x2a 0x3a ]
   [ 0x2b 0x5d 0x7d 0x5d ]
+  [ 0x56 0x3c 0x3e 0x7c ]
   [ 0x59 0x5c 0x5f 0x5c ]
   [ 0x7c 0x5c 0x7c 0x5c ]
 ] def
@@ -1416,11 +1515,10 @@
 /keymap.kg [
   [ 0x03 0x32 0x22 0x32 ]
   [ 0x04 0x33 0x00 0x33 ]
-  [ 0x05 0x34 0x2a 0x34 ]
-  [ 0x06 0x35 0x3a 0x35 ]
-  [ 0x07 0x36 0x2c 0x36 ]
-  [ 0x08 0x37 0x2e 0x37 ]
-  [ 0x09 0x38 0x3b 0x38 ]
+  [ 0x05 0x34 0x3b 0x34 ]
+  [ 0x07 0x36 0x3a 0x36 ]
+  [ 0x08 0x37 0x3f 0x37 ]
+  [ 0x35 0x2e 0x2c 0x2e ]
   [ 0x56 0x2f 0x7c 0x7c ]
 ] def
 
@@ -2025,26 +2123,23 @@
   [ 0x03 0x32 0x22 0x00 ]
   [ 0x04 0x33 0x23 0x00 ]
   [ 0x05 0x34 0x24 0x00 ]
-  [ 0x06 0x35 0x25 0x2a ]
+  [ 0x06 0x35 0x25 0x00 ]
   [ 0x07 0x36 0x26 0x00 ]
   [ 0x08 0x37 0x2f 0x00 ]
-  [ 0x09 0x38 0x28 0x2e ]
+  [ 0x09 0x38 0x28 0x38 ]
   [ 0x0a 0x39 0x29 0x00 ]
-  [ 0x0b 0x30 0x3d 0x00 ]
-  [ 0x0c 0x27 0x3f 0x00 ]
+  [ 0x0b 0x30 0x3d 0x30 ]
+  [ 0x0c 0x27 0x3f 0x5f ]
   [ 0x0d 0x2b 0x2a 0x00 ]
   [ 0x10 0x00 0x00 0x5c ]
   [ 0x11 0x00 0x00 0x7c ]
   [ 0x13 0x00 0x00 0xb6 ]
-  [ 0x18 0x00 0x00 0xf8 ]
-  [ 0x19 0x00 0x00 0xfe ]
+  [ 0x18 0x00 0x00 0xa7 ]
   [ 0x1a 0x00 0x00 0xf7 ]
   [ 0x1b 0x00 0x00 0xd7 ]
-  [ 0x1e 0x00 0x00 0xe6 ]
   [ 0x21 0x00 0x00 0x5b ]
   [ 0x22 0x00 0x00 0x5d ]
-  [ 0x28 0x00 0x00 0xdf ]
-  [ 0x29 0x60 0x7e 0xac ]
+  [ 0x29 0x60 0x7e 0xb0 ]
   [ 0x2b 0x00 0x00 0xa4 ]
   [ 0x2e 0x00 0x00 0xa2 ]
   [ 0x2f 0x00 0x00 0x40 ]
@@ -2194,7 +2289,7 @@
   [ 0x25 0x6b 0x4b 0x00 ]
   [ 0x26 0x6c 0x4c 0x00 ]
   [ 0x28 0x00 0x00 0xdf ]
-  [ 0x29 0x60 0x7e 0xac ]
+  [ 0x29 0xb8 0xa8 0xac ]
   [ 0x2b 0x00 0x00 0xa4 ]
   [ 0x2c 0x79 0x59 0x00 ]
   [ 0x2d 0x78 0x58 0x00 ]
@@ -2261,6 +2356,55 @@
   [ 0x56 0x5c 0x7c 0x2f ]
 ] def
 
+/keymap.sn [
+  [ 0x02 0x26 0x31 0x7c ]
+  [ 0x03 0xe9 0x32 0x7e ]
+  [ 0x04 0x22 0x33 0x23 ]
+  [ 0x05 0x27 0x34 0x7b ]
+  [ 0x06 0x28 0x35 0x5b ]
+  [ 0x07 0x2d 0x36 0x7c ]
+  [ 0x08 0xe8 0x37 0x00 ]
+  [ 0x09 0x5f 0x38 0x5c ]
+  [ 0x0a 0xe7 0x39 0x5e ]
+  [ 0x0b 0xe0 0x30 0x40 ]
+  [ 0x0c 0x29 0xb0 0x5d ]
+  [ 0x0d 0x3d 0x2b 0x7d ]
+  [ 0x10 0x61 0x41 0xe6 ]
+  [ 0x11 0x7a 0x5a 0xab ]
+  [ 0x12 0x65 0x45 0x00 ]
+  [ 0x13 0x72 0x52 0xb6 ]
+  [ 0x14 0x74 0x54 0x00 ]
+  [ 0x15 0x79 0x59 0x00 ]
+  [ 0x16 0x75 0x55 0x00 ]
+  [ 0x17 0x69 0x49 0x00 ]
+  [ 0x18 0x6f 0x4f 0xf8 ]
+  [ 0x19 0x70 0x50 0xfe ]
+  [ 0x1a 0x00 0x00 0x5b ]
+  [ 0x1b 0x24 0xa3 0xa4 ]
+  [ 0x1e 0x71 0x51 0x40 ]
+  [ 0x1f 0x73 0x53 0xdf ]
+  [ 0x20 0x64 0x44 0xf0 ]
+  [ 0x21 0x66 0x46 0x00 ]
+  [ 0x22 0x67 0x47 0x00 ]
+  [ 0x23 0x68 0x48 0x00 ]
+  [ 0x25 0x6b 0x4b 0x00 ]
+  [ 0x26 0x6c 0x4c 0x00 ]
+  [ 0x27 0x6d 0x4d 0xb5 ]
+  [ 0x28 0xf1 0xd1 0x27 ]
+  [ 0x29 0xb2 0x25 0xac ]
+  [ 0x2b 0xb5 0xa3 0x60 ]
+  [ 0x2c 0x77 0x57 0x00 ]
+  [ 0x2d 0x78 0x58 0xbb ]
+  [ 0x2e 0x63 0x43 0xa2 ]
+  [ 0x2f 0x76 0x56 0x00 ]
+  [ 0x30 0x62 0x42 0x00 ]
+  [ 0x32 0x2c 0x3f 0xbf ]
+  [ 0x33 0x3b 0x2e 0x00 ]
+  [ 0x34 0x3a 0x2f 0xb7 ]
+  [ 0x35 0x21 0xa7 0xa1 ]
+  [ 0x56 0x3c 0x3e 0x7c ]
+] def
+
 /keymap.sy [
   [ 0x56 0x3c 0x3e 0x7c ]
 ] def
@@ -2273,6 +2417,18 @@
   [ 0x56 0x3c 0x3e 0x7c ]
 ] def
 
+/keymap.tm [
+  [ 0x10 0xe4 0xc4 0x71 ]
+  [ 0x1a 0x00 0x00 0x5b ]
+  [ 0x1b 0xf6 0xd6 0x5d ]
+  [ 0x29 0x00 0x00 0x60 ]
+  [ 0x2b 0x00 0x00 0x5c ]
+  [ 0x2d 0xfc 0xdc 0x78 ]
+  [ 0x2e 0xe7 0xc7 0x63 ]
+  [ 0x2f 0xfd 0xdd 0x76 ]
+  [ 0x56 0x3c 0x3e 0x7c ]
+] def
+
 /keymap.tr [
   [ 0x02 0x31 0x21 0x3e ]
   [ 0x03 0x32 0x27 0xa3 ]
@@ -2568,6 +2724,7 @@
   [ "ad" keymap.ad "Andorra" [ ] .undef ]
   [ "ara" keymap.ara "Arabic" [ "ar_" ] .undef ]
   [ "am" keymap.am "Armenia" [ "hy_" ] .undef ]
+  [ "es_ast" keymap.es_ast "Asturian" [ "ast_ES" ] .undef ]
   [ "az" keymap.az "Azerbaijan" [ "_AZ" ] .undef ]
   [ "bd" keymap.bd "Bangladesh" [ "_BD" ] .undef ]
   [ "by" keymap.by "Belarus" [ "_BY" ] .undef ]
@@ -2578,6 +2735,7 @@
   [ "bg" keymap.bg "Bulgaria" [ "_BG" ] .undef ]
   [ "kh" keymap.kh "Cambodia" [ ] .undef ]
   [ "ca" keymap.ca "Canada" [ "_CA" ] .undef ]
+  [ "es_cat" keymap.es_cat "Catalan" [ "ca_ES" ] .undef ]
   [ "cn" keymap.cn "China" [ "zh_CN" ] .undef ]
   [ "cd" keymap.cd "Congo" [ ] .undef ]
   [ "hr" keymap.hr "Croatia" [ "hr_" ] .undef ]
@@ -2636,6 +2794,7 @@
   [ "fi_smi" keymap.fi_smi "Saami (Fin.)" [ "se_FI" ] .undef ]
   [ "no_smi" keymap.no_smi "Saami (Nor.)" [ "se_NO" ] .undef ]
   [ "se_smi" keymap.se_smi "Saami (Swe.)" [ "se_SE" ] .undef ]
+  [ "sn" keymap.sn "Senegal" [ ] .undef ]
   [ "rs" keymap.rs "Serbia" [ "sr_" ] .undef ]
   [ "sk" keymap.sk "Slovakia" [ "_SK" ] .undef ]
   [ "si" keymap.si "Slovenia" [ "_SI" ] .undef ]
@@ -2652,6 +2811,7 @@
   [ "th" keymap.th "Thailand" [ "_TH" ] .undef ]
   [ "tr" keymap.tr "Turkey" [ "_TR" ] .undef ]
   [ "tr_f" keymap.tr_f "Turkey ((F))" [ ] .undef ]
+  [ "tm" keymap.tm "Turkmenistan" [ ] .undef ]
   [ "gb" keymap.gb "UK" [ "_GB" ] .undef ]
   [ "us" keymap.us "USA" [ "en_US" "_VN" ] .undef ]
   [ "us_intl" keymap.us_intl "USA Intl." [ "_NL" ] .undef ]
@@ -2661,4 +2821,4 @@
 ] def
 
 % set to "us" for safety
-/config.keymap keymaps 90 get def
+/config.keymap keymaps 94 get def
diff --git a/scrape-console-setup b/scrape-console-setup
index 538e962..b614b44 100755
--- a/scrape-console-setup
+++ b/scrape-console-setup
@@ -23,6 +23,8 @@ my %keymap_locales = (
     'cz' => '_CZ',
     'dk' => '_DK',
     'ee' => '_EE',
+    'es_ast' => 'ast_ES',
+    'es_cat' => 'ca_ES',
     'es' => '_ES',
     'fi_smi' => 'se_FI',
     'fi' => '_FI',
@@ -83,6 +85,8 @@ my %keymap_locales = (
 # Non-top-level layouts to put on the menu.
 my @show_variants = (
     'ch_fr',
+    'es_ast',
+    'es_cat',
     'fr_oss',
     'tr_f',
     'us_dvorak',
@@ -90,6 +94,7 @@ my @show_variants = (
 
 # Exclude these keymaps.
 my @exclude_keymaps = (
+    'brai',
     'braille',
     'fr',
     'nec/jp',
@@ -103,6 +108,8 @@ my %description_overrides = (
     'cd' => 'Congo',
     'ch_fr' => 'Swiss French',
     'ch' => 'Swiss German',
+    'es_ast' => 'Asturian',
+    'es_cat' => 'Catalan',
     'fi_smi' => 'Saami (Fin.)',
     'fo' => 'Faroes',
     'fr_oss' => 'France',