Merge console-setup 1.222 into mantic

console-setup - 1.222ubuntu1 is available in ppa:xypron/merge-from-debian

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, phon...

Thanks Lukas for reviewing.

The changes in Keyboard/KeyboardNames.pl were introduced by running dpkg-buildpackage -S -sa -d.

I will look into it again.

I'll unsubscribe ~ubuntu-sponsors for now. Please re-subscribe once the merge is ready again.

The only differences between Debian's source packages console-setup-1.221 and console-setup-1.222 are in the debian/changelog and in file debian/po/templates.pot where the value of POT-Creation-Date was changed.

So no further changes than updating debian/changelog and debian/po/templates.pot are needed when going from console-setup-1.221ubuntu2 to console-setup-1.221ubuntu1.

These changes are in appended file console-setup-1.222ubuntu1.diff.

Running dpkg-buildpackage -S -sa -d results in further changes in files

* Fonts/bdf/unifont.bdf
* Keyboard/KeyboardNames.pl

These changes will be reported when running debdiff for the generated dsc file to create a debdiff.

https://code.launchpad.net/~xypron/ubuntu/+source/console-setup/+git/console-setup/+merge/447309

This bug was fixed in the package console-setup - 1.222ubuntu1

---------------
console-setup (1.222ubuntu1) mantic; urgency=medium

  * Merge with Debian unstable (LP: #2025363). Remaining changes:
    - debian/clean: Delete Keyboard/tree-keymaps/ on clean
    - Add an apport hook
    - If the locale is C during configuration, only set CHARMAP to ISO-8859-15
      on kFreeBSD; otherwise restore the previous behaviour from before the
      kFreeBSD port of using UTF-8 in that case.
    - Do not set default FONTFACE or FONTSIZE for Lat15, kernel has built-in
      Terminus font, at multitiple sizes, and it correctly selects low/high
      dpi font size, based on screen resolution.
    - Set keymap and font in the initramfs if possible and sensible
      debian/vtrgb, debian/vtrgb.vga, debian/console-setup-linux.setvtrgb.service,
      debian/rules, debian/console-setup-linux.{postinst, prerm}: use Ubuntu's
      virtual terminal color scheme by default, with a VGA color scheme available
      as an alternative.
    - Handle unattended upgrades without breaking plymouth when updating
      console fonts.
    - Tolerate absence of setupcon in postinst scripts. Should be fixed by
      refactoring to not have a keyboard-configuration package that needs to
      call setupcon without depending on it.
    - Don't copy keyboard-configuration questions to /target in OEM mode.
      oem-config will ask them later, and copying these confuses it.
    - Added templates for keyboard detection
    - debian/control: drop freebsd-specific packages
    - If the detect-keyboard debconf plugin is available
      (cdebconf-newt-detect-keys in the installer), then offer to use it to
      detect the keyboard layout.
    - keyboard-configuration.config: While sourcing config files to re-seed
      debconf, treat missing XKBOPTIONS as empty.
    - Fix default keyboard selection for language/country combinations
      lacking a proper combined locale.
    - debian/keyboard-configuration.config: lower the priority for the layout
      question.
    - Map ppc64el/* to XKBMODEL=pc105
    - Set default for Dutch to us(intl), not just us.
    - Set default layout for Kurdish to tr(ku)
    - Set default layout for Vietnam to 'us'
    - debian/keyboard-configuration.config: change back the french default layout to
      be fr+oss and not fr+latin9
    - debian/keyboard-configuration.config: Drop the xkb-keymap bits once
      again as we're not ready for those yet, as it's currently causing an
      invalid default layout in the installer.
    - keyboard-configuration.{config,templates}: There is no good default
      for layout toggling, stop pretending there is. Console users can set
      one with dpkg-reconfigure or editing /etc/defaults/keyboard
    - keyboard_present.sh: Quiet config/postinst when we have no USB devices
    - debian/preprocessor: revert the removal of keyboard names (for size) of
      console-setup-udeb: we do need those, since we don't use the simplified
      xkb-keymap template from Debian just yet: this way we can still show
      country/language names when selecting a keyboard, layout or variant
    - debian/rules: revert hard-coding of a lis...