* Update for Vietnamese default layout change in console-setup

1.21ubuntu3.

debian/changelog

@@ -6,6 +6,8 @@ gfxboot-theme-ubuntu (0.5.6) UNRELEASED; urgency=low
     font (LP: #106074, #195451).
   * Update keymaps from console-setup 1.21ubuntu3, fixing a number of
     Eastern European keymaps (LP: #196045).
+  * Update for Vietnamese default layout change in console-setup
+    1.21ubuntu3.
 
  -- Colin Watson <cjwatson@ubuntu.com>  Fri, 29 Feb 2008 17:48:18 +0000
 

keytables.inc

@@ -2599,11 +2599,11 @@
   [ "tr" keymap.tr "Turkey" [ "_TR" ] .undef ]
   [ "tr_f" keymap.tr_f "Turkey ((F))" [ ] .undef ]
   [ "gb" keymap.gb "UK" [ "_GB" ] .undef ]
-  [ "us" keymap.us "USA" [ "en_US" ] .undef ]
+  [ "us" keymap.us "USA" [ "en_US" "_VN" ] .undef ]
   [ "us_intl" keymap.us_intl "USA Intl." [ "_NL" ] .undef ]
   [ "ua" keymap.ua "Ukraine" [ "_UA" ] .undef ]
   [ "uz" keymap.uz "Uzbekistan" [ ] .undef ]
-  [ "vn" keymap.vn "Vietnam" [ "_VN" ] .undef ]
+  [ "vn" keymap.vn "Vietnam" [ ] .undef ]
 ] def
 
 % set to "us" for safety

scrape-console-setup

@@ -53,9 +53,8 @@ my %keymap_locales = (
     'th' => '_TH',
     'tr' => '_TR',
     'ua' => '_UA',
-    'us' => 'en_US',
+    'us' => ['en_US', '_VN'],
     'us_intl' => '_NL',
-    'vn' => '_VN',
     'latam' => ['_AR', '_BO', '_CL', '_CO', '_CR', '_DO', '_EC', '_GT', '_HN', '_MX', '_NI', '_PA', '_PE', 'es_PR', '_PY', '_SV', 'es_US', '_UY', '_VE'],
     'ara' => 'ar_',
     'ba' => 'bs_',