From 7257bfe97ed6dbcae323ace002129945e77531f7 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Mon, 16 Apr 2012 00:53:54 +0100 Subject: [PATCH] Remove duplicate Catalan layout from keymap panel, which crept in when the ad layout was renamed from Andorra to Catalan. We currently prefer es_cat; I don't know for sure whether this is "correct", but it's in sync with console-setup and at this point in the release cycle that's the main thing. --- debian/changelog | 10 ++++++++++ keytables.inc | 22 +--------------------- scrape-console-setup | 1 + 3 files changed, 12 insertions(+), 21 deletions(-) diff --git a/debian/changelog b/debian/changelog index a6310ea..818610b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +gfxboot-theme-ubuntu (0.13.1) UNRELEASED; urgency=low + + * Remove duplicate Catalan layout from keymap panel, which crept in when + the ad layout was renamed from Andorra to Catalan. We currently prefer + es_cat; I don't know for sure whether this is "correct", but it's in + sync with console-setup and at this point in the release cycle that's + the main thing. + + -- Colin Watson Mon, 16 Apr 2012 00:50:37 +0100 + gfxboot-theme-ubuntu (0.13.0) precise; urgency=low * Update translations from Launchpad. diff --git a/keytables.inc b/keytables.inc index d644cab..56f4d0b 100644 --- a/keytables.inc +++ b/keytables.inc @@ -11,25 +11,6 @@ /.km.locales 3 def /.km.model 4 def -/keymap.ad [ - [ 0x03 0x32 0x40 0x00 ] - [ 0x08 0x37 0x26 0x00 ] - [ 0x0a 0x39 0x28 0x00 ] - [ 0x11 0x77 0x57 0xe9 ] - [ 0x12 0x65 0x45 0xe8 ] - [ 0x15 0x79 0x59 0xfc ] - [ 0x16 0x75 0x55 0xfa ] - [ 0x17 0x69 0x49 0xed ] - [ 0x18 0x6f 0x4f 0xf3 ] - [ 0x19 0x70 0x50 0xf2 ] - [ 0x1b 0x5d 0x7d 0x00 ] - [ 0x1e 0x61 0x41 0xe0 ] - [ 0x25 0x6b 0x4b 0xef ] - [ 0x26 0x6c 0x4c 0xb7 ] - [ 0x2e 0x63 0x43 0xe7 ] - [ 0x56 0x3c 0x3e 0x7c ] -] def - /keymap.af [ [ 0x02 0x00 0x21 0x60 ] [ 0x03 0x00 0x00 0x40 ] @@ -2915,7 +2896,6 @@ [ "mm" keymap.mm "Burmese" [ ] .undef ] [ "cm" keymap.cm "Cameroon" [ ] .undef ] [ "ca" keymap.ca "Canada" [ "_CA" ] .undef ] - [ "ad" keymap.ad "Catalan" [ ] .undef ] [ "es_cat" keymap.es_cat "Catalan" [ "ca_ES" ] .undef ] [ "cn" keymap.cn "Chinese" [ "zh_CN" ] .undef ] [ "cd" keymap.cd "Congo" [ ] .undef ] @@ -3007,4 +2987,4 @@ ] def % set to "us" for safety -/config.keymap keymaps 101 get def +/config.keymap keymaps 100 get def diff --git a/scrape-console-setup b/scrape-console-setup index 3d3e388..c57bc9b 100755 --- a/scrape-console-setup +++ b/scrape-console-setup @@ -94,6 +94,7 @@ my @show_variants = ( # Exclude these keymaps. my @exclude_keymaps = ( + 'ad', # name collision with es_cat 'brai', 'braille', 'fr',