Comment 5 for bug 2025363

Hi Heinrich, thank you for working on the console-setup merge.

I see you provided a debdiff patch, which tries to patch the ./CHANGES file. This file is a symlink to debian/changelog and cannot be patched. The patch applies cleanly when this hunk is removed.

Also, I see that this package is being maintained in git-ubuntu and @liushuyu-011 apparently put lots of effort into separating all the delta into logical commits: https://git.launchpad.net/ubuntu/+source/console-setup/log/?h=ubuntu/devel So I would feel bad about throwing away all of this work (git history), by uploading a plain debdiff.

Furthermore, When I was trying to re-create the git-history I spotted some differences between your debdiff and the rebased branch (see diff below), which I'd like to ask you to investigate and explain if those are relevant.

May I ask you to rebase your work using the git-ubuntu branches and creating a merge-proposal attached to this bug report instead? This should also automatically avoid the CHANGES symlink issue.

```diff
diff --git a/Keyboard/KeyboardNames.pl b/Keyboard/KeyboardNames.pl
index 8c80646..ab1beb3 100644
--- a/Keyboard/KeyboardNames.pl
+++ b/Keyboard/KeyboardNames.pl
@@ -157,7 +157,6 @@ package KeyboardNames;
     'OLPC' => 'olpc',
     'Ortek Multimedia/Internet MCK-800' => 'oretec',
     'PC-98' => 'pc98',
- 'PinePhone Keyboard' => 'ppkb',
     'Propeller Voyager KTEZ-1000' => 'propeller',
     'QTronix Scorpius 98N+' => 'qtronix',
     'SVEN Ergonomic 2500' => 'sven',
@@ -249,6 +248,7 @@ package KeyboardNames;
     'Hungarian' => 'hu',
     'Icelandic' => 'is',
     'Indian' => 'in',
+ 'Indonesian (Javanese)' => 'jv',
     'Indonesian (Latin)' => 'id',
     'Iraqi' => 'iq',
     'Irish' => 'ie',
@@ -375,11 +375,12 @@ package KeyboardNames;
    'Belarusian (Latin)' => 'latin',
    'Belarusian (intl.)' => 'intl',
    'Belarusian (legacy)' => 'legacy',
- 'Belarusian (phonetic)' => 'phonetic',
    'Russian (Belarus)' => 'ru',
     },
     'ca' => {
- 'Canadian (CSA)' => 'multix',
+ 'Canadian (intl.)' => 'multix',
+ 'Canadian (intl., 1st part)' => 'multi',
+ 'Canadian (intl., 2nd part)' => 'multi-2gr',
    'English (Canada)' => 'eng',
    'French (Canada, Dvorak)' => 'fr-dvorak',
    'French (Canada, legacy)' => 'fr-legacy',
@@ -485,12 +486,12 @@ package KeyboardNames;
    'Faroese (no dead keys)' => 'nodeadkeys',
     },
     'fr' => {
- 'Breton (France)' => 'bre',
    'French (AZERTY)' => 'azerty',
    'French (AZERTY, AFNOR)' => 'afnor',
    'French (BEPO)' => 'bepo',
    'French (BEPO, AFNOR)' => 'bepo_afnor',
    'French (BEPO, Latin-9 only)' => 'bepo_latin9',
+ 'French (Breton)' => 'bre',
    'French (Dvorak)' => 'dvorak',
    'French (Macintosh)' => 'mac',
    'French (US)' => 'us',
@@ -565,10 +566,8 @@ package KeyboardNames;
    'Hungarian (standard)' => 'standard',
     },
     'id' => {
- 'Indonesian (Arab Melayu, extended phonetic)' => 'melayu-phoneticx',
- 'Indonesian (Arab Melayu, phonetic)' => 'melayu-phonetic',
- 'Indonesian (Arab Pegon, phonetic)' => 'pegon-phonetic',
- 'Javanese' => 'javanese',
+ 'Indonesian (Arab Pegon, extended phonetic)' => 'phoneticx',
+ 'Indonesian (Arab Pegon, phonetic)' => 'phonetic',
     },
     'ie' => {
    'CloGaelach' => 'CloGaelach',
@@ -590,7 +589,6 @@ package KeyboardNames;
    'Bangla (India, Probhat)' => 'ben_probhat',
    'English (India, with rupee)' => 'eng',
    'Gujarati' => 'guj',
- 'Gujarati (KaGaPa, phonetic)' => 'guj-kagapa',
    'Hindi (Bolnagri)' => 'bolnagri',
    'Hindi (KaGaPa, phonetic)' => 'hin-kagapa',
    'Hindi (Wx)' => 'hin-wx',
@@ -610,12 +608,11 @@ package KeyboardNames;
    'Punjabi (Gurmukhi Jhelum)' => 'jhelum',
    'Punjabi (Gurmukhi)' => 'guru',
    'Sanskrit (KaGaPa, phonetic)' => 'san-kagapa',
- 'Tamil (InScript, with Arabic numerals)' => 'tam',
- 'Tamil (InScript, with Tamil numerals)' => 'tam_tamilnumbers',
- 'Tamil (TamilNet 99 with Tamil numerals)' => 'tamilnet_tamilnumbers',
- 'Tamil (TamilNet 99)' => 'tamilnet',
- 'Tamil (TamilNet 99, TAB encoding)' => 'tamilnet_TAB',
- 'Tamil (TamilNet 99, TSCII encoding)' => 'tamilnet_TSCII',
+ 'Tamil (InScript)' => 'tam',
+ 'Tamil (TamilNet 99 with Tamil numerals)' => 'tam_tamilnet_with_tam_nums',
+ 'Tamil (TamilNet 99)' => 'tam_tamilnet',
+ 'Tamil (TamilNet 99, TAB encoding)' => 'tam_tamilnet_TAB',
+ 'Tamil (TamilNet 99, TSCII encoding)' => 'tam_tamilnet_TSCII',
    'Telugu' => 'tel',
    'Telugu (KaGaPa, phonetic)' => 'tel-kagapa',
    'Telugu (Sarala)' => 'tel-sarala',
@@ -630,7 +627,6 @@ package KeyboardNames;
    'Kurdish (Iraq, Latin Q)' => 'ku',
     },
     'ir' => {
- 'Azerbaijani (Iran)' => 'azb',
    'Kurdish (Iran, Arabic-Latin)' => 'ku_ara',
    'Kurdish (Iran, F)' => 'ku_f',
    'Kurdish (Iran, Latin Alt-Q)' => 'ku_alt',
@@ -679,6 +675,7 @@ package KeyboardNames;
    'Lao (STEA)' => 'stea',
     },
     'latam' => {
+ 'Spanish (Latin American, Colemak for gaming)' => 'colemak-gaming',
    'Spanish (Latin American, Colemak)' => 'colemak',
    'Spanish (Latin American, Dvorak)' => 'dvorak',
    'Spanish (Latin American, dead tilde)' => 'deadtilde',
@@ -700,11 +697,10 @@ package KeyboardNames;
     },
     'lv' => {
    'Latvian (F)' => 'fkey',
- 'Latvian (Modern Cyrillic)' => 'modern-cyr',
- 'Latvian (Modern Latin)' => 'modern',
    'Latvian (adapted)' => 'adapted',
    'Latvian (apostrophe)' => 'apostrophe',
    'Latvian (ergonomic, ŪGJRMV)' => 'ergonomic',
+ 'Latvian (modern)' => 'modern',
    'Latvian (tilde)' => 'tilde',
     },
     'ma' => {
@@ -823,7 +819,6 @@ package KeyboardNames;
    'Serbian (Latin, with guillemets)' => 'latinalternatequotes',
     },
     'ru' => {
- 'Abkhazian (Russia)' => 'ab',
    'Bashkirian' => 'bak',
    'Chuvash' => 'cv',
    'Chuvash (Latin)' => 'cv_latin',
@@ -834,8 +829,6 @@ package KeyboardNames;
    'Ossetian (legacy)' => 'os_legacy',
    'Russian (DOS)' => 'dos',
    'Russian (Macintosh)' => 'mac',
- 'Russian (engineering, EN)' => 'ruchey_en',
- 'Russian (engineering, RU)' => 'ruchey_ru',
    'Russian (legacy)' => 'legacy',
    'Russian (phonetic)' => 'phonetic',
    'Russian (phonetic, AZERTY)' => 'phonetic_azerty',
@@ -897,7 +890,6 @@ package KeyboardNames;
    'Ottoman (F)' => 'otf',
    'Ottoman (Q)' => 'ot',
    'Turkish (Alt-Q)' => 'alt',
- 'Turkish (E)' => 'e',
    'Turkish (F)' => 'f',
    'Turkish (intl., with dead keys)' => 'intl',
     },
@@ -922,7 +914,6 @@ package KeyboardNames;
    'Cherokee' => 'chr',
    'English (Colemak)' => 'colemak',
    'English (Colemak-DH ISO)' => 'colemak_dh_iso',
- 'English (Colemak-DH Ortholinear)' => 'colemak_dh_ortho',
    'English (Colemak-DH)' => 'colemak_dh',
    'English (Dvorak)' => 'dvorak',
    'English (Dvorak, Macintosh)' => 'dvorak-mac',
@@ -950,7 +941,7 @@ package KeyboardNames;
    'Uzbek (Latin)' => 'latin',
     },
     'vn' => {
- 'Vietnamese (France)' => 'fr',
+ 'Vietnamese (French)' => 'fr',
    'Vietnamese (US)' => 'us',
     },
 );
```