diff -ruN console-setup-1.221ubuntu2/debian/changelog console-setup-1.222ubuntu1/debian/changelog --- console-setup-1.221ubuntu2/debian/changelog 2023-06-20 19:58:06.000000000 +0200 +++ console-setup-1.222ubuntu1/debian/changelog 2023-07-20 15:00:26.517425133 +0200 @@ -1,3 +1,105 @@ +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 list of "debconf-selectable" + layouts for the udebs, since we don't use this debconf question in Ubuntu + and all layouts are selectable. + - Make COPYRIGHT a symlink to debian/copyright + - Don't cat over the keymaps; they're already moved to the right place. + - Add Keyboard/Makefile rule to build pc105.tree + - Include pc105.tree for ubiquity; make sure it gets built. + - debian/control: Build depend on keymapper + - Make sure we give a meaningful name to ch layouts: "Switzerland" instead + of "German (Switzerland), since it includes French too. + - Keyboard/Makefile: make sure KeyboardNames.pl is built with accurate data + from xkb-data. + - xmlreader, KeyboardNames.pl: Added model entry to skip model selection + - Fix command injection in ckbcomp + - Generate a locale locally for translating keyboard names in + kbdnames-maker. + - setupcon: + - use only /run for tempfiles with /tmp as a non-root fallback. + - handle compressed console maps and font files. + - Map XKBMODEL=SKIP to '' for compatibility with existing + configs. + - the variables are taken from a config file which, if changed, + invalidates the cache. + - there is only ever one keyboard map per system. + - the system should not have to resolve filenames to find the keymap + cache on boot. + - Explicitly exit 0, so that postinsts don't fail in the event that + loadkeys can't find a console. + - Add noudeb build profile + - Remove obsoleted Vcs-Bzr field + + -- Heinrich Schuchardt Thu, 20 Jul 2023 14:59:22 +0200 + +console-setup (1.222) unstable; urgency=medium + + * Team upload + * New no-change upload, since the NMU failed to build + - I suspect the '+nmu1' in the version string has something to do + with it. Also the BTS seems to not understand that version string, + so again: closes: #1038759, #1038729 . + + -- Gunnar Hjalmarsson Wed, 21 Jun 2023 21:34:22 +0200 + +console-setup (1.221+nmu1) unstable; urgency=medium + + * Non-maintainer upload + * No-change upload to build against xkb-data 2.38-2 + (merge request !19, closes: #1038759, #1038729) + + -- Gunnar Hjalmarsson Wed, 21 Jun 2023 19:20:15 +0200 + console-setup (1.221ubuntu2) mantic; urgency=medium * Rebuild against latest xkeyboard-config. diff -ruN console-setup-1.221ubuntu2/debian/po/templates.pot console-setup-1.222ubuntu1/debian/po/templates.pot --- console-setup-1.221ubuntu2/debian/po/templates.pot 2023-06-20 18:10:14.000000000 +0200 +++ console-setup-1.222ubuntu1/debian/po/templates.pot 2023-07-20 14:58:33.253940748 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: console-setup\n" "Report-Msgid-Bugs-To: console-setup@packages.debian.org\n" -"POT-Creation-Date: 2023-05-21 21:36+0000\n" +"POT-Creation-Date: 2023-06-21 21:46+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n"