diff -Nru console-setup-1.222/CHANGES console-setup-1.222ubuntu1/CHANGES --- console-setup-1.222/CHANGES 2023-06-21 21:34:22.000000000 +0200 +++ console-setup-1.222ubuntu1/CHANGES 2023-06-29 15:02:36.000000000 +0200 @@ -1,3 +1,87 @@ +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, 29 Jun 2023 15:02:36 +0200 + console-setup (1.222) unstable; urgency=medium * Team upload @@ -16,6 +100,96 @@ -- Gunnar Hjalmarsson Wed, 21 Jun 2023 19:20:15 +0200 +console-setup (1.221ubuntu2) mantic; urgency=medium + + * Rebuild against latest xkeyboard-config. + + -- Colin Watson Tue, 20 Jun 2023 18:58:06 +0100 + +console-setup (1.221ubuntu1) mantic; urgency=medium + + * Merge with Debian unstable (LP: #2020749). 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 + + -- Shengjing Zhu Thu, 25 May 2023 14:30:01 +0000 + console-setup (1.221) unstable; urgency=medium * Team upload. @@ -54,6 +228,105 @@ -- Holger Wansing Tue, 14 Mar 2023 21:19:40 +0100 +console-setup (1.217ubuntu3) lunar; urgency=medium + + * Rebuild against latest xkeyboard-config + + -- Jeremy Bicha Thu, 23 Feb 2023 20:24:27 -0500 + +console-setup (1.217ubuntu2) lunar; urgency=medium + + * Make Keyboard/keymaptree executable again. + + -- Matthias Klose Sat, 18 Feb 2023 14:15:56 +0100 + +console-setup (1.217ubuntu1) lunar; urgency=medium + + * Merge with Debian; 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. + - Change the default font from Fixed to VGA for Lat15; while it's not + entirely complete, it looks better and is largely good enough. + - 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: 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. + - debian/control: we also need xkb-data-i18n as a Build-Depends-Indep to + build a complete set of translated keyboard layout/variant names. + - 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 layout for Kurdish to tr(ku). + - Set default for Dutch to us(intl), not just us. + - Set default layout for Vietnam to 'us'. + - 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. + - Fix command injection in ckbcomp. + - Generate a locale locally for translating keyboard names in + kbdnames-maker. + - Keyboard/Makefile: make sure KeyboardNames.pl is built with accurate data + from xkb-data. + - xmlreader, KeyboardNames.pl: Added model entry to skip model selection. + - Make sure we give a meaningful name to ch layouts: "Switzerland" instead + of "German (Switzerland), since it includes French too. + - 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. + - debian/control: Build depend on keymapper + - debian/keyboard-configuration.config: + - change back the french default layout to be fr+oss and not fr+latin9 + the change was dropped by error in a previous merge + - 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. + + -- Matthias Klose Sat, 18 Feb 2023 12:23:05 +0100 + console-setup (1.217) unstable; urgency=medium [ Updated translations ] @@ -130,6 +403,93 @@ -- Samuel Thibault Tue, 18 Oct 2022 17:14:22 +0200 +console-setup (1.210ubuntu1) kinetic; urgency=medium + + * Merge with Debian; 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. + - Change the default font from Fixed to VGA for Lat15; while it's not + entirely complete, it looks better and is largely good enough. + - 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: 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. + - debian/control: we also need xkb-data-i18n as a Build-Depends-Indep to + build a complete set of translated keyboard layout/variant names. + - 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 layout for Kurdish to tr(ku). + - Set default for Dutch to us(intl), not just us. + - Set default layout for Vietnam to 'us'. + - 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. + - Fix command injection in ckbcomp. + - Generate a locale locally for translating keyboard names in + kbdnames-maker. + - Keyboard/Makefile: make sure KeyboardNames.pl is built with accurate data + from xkb-data. + - xmlreader, KeyboardNames.pl: Added model entry to skip model selection. + - Make sure we give a meaningful name to ch layouts: "Switzerland" instead + of "German (Switzerland), since it includes French too. + - 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. + - debian/control: Build depend on keymapper + - debian/keyboard-configuration.config: + - change back the french default layout to be fr+oss and not fr+latin9 + the change was dropped by error in a previous merge + - 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. + + -- Matthias Klose Thu, 25 Aug 2022 10:25:03 +0200 + console-setup (1.210) unstable; urgency=medium * Team upload. @@ -213,6 +573,109 @@ -- Samuel Thibault Sun, 31 Oct 2021 18:13:37 +0100 +console-setup (1.205ubuntu3) jammy; urgency=medium + + * Keyboard/kbdcompiler: + - backport a build fix from Debian + + -- Sebastien Bacher Mon, 22 Nov 2021 17:39:53 +0100 + +console-setup (1.205ubuntu2) jammy; urgency=medium + + * debian/preprocessor: + - backport Debian change to use mktemp instead of tempfile, should fix + the ubiquity build + + -- Sebastien Bacher Mon, 22 Nov 2021 17:17:37 +0100 + +console-setup (1.205ubuntu1) impish; urgency=low + + [ Łukasz 'sil2100' Zemczak ] + * Merge from Debian unstable. 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. + - Change the default font from Fixed to VGA for Lat15; while it's not + entirely complete, it looks better and is largely good enough. + - 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: 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. + - debian/control: we also need xkb-data-i18n as a Build-Depends-Indep to + build a complete set of translated keyboard layout/variant names. + - 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 layout for Kurdish to tr(ku). + - Set default for Dutch to us(intl), not just us. + - Set default layout for Vietnam to 'us'. + - 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. + - Fix command injection in ckbcomp. + - Generate a locale locally for translating keyboard names in + kbdnames-maker. + - Keyboard/Makefile: make sure KeyboardNames.pl is built with accurate data + from xkb-data. + - xmlreader, KeyboardNames.pl: Added model entry to skip model selection. + - Make sure we give a meaningful name to ch layouts: "Switzerland" instead + of "German (Switzerland), since it includes French too. + - 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. + - debian/control: Build depend on keymapper + - debian/keyboard-configuration.config: + - change back the french default layout to be fr+oss and not fr+latin9 + the change was dropped by error in a previous merge + - 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. + + -- Łukasz 'sil2100' Zemczak Wed, 11 Aug 2021 16:40:34 +0200 + console-setup (1.205) unstable; urgency=medium * Team upload. @@ -256,6 +719,99 @@ -- Holger Wansing Sat, 20 Mar 2021 21:54:30 +0100 +console-setup (1.201ubuntu2) hirsute; urgency=medium + + * Stop building the udeb on request. + + -- Łukasz 'sil2100' Zemczak Mon, 22 Feb 2021 14:28:53 +0100 + +console-setup (1.201ubuntu1) hirsute; urgency=low + + * Merge from Debian unstable. 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. + - Change the default font from Fixed to VGA for Lat15; while it's not + entirely complete, it looks better and is largely good enough. + - 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: 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. + - debian/control: we also need xkb-data-i18n as a Build-Depends-Indep to + build a complete set of translated keyboard layout/variant names. + - 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 layout for Kurdish to tr(ku). + - Set default for Dutch to us(intl), not just us. + - Set default layout for Vietnam to 'us'. + - 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. + - Fix command injection in ckbcomp. + - Generate a locale locally for translating keyboard names in + kbdnames-maker. + - Keyboard/Makefile: make sure KeyboardNames.pl is built with accurate data + from xkb-data. + - xmlreader, KeyboardNames.pl: Added model entry to skip model selection. + - Make sure we give a meaningful name to ch layouts: "Switzerland" instead + of "German (Switzerland), since it includes French too. + - 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. + - debian/control: Build depend on keymapper + - debian/keyboard-configuration.config: + - change back the french default layout to be fr+oss and not fr+latin9 + the change was dropped by error in a previous merge + - 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. + + -- Łukasz 'sil2100' Zemczak Mon, 22 Feb 2021 13:10:01 +0100 + console-setup (1.201) unstable; urgency=medium * Team upload. @@ -322,6 +878,93 @@ -- Cyril Brulebois Tue, 01 Dec 2020 02:02:30 +0100 +console-setup (1.198ubuntu1) hirsute; urgency=low + + * Merge from Debian unstable. 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. + - Change the default font from Fixed to VGA for Lat15; while it's not + entirely complete, it looks better and is largely good enough. + - 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: 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. + - debian/control: we also need xkb-data-i18n as a Build-Depends-Indep to + build a complete set of translated keyboard layout/variant names. + - 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 layout for Kurdish to tr(ku). + - Set default for Dutch to us(intl), not just us. + - Set default layout for Vietnam to 'us'. + - 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. + - Fix command injection in ckbcomp. + - Generate a locale locally for translating keyboard names in + kbdnames-maker. + - Keyboard/Makefile: make sure KeyboardNames.pl is built with accurate data + from xkb-data. + - xmlreader, KeyboardNames.pl: Added model entry to skip model selection. + - Make sure we give a meaningful name to ch layouts: "Switzerland" instead + of "German (Switzerland), since it includes French too. + - 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. + - debian/control: Build depend on keymapper + - debian/keyboard-configuration.config: + - change back the french default layout to be fr+oss and not fr+latin9 + the change was dropped by error in a previous merge + - 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. + + -- Łukasz 'sil2100' Zemczak Mon, 09 Nov 2020 16:03:40 +0100 + console-setup (1.198) unstable; urgency=medium * Team upload @@ -406,6 +1049,102 @@ -- Holger Wansing Sun, 12 Jul 2020 20:23:26 +0200 +console-setup (1.195ubuntu2) groovy; urgency=medium + + * 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. LP: #1880266 + + -- Dimitri John Ledkov Sat, 23 May 2020 04:58:43 +0100 + +console-setup (1.195ubuntu1) groovy; urgency=low + + * Merge from Debian unstable. 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. + - Change the default font from Fixed to VGA for Lat15; while it's not + entirely complete, it looks better and is largely good enough. + - 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: 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. + - debian/control: we also need xkb-data-i18n as a Build-Depends-Indep to + build a complete set of translated keyboard layout/variant names. + - 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 layout for Kurdish to tr(ku). + - Set default for Dutch to us(intl), not just us. + - Set default layout for Vietnam to 'us'. + - 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. + - Fix command injection in ckbcomp. + - Generate a locale locally for translating keyboard names in + kbdnames-maker. + - Keyboard/Makefile: make sure KeyboardNames.pl is built with accurate data + from xkb-data. + - xmlreader, KeyboardNames.pl: Added model entry to skip model selection. + - Make sure we give a meaningful name to ch layouts: "Switzerland" instead + of "German (Switzerland), since it includes French too. + - 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. + - debian/control: Build depend on keymapper + - debian/keyboard-configuration.config: + - change back the french default layout to be fr+oss and not fr+latin9 + the change was dropped by error in a previous merge + * Dropped changes, included in Debian: + - keyboard-configuration.config: + replace not intuitive second lt(us) layout with us(altgr-intl), + which contains Euro (€) and other symbols, often used in Lithuania. + + -- Steve Langasek Wed, 20 May 2020 17:17:51 -0700 + console-setup (1.195) unstable; urgency=medium [ Mantas Kriaučiūnas ] @@ -420,6 +1159,107 @@ -- Dimitri John Ledkov Thu, 26 Mar 2020 13:34:12 +0000 +console-setup (1.194ubuntu3) focal; urgency=medium + + [ Mantas Kriaučiūnas ] + * keyboard-configuration.config:: + replace not intuitive second lt(us) layout with us(altgr-intl), + which contains Euro (€) and other symbols, often used in Lithuania. + (lp: #1863001) + + -- Sebastien Bacher Fri, 27 Mar 2020 11:10:06 +0100 + +console-setup (1.194ubuntu2) focal; urgency=medium + + * debian/keyboard-configuration.config: + - change back the french default layout to be fr+oss and not fr+latin9 + the change was dropped by error in a previous merge + + -- Sebastien Bacher Thu, 05 Dec 2019 15:09:57 +0100 + +console-setup (1.194ubuntu1) focal; urgency=medium + + * Merge from Debian unstable. 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. + - Change the default font from Fixed to VGA for Lat15; while it's not + entirely complete, it looks better and is largely good enough. + - 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: 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. + - debian/control: we also need xkb-data-i18n as a Build-Depends-Indep to + build a complete set of translated keyboard layout/variant names. + - 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 layout for Kurdish to tr(ku). + - Set default for Dutch to us(intl), not just us. + - Set default layout for Vietnam to 'us'. + - 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. + - Fix command injection in ckbcomp. + - Generate a locale locally for translating keyboard names in + kbdnames-maker. + - Keyboard/Makefile: make sure KeyboardNames.pl is built with accurate data + from xkb-data. + - xmlreader, KeyboardNames.pl: Added model entry to skip model selection. + - Make sure we give a meaningful name to ch layouts: "Switzerland" instead + of "German (Switzerland), since it includes French too. + - 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. + * Dropped changes: + - kbdnames-maker: Call `{bind,}textdomain` after switching locale. + * debian/control: Build depend on keymapper + + -- Balint Reczey Wed, 27 Nov 2019 15:34:42 +0100 + console-setup (1.194) unstable; urgency=medium * Team upload @@ -453,6 +1293,109 @@ -- Cyril Brulebois Thu, 04 Jul 2019 17:41:47 +0200 +console-setup (1.191ubuntu3) eoan; urgency=medium + + * No change rebuild to include all previous changes + + -- Balint Reczey Tue, 23 Apr 2019 13:38:57 +0200 + +console-setup (1.191ubuntu2) eoan; urgency=medium + + * Call setupcon --force only when debian-installer is active + and always redirect output to /dev/null to not block. (LP: #520546) + + -- Balint Reczey Tue, 23 Apr 2019 13:08:17 +0200 + +console-setup (1.191ubuntu1) eoan; urgency=low + + * Merge from Debian unstable. 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. + - Change the default font from Fixed to VGA for Lat15; while it's not + entirely complete, it looks better and is largely good enough. + - 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: 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. + - debian/control: we also need xkb-data-i18n as a Build-Depends-Indep to + build a complete set of translated keyboard layout/variant names. + - 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 layout for Kurdish to tr(ku). + - Set default for Dutch to us(intl), not just us. + - Set default layout for Vietnam to 'us'. + - 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. + - Fix command injection in ckbcomp. + - Generate a locale locally for translating keyboard names in + kbdnames-maker. + - kbdnames-maker: Call `{bind,}textdomain` after switching locale. + - Keyboard/Makefile: make sure KeyboardNames.pl is built with accurate data + from xkb-data. + - xmlreader, KeyboardNames.pl: Added model entry to skip model selection. + - Make sure we give a meaningful name to ch layouts: "Switzerland" instead + of "German (Switzerland), since it includes French too. + - 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. + * Dropped changes: + - drop handling of obsolete upstart jobs, not needed post-18.04. + - drop breaks/replaces on ancient keyboard-configuration package. + - keyboard-configuration.config: drop layout migration code, which + definitely predates bionic. + * debian/console-setup.initramfs-top: only ever initialize /dev/tty1. We + do not ever use more than 1 VT in the initramfs, and we reinitialize + anyway from the rootfs so this saves us no time (and in fact wastes a + lot of time in some configurations). LP: #1823327. + + -- Steve Langasek Mon, 22 Apr 2019 07:27:25 -0700 + console-setup (1.191) unstable; urgency=medium * Team upload @@ -636,6 +1579,184 @@ -- Christian Perrier Mon, 12 Mar 2018 19:12:28 +0100 +console-setup (1.178ubuntu12) disco; urgency=medium + + * setupcon: use /run for tempfiles (and dump the various unnecessary + fallback paths), since /run is always mountable rw at least as early as + /tmp is and is guaranteed to be safe from tmpcleaners at boot. Only keep + /tmp as a fallback in case we have access to write to /tmp and to a + console, but not to /run. LP: #1824227. + + -- Steve Langasek Wed, 10 Apr 2019 12:51:56 -0700 + +console-setup (1.178ubuntu11) disco; urgency=medium + + * kbdnames-maker: Call `{bind,}textdomain` after switching locale. + There's a change in perl 5.28 to use `uselocale()` & friends instead of + gettext directly, to support thread safety. Apparently this causes the + results of `gettext()` calls to be cached now where they weren't before, + and this breaks our keyboard name generation. For example, we have + `en_GB*model*sun_type6_jp*Sun Type 6 (Japonesa)` instead of + `en_GB*model*sun_type6_jp*Sun Type 6 (Japanese)`, and many many other + examples. Calling `bindtextdomain()` and then `textdomain()` after + changing locale causes the cache to be invalidated and we get correct + results again. LP: #1817453 + + -- Iain Lane Fri, 15 Mar 2019 12:34:06 +0000 + +console-setup (1.178ubuntu10) disco; urgency=medium + + * No-change rebuild to pick up any new keyboard data. Resolves crash + in Ubiquity KDE front end on non English language selection. (LP: #1810647) + + -- Rik Mills Wed, 23 Jan 2019 07:34:00 +0000 + +console-setup (1.178ubuntu9) cosmic; urgency=medium + + * keyboard-configuration.config: Fix exit/return thinko (LP: #1788597) + + -- Adam Conrad Thu, 23 Aug 2018 16:32:45 -0600 + +console-setup (1.178ubuntu8) cosmic; urgency=medium + + * keyboard-configuration.config: Only treat missing XKBOPTIONS as empty. + + -- Adam Conrad Wed, 08 Aug 2018 17:32:23 -0600 + +console-setup (1.178ubuntu7) cosmic; urgency=medium + + * keyboard-configuration.config: While sourcing config files to re-seed + debconf, load missing variables as empty values of same (LP: #1762952) + + -- Adam Conrad Wed, 08 Aug 2018 16:50:48 -0600 + +console-setup (1.178ubuntu6) cosmic; urgency=medium + + * 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 (LP: #1762952) + + -- Adam Conrad Wed, 25 Jul 2018 05:50:59 -0600 + +console-setup (1.178ubuntu5) cosmic; urgency=medium + + * Revert to 1.178ubuntu2, as 1.178ubuntu[34] caused an installer regression. + + -- Adam Conrad Tue, 24 Jul 2018 19:34:59 -0600 + +console-setup (1.178ubuntu4) cosmic; urgency=medium + + * debian/console-setup-udeb.postinst: Guard the dpkg call in the postinst, + so it isn't attempted in the debian-installer environment (LP: #1782835) + + -- Adam Conrad Fri, 20 Jul 2018 14:22:45 -0600 + +console-setup (1.178ubuntu3) cosmic; urgency=medium + + * debian/keyboard-configuration.postinst: + - Don't change /etc/default/keyboard at package upgrades on + desktops, since it may conflict with how desktops deal with + keyboard configuration (LP: #1762952). + + -- Gunnar Hjalmarsson Tue, 15 May 2018 01:12:00 +0200 + +console-setup (1.178ubuntu2) bionic; urgency=medium + + * 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. + (LP: #1758647) + + -- Łukasz 'sil2100' Zemczak Thu, 19 Apr 2018 08:53:32 +0200 + +console-setup (1.178ubuntu1) bionic; urgency=low + + * Merge from Debian unstable. Remaining changes: + - 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. + - Change the default font from Fixed to VGA for Lat15; while it's not + entirely complete, it looks better and is largely good enough. + - 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: use Ubuntu's virtual terminal color + scheme by default, with a VGA color scheme available as an alternative. + - Don't copy keyboard-configuration questions to /target in OEM mode. + oem-config will ask them later, and copying these confuses it. + - Tolerate absence of setupcon in postinst scripts. + - Added templates for keyboard detection. + - 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. + - Fix default keyboard selection for language/country combinations + lacking a proper combined locale. + - Map ppc64el/* to XKBMODEL=pc105. + - 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. + - Don't make debian/copyright a symlink to COPYRIGHT, this is disallowed + by the Ubuntu archive installer. + - Include pc105.tree for ubiquity; make sure it gets built. + - Add Keyboard/Makefile rule to build pc105.tree. + - Fix command injection in ckbcomp. + - Generate a locale locally for translating keyboard names in + kbdnames-maker. + - xmlreader, KeyboardNames.pl: Added model entry to skip model selection. + - setupcon: + - 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. + - Map XKBMODEL=SKIP to '' for compatibility with existing + configs. + - Explicitly exit 0, so that postinsts don't fail in the event that + loadkeys can't find a console. + - Handle unattended upgrades without breaking plymouth when updating + console fonts. + - 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 sure we give a meaningful name to ch layouts: "Switzerland" instead + of "German (Switzerland), since it includes French too. + - Add console-setup-tty and the udev rule that uses it to set Unicode, font, + and keyboard mode at early boot. + - Keyboard/Makefile: make sure KeyboardNames.pl is built with accurate data + from xkb-data. + - Don't cat over the keymaps; they're already moved to the right place. + - debian/console-setup.postinst: Replace the checking of fgconsole in [1-6] + with checking if fgconsole is a tty according to logind. The previous + assumption was that a graphical environment would be on vt7, which isn't + true with gnome-shell any more. + - debian/console-setup.postinst, debian/keyboard-configuration.postinst: + Don't call setupcon --force -k any more - it breaks wayland sessions. + (LP: #1710637) + - debian/control: drop console-setup-freebsd: we don't keep it around since + it's uninstallable because vidcontrol/kbdcontrol. + - debian/keyboard-configuration.config: re-lower the priority for the layout + question that got garbled in the merge. + - Don't use console-setup-tty or its udev rule. This dates back to lucid and + now systemd is apparently able to handle this correctly. It's now actively + breaking graphical sessions. (LP: #1710637) + - debian/control: we also need xkb-data-i18n as a Build-Depends-Indep to + build a complete set of translated keyboard layout/variant names. + - Drop dependency from console-setup to initramfs-tools | + linux-initramfs-tool; this was a versioned dependency used for upgrades, + now long obsolete. + * Fix previous patches: + - Correctly setup console in initramfs again (LP: #1719612) + - Make COPYRIGHT a symlink to debian/copyright, and keep various + other symlinks in place that were dropped in earlier uploads. + - Do some extra work to disable kfreebsd, dh was complaining about + unknown packages and failing. + - debian/clean: Delete Keyboard/tree-keymaps/ on clean + + -- Julian Andres Klode Mon, 19 Feb 2018 09:29:02 +0100 + console-setup (1.178) unstable; urgency=medium [ Updated translations ] @@ -735,6 +1856,122 @@ -- Christian Perrier Fri, 15 Sep 2017 06:16:35 +0200 +console-setup (1.166ubuntu7) artful; urgency=medium + + * Drop dependency from console-setup to initramfs-tools | + linux-initramfs-tool; this was a versioned dependency used for upgrades, + now long obsolete. + + -- Steve Langasek Thu, 05 Oct 2017 12:04:08 -0700 + +console-setup (1.166ubuntu6) artful; urgency=medium + + * debian/control: we also need xkb-data-i18n as a Build-Depends-Indep to + build a complete set of translated keyboard layout/variant names. + + -- Mathieu Trudel-Lapierre Thu, 28 Sep 2017 17:46:56 -0400 + +console-setup (1.166ubuntu5) artful; urgency=medium + + * Don't use console-setup-tty or its udev rule. This dates back to lucid and + now systemd is apparently able to handle this correctly. It's now actively + breaking graphical sessions. (LP: #1710637) + + -- Mathieu Trudel-Lapierre Mon, 18 Sep 2017 16:36:50 -0400 + +console-setup (1.166ubuntu4) artful; urgency=medium + + * Keyboard/Makefile: Add a rule to make KeyboardNames.pl, needed by ubiquity + (see Debian Bug#874474) + + -- Iain Lane Wed, 06 Sep 2017 13:39:01 +0100 + +console-setup (1.166ubuntu3) artful; urgency=medium + + * debian/keyboard-configuration.config: re-lower the priority for the layout + question that got garbled in the merge. + + -- Mathieu Trudel-Lapierre Tue, 05 Sep 2017 14:58:49 -0400 + +console-setup (1.166ubuntu2) artful; urgency=medium + + * debian/control: drop console-setup-freebsd: we don't keep it around since + it's uninstallable because vidcontrol/kbdcontrol. + + -- Mathieu Trudel-Lapierre Wed, 23 Aug 2017 19:06:27 -0400 + +console-setup (1.166ubuntu1) artful; urgency=medium + + [ Mathieu Trudel-Lapierre ] + * Merge from Debian unstable; remaining changes: + - 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. + - Change the default font from Fixed to VGA for Lat15; while it's not + entirely complete, it looks better and is largely good enough. + - 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: use Ubuntu's virtual terminal color + scheme by default, with a VGA color scheme available as an alternative. + - Don't copy keyboard-configuration questions to /target in OEM mode. + oem-config will ask them later, and copying these confuses it. + - Tolerate absence of setupcon in postinst scripts. + - Added templates for keyboard detection. + - 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. + - Fix default keyboard selection for language/country combinations + lacking a proper combined locale. + - Map ppc64el/* to XKBMODEL=pc105. + - 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. + - Don't make debian/copyright a symlink to COPYRIGHT, this is disallowed + by the Ubuntu archive installer. + - Include pc105.tree for ubiquity; make sure it gets built. + - Add Keyboard/Makefile rule to build pc105.tree. + - Fix command injection in ckbcomp. + - Generate a locale locally for translating keyboard names in + kbdnames-maker. + - xmlreader, KeyboardNames.pl: Added model entry to skip model selection. + - setupcon: + - 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. + - Map XKBMODEL=SKIP to '' for compatibility with existing + configs. + - Explicitly exit 0, so that postinsts don't fail in the event that + loadkeys can't find a console. + - Handle unattended upgrades without breaking plymouth when updating + console fonts. + - 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 sure we give a meaningful name to ch layouts: "Switzerland" instead + of "German (Switzerland), since it includes French too. + - Add console-setup-tty and the udev rule that uses it to set Unicode, font, + and keyboard mode at early boot. + * Keyboard/Makefile: make sure KeyboardNames.pl is built with accurate data + from xkb-data. + * Don't cat over the keymaps; they're already moved to the right place. + + [ Iain Lane ] + * debian/console-setup.postinst: Replace the checking of fgconsole in [1-6] + with checking if fgconsole is a tty according to logind. The previous + assumption was that a graphical environment would be on vt7, which isn't + true with gnome-shell any more. + * debian/console-setup.postinst, debian/keyboard-configuration.postinst: + Don't call setupcon --force -k any more - it breaks wayland sessions. + (LP: #1710637) + + -- Mathieu Trudel-Lapierre Thu, 10 Aug 2017 15:06:17 -0400 + console-setup (1.166) unstable; urgency=medium [ Updated translations ] @@ -942,6 +2179,209 @@ -- Christian Perrier Sun, 22 May 2016 08:47:29 +0200 +console-setup (1.142ubuntu8) artful; urgency=medium + + * Drop upstart system jobs. + + -- Dimitri John Ledkov Mon, 21 Aug 2017 16:15:49 +0100 + +console-setup (1.142ubuntu7) artful; urgency=medium + + * Do the same as ubuntu6 in Keyboard/compose_translator too. + * Cherry-pick b887014dc243d3966bbb6bda975803798df7c33f from Samuel Thibaut + and 6800af170ff5017b67b7e0b85b61a6176eb56361 from Gregor Hermann, as well + as fixing Keyboard/kbdnames - perl doesn't look at `.' any more. + + -- Iain Lane Mon, 21 Aug 2017 10:48:31 +0100 + +console-setup (1.142ubuntu6) artful; urgency=medium + + * Use pragma utf8 instead of the deprecated encoding pragma. Shamelessly + copied from Debian's 1.143 change by Anton Zinoviev. + + -- Mathieu Trudel-Lapierre Fri, 04 Aug 2017 15:23:53 -0400 + +console-setup (1.142ubuntu5) yakkety; urgency=medium + + * debian/console-setup-linux.setvtrgb.service: add condition to only + execute when /dev/tty0 exists. This is the same condition as used by + getty@.service unit to prevent attempting setting up VT when none are + present. This is a common case on serial only architectures and + virtual machines. Resolves degraded boots on s390x/ppc64el. + + -- Dimitri John Ledkov Mon, 26 Sep 2016 13:31:08 +0100 + +console-setup (1.142ubuntu4) yakkety; urgency=medium + + * debian/keyboard-configuration.postinst: we shouldn't fail if + dpkg-maintscript-helpers can't figure out the package for removal of + console-setup and keyboard-setup init scripts -- in ubiquity we won't have + the outer checked directory /lib/debian-installer.d; and we won't have any + files to remove on account of likely being a new install. (LP: #1578285) + + -- Mathieu Trudel-Lapierre Wed, 08 Jun 2016 14:39:12 -0400 + +console-setup (1.142ubuntu3) yakkety; urgency=medium + + * Replace initscripts dependency with init-system-helpers (>= 1.29~), to + allow dropping initscripts at some point. (Closes: #804988) + + -- Martin Pitt Mon, 30 May 2016 08:15:32 +0200 + +console-setup (1.142ubuntu2) yakkety; urgency=medium + + * Unbreak my last console-setup upload: + - debian/control: We want the locales package, not locales-all. + - Use keymapper to generate decision trees for a restricted subset of + the pc105 model. + * debian/rules: enable the setvtrgb.service correctly. + * debian/rules: remove keyboard-configuration trying to install console-setup + since it's now in console-setup. + * debian/keyboard-configuration.links: removed. + * debian/control: fix Breaks/Replaces so the initscript move to the + console-setup-linux package from keyboard-configuration goes smoothly. + + -- Mathieu Trudel-Lapierre Fri, 29 Apr 2016 23:38:34 -0400 + +console-setup (1.142ubuntu1) yakkety; urgency=medium + + * Merge from Debian unstable; remaining changes: + - Don't gzip font or ACM files in /etc/console-setup/. The space saving + is negligible, and it's more efficient not to need to uncompress them + at boot time. + - Include pc105.tree for ubiquity. + - Set keymap and font in the initramfs if possible and sensible. + - Add an apport hook. + - Depend on kbd (>= 1.15-1ubuntu3) for a valuable loadkeys improvement. + - Include support for translated keyboard names. + - Depend on debconf instead of pre-depending, because pre-depends have + no effect on config scripts. + - debian/vtrgb, debian/vtrgb.vga, + debian/console-setup-linux.setvtrgb.upstart, debian/rules, + debian/console-setup-linux.postinst: use Ubuntu's virtual terminal color + scheme by default, with a VGA color scheme available as an alternative. + - Make setupcon explicitly exit 0, so that postinsts don't fail in the + event that loadkeys can't find a console. + - Generate a locale locally for translating keyboard names in + kbdnames-maker. + - Don't copy keyboard-configuration questions to /target in OEM mode. + oem-config will ask them later, and copying these confuses it. + - Change the default font from Fixed to VGA for Lat15; while it's not + entirely complete, it looks better and is largely good enough. + - 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. + - Fix default keyboard selection for language/country combinations + lacking a proper combined locale. + - Drop the layout/variant priority to high on fresh installs. + - Set default for Dutch to us(intl), not just us. + - Set default layout for Vietnam to 'us'. + - Set default variant for French to oss. + - Set default layout for Simplified Chinese to 'cn'. + - Don't use the default keyboard variant if the layout is overridden by + preseeding. + - If keyboard-configuration/layoutcode is preseeded but not marked as + seen, then set the default layout but don't lower the layout question + priority or preseed console-setup/ask_detect. + - Use the default keyboard model if an existing configuration file sets + XKBMODEL="". + - Go back to always asking layout before variant. + - Fix keyboard layout detection to set the layout properly. + - Reset keyboard-configuration/toggle to the default if it's set to "No + toggling" and you select a non-Latin layout. + - Automatically save the font and keymap to /etc in + /etc/init.d/console-setup if it isn't being run from init. Similarly, + ensure that the font and keymap are saved to /etc during initial + installation. + - Load the new keyboard configuration immediately when running + 'dpkg-reconfigure keyboard-configuration' in an installed system. + - Don't fail to configure keyboard-configuration if setxkbmap fails to + talk to the X display. + - Tolerate absence of setupcon in keyboard-configuration.postinst. + - Drop the simplified keyboard-configuration/xkb-keymap question. + - Fix command injection in ckbcomp. + - debian/console-setup.console-font.upstart: Add Upstart job that sets up + console font when plymouth-splash is starting. + - Override description of the ch layout from "German (Switzerland)" to + just "Switzerland". + - Map ppc64el/* to XKBMODEL=pc105. + - setupcon: Map XKBMODEL=SKIP to '' for compatibility with existing + configs. + - 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. + - setupcon: revert ridiculous upstream twiddling of keymap cache filenames: + - 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. + - Move vtrgb handling to console-setup-linux package, since this is clearly + Linux-specific. + - Add missing console-setup-linux.prerm to remove /etc/vtrgb alternatives + - Keyboard/kbdcompiler: fix bug in filtering of unsupported variants that + breaks generation of the pc105.tree for d-i keyboard detection. + - debian/keyboard-configuration.postinst: udpkg is not part of an installed + Debian system; don't fail to configure if it's absent and the script is + called outside of an installer context. + - Don't make debian/copyright a symlink to COPYRIGHT, this is disallowed + by the Ubuntu archive installer. + - debian/keyboard-configuration.config: fix typo in model check for SKIP; + even when looking up the layout/variant, we need to check for the model + as XKBMODEL, since $model doesn't exist. + - 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. + - Properly handle settings CODESET and FONSIZE when they equals 'guess' or + are unset. + - keyboard_present.sh: Quiet config/postinst when we have no USB devices. + - debian/keyboard-configuration.config: run grep with -a (to deal with files + as ASCII data) when searching for keyboard, locale, and layout names. + - Add ConditionPathExists=/dev/tty0 to the console-setup.service, to + avoid running the unit on platforms without virtual consoles + - debian/rules: Drop obsolete and no-op dh_installinit --upstart-only + option. + - Add debian/keyboard-configuration.links to (statically) enable + console-setup.service. It is not being pulled in by plymouth any more, and + doing so was brittle and unexpected. + - console-setup.service: Set RemainAfterExit. + - 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. + - debian/control: allow dracut to be installable by adding an alternate + depends on linux-initramfs-tool for console-setup. + - Reinstate checking for XKBLAYOUT being in the config file: this handles + the cases where installs done with ubiquity don't have their debconf seen + flag set for model/layout questions. If layout is already configure, lower + the corresponding question's priority to medium so we don't ask it again. + - Add systemd unit for console-setup. That avoids waiting for $remote_fs + during early boot. (Note: there is no need to enable it, it gets pulled + in through systemd-vconsole-setup.service) + - Drop console-setup-freebsd; it's useless and uninstallable given that we + don't have a freebsd port. + - Make debian/keyboard-configuration.console-setup.init do the same as the + corresponding .upstart: I. e. just call loadkeys instead of setupcon, and + don't check the current console. (Font loading is already done via udev + rules). + * Dropped changes, included in Debian: + - Stop running debconf-updatepo on clean. + - Update for new layouts and variants for Montenegro and Serbia, and + migrate configuration files from the old layouts. + * Dropped changes, no longer needed: + - Move boot tasks to a combination of two udev rules and a single + Upstart job, ensuring that they're run at points when we are able to + satisfy the constraints on the relevant ioctls. + - Replace usplash detection code with Plymouth detection code. + - Use keymapper to generate decision trees for a restricted subset of + the pc105 model. + * debian/console-setup-linux.setvtrgb.service: port our vtrgb upstart job to + a systemd unit service so we can again apply the right color scheme. + * Fonts/Makefile: sort BDFS_TO_DOUBLE; this will avoid unnecessary delta + showing on every upload just because the fonts are not in the same order. + + -- Mathieu Trudel-Lapierre Fri, 29 Apr 2016 11:36:58 -0400 + console-setup (1.142) unstable; urgency=medium [ Updated translations ] @@ -1303,6 +2743,253 @@ -- Christian Perrier Sat, 26 Jul 2014 08:52:31 +0200 +console-setup (1.108ubuntu15) xenial; urgency=medium + + * Properly handle settings CODESET and FONSIZE when they equals 'guess' or are unset. + - console-setup-tty, debian/console-setup.initramfs-hook, + debian/console-setup.initramfs-top + (LP: #1565542) + + -- Evgeniy Yanyuk Tue, 19 Apr 2016 15:22:17 -0400 + +console-setup (1.108ubuntu14) xenial; urgency=medium + + * keyboard_present.sh: Quiet config/postinst when we have no USB devices. + + -- Adam Conrad Tue, 12 Apr 2016 13:15:05 -0600 + +console-setup (1.108ubuntu13) xenial; urgency=medium + + * debian/keyboard-configuration.config: run grep with -a (to deal with files + as ASCII data) when searching for keyboard, locale, and layout names. + (LP: #1549529) + + -- Mathieu Trudel-Lapierre Mon, 04 Apr 2016 13:47:04 -0400 + +console-setup (1.108ubuntu12) xenial; urgency=medium + + * No-change rebuild to properly generate console-setup-udeb's list of + valid keyboard layouts and variants. + + -- Mathieu Trudel-Lapierre Thu, 24 Mar 2016 10:50:39 -0400 + +console-setup (1.108ubuntu11) xenial; urgency=medium + + * Add ConditionPathExists=/dev/tty0 to the console-setup.service, to + avoid running the unit on platforms without virtual consoles, + e.g. s390x. LP: #1552733 + + -- Dimitri John Ledkov Thu, 03 Mar 2016 14:41:05 +0000 + +console-setup (1.108ubuntu10) xenial; urgency=medium + + * debian/rules: Drop obsolete and no-op dh_installinit --upstart-only + option. (LP: #1519228) + * Add debian/keyboard-configuration.links to (statically) enable + console-setup.service. It is not being pulled in by plymouth any more, and + doing so was brittle and unexpected. (LP: #1531442) + * console-setup.service: Set RemainAfterExit. + + -- Martin Pitt Mon, 11 Jan 2016 15:02:09 +0100 + +console-setup (1.108ubuntu9) wily; urgency=medium + + * Cherry-pick fix from git for udpkg/Hurd noise in keyboard-configuration. + + -- Adam Conrad Tue, 20 Oct 2015 12:51:36 +0100 + +console-setup (1.108ubuntu8) wily; urgency=medium + + * Properly handle setting XKBVARIANT when using keyboard detection. + (LP: #1506551) + + -- Mathieu Trudel-Lapierre Mon, 19 Oct 2015 11:13:01 +0100 + +console-setup (1.108ubuntu7) wily; urgency=medium + + * Fix incorrect versioning change from last upload; initramfs-tools + 0.85eubuntu12 looks wrong but was in fact correct. + * 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 (LP: #1484101). + + -- Colin Watson Fri, 02 Oct 2015 11:18:04 +0100 + +console-setup (1.108ubuntu6) wily; urgency=medium + + * debian/control: allow dracut to be installable by adding an alternate + depends on linux-initramfs-tool for console-setup. + + -- Mathieu Trudel-Lapierre Tue, 08 Sep 2015 22:36:52 -0400 + +console-setup (1.108ubuntu5) vivid; urgency=medium + + * Reinstate checking for XKBLAYOUT being in the config file: this handles + the cases where installs done with ubiquity don't have their debconf seen + flag set for model/layout questions. If layout is already configure, lower + the corresponding question's priority to medium so we don't ask it again. + (LP: #1446231) + + -- Mathieu Trudel-Lapierre Tue, 21 Apr 2015 17:19:21 -0400 + +console-setup (1.108ubuntu4) vivid; urgency=medium + + * Add systemd unit for console-setup. That avoids waiting for $remote_fs + during early boot. (Note: there is no need to enable it, it gets pulled + in through systemd-vconsole-setup.service) (LP: #1430280) + + -- Martin Pitt Wed, 11 Mar 2015 15:33:49 +0100 + +console-setup (1.108ubuntu3) vivid; urgency=medium + + * Drop console-setup-freebsd; it's useless and uninstallable given that we + don't have a freebsd port. + + -- Mathieu Trudel-Lapierre Tue, 03 Mar 2015 10:15:31 -0500 + +console-setup (1.108ubuntu2) vivid; urgency=medium + + * Fix the mess I made with the previous upload: + * Reinstate changelog entry from 1.70ubuntu10; the changes aren't necessary + as keyboard-configuration does get the translated names of keyboards. + * Reinstate changes from 1.70ubuntu11: + - Make debian/keyboard-configuration.console-setup.init do the same as the + corresponding .upstart: I. e. just call loadkeys instead of setupcon, and + don't check the current console. (Font loading is already done via udev + rules). + + -- Mathieu Trudel-Lapierre Mon, 02 Mar 2015 17:55:46 -0500 + +console-setup (1.108ubuntu1) vivid; urgency=medium + + [ Steve Langasek ] + * Merge from Debian unstable, remaining changes: (LP: #1426721) + - Don't gzip font or ACM files in /etc/console-setup/. The space saving + is negligible, and it's more efficient not to need to uncompress them + at boot time. + - Include pc105.tree for ubiquity. + - Move boot tasks to a combination of two udev rules and a single + Upstart job, ensuring that they're run at points when we are able to + satisfy the constraints on the relevant ioctls. + - Stop running debconf-updatepo on clean. + - Set keymap and font in the initramfs if possible and sensible. + - Add an apport hook. + - Use keymapper to generate decision trees for a restricted subset of + the pc105 model. + - Depend on kbd (>= 1.15-1ubuntu3) for a valuable loadkeys improvement. + - Include support for translated keyboard names. + - Depend on debconf instead of pre-depending, because pre-depends have + no effect on config scripts. + - debian/vtrgb, debian/vtrgb.vga, + debian/console-setup-linux.setvtrgb.upstart, debian/rules, + debian/console-setup-linux.postinst: use Ubuntu's virtual terminal color + scheme by default, with a VGA color scheme available as an alternative. + - Make setupcon explicitly exit 0, so that postinsts don't fail in the + event that loadkeys can't find a console. + - Update for new layouts and variants for Montenegro and Serbia, and + migrate configuration files from the old layouts. + - Generate a locale locally for translating keyboard names in + kbdnames-maker. + - Don't copy keyboard-configuration questions to /target in OEM mode. + oem-config will ask them later, and copying these confuses it. + - Change the default font from Fixed to VGA for Lat15; while it's not + entirely complete, it looks better and is largely good enough. + - 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. + - Fix default keyboard selection for language/country combinations + lacking a proper combined locale. + - Drop the layout/variant priority to high on fresh installs. + - Set default for Dutch to us(intl), not just us. + - Set default layout for Vietnam to 'us'. + - Set default variant for French to oss. + - Set default layout for Simplified Chinese to 'cn'. + - Don't use the default keyboard variant if the layout is overridden by + preseeding. + - If keyboard-configuration/layoutcode is preseeded but not marked as + seen, then set the default layout but don't lower the layout question + priority or preseed console-setup/ask_detect. + - Use the default keyboard model if an existing configuration file sets + XKBMODEL="". + - Go back to always asking layout before variant. + - Fix keyboard layout detection to set the layout properly. + - Reset keyboard-configuration/toggle to the default if it's set to "No + toggling" and you select a non-Latin layout. + - Automatically save the font and keymap to /etc in + /etc/init.d/console-setup if it isn't being run from init. Similarly, + ensure that the font and keymap are saved to /etc during initial + installation. + - Replace usplash detection code with Plymouth detection code. + - Load the new keyboard configuration immediately when running + 'dpkg-reconfigure keyboard-configuration' in an installed system. + - Don't fail to configure keyboard-configuration if setxkbmap fails to + talk to the X display. + - Tolerate absence of setupcon in keyboard-configuration.postinst. + - Drop the simplified keyboard-configuration/xkb-keymap question. + - Fix command injection in ckbcomp. + - debian/console-setup.console-font.upstart: Add Upstart job that sets up + console font when plymouth-splash is starting. + - Override description of the ch layout from "German (Switzerland)" to + just "Switzerland". + - Map ppc64el/* to XKBMODEL=pc105. + * Dropped changes, included in Debian: + - "Do not configure keyboard; keep kernel keymap" model option, + preseedable by keyboard-configuration/modelcode=SKIP: this is now + supported upstream with either "unknown" or an empty string as the + model. + - Run kbd_mode on each tty in ACTIVE_CONSOLES rather than on the current + tty, since the current tty might belong to X and changing X's tty out + of raw mode is a very bad idea. + - Include Terminus font in the compiled packages. Do not depend, but + conflict/provide/replace console-terminus. New upstream version of + the Terminus font (4.32). + - Explicitly build-depend on liblocale-gettext-perl for kbdnames-maker, + and likewise have keyboard-configuration depend on + liblocale-gettext-perl. + - Make keyboard-configuration replace old console-setup/console-setup-mini + versions as well as conflicting with them. + - Weaken test for whether /usr is mounted; testing for /usr/share is + sufficient, and fixes operation in d-i. + - Set default layout for Kurdish to tr(ku). + * Dropped changes, no longer needed: + - Cope with systems installed with console-setup-udeb (<< 1.53) (which + predates Ubuntu 12.04 and Debian wheezy). + - Drop ancient handling of an empty codeset in the config file. + - Drop vtrgb upgrade handling from natty + - Drop upstart job transition from lucid + * setupcon: Map XKBMODEL=SKIP to '' for compatibility with existing + configs. + * 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. + * setupcon: revert ridiculous upstream twiddling of keymap cache filenames: + - 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. + * Move vtrgb handling to console-setup-linux package, since this is clearly + Linux-specific. + * Add missing console-setup-linux.prerm to remove /etc/vtrgb alternatives + * Keyboard/kbdcompiler: fix bug in filtering of unsupported variants that + breaks generation of the pc105.tree for d-i keyboard detection. + * debian/keyboard-configuration.postinst: udpkg is not part of an installed + Debian system; don't fail to configure if it's absent and the script is + called outside of an installer context. + * Don't make debian/copyright a symlink to COPYRIGHT, this is disallowed + by the Ubuntu archive installer. + + [ Mathieu Trudel-Lapierre ] + * debian/keyboard-configuration.config: fix typo in model check for SKIP; + even when looking up the layout/variant, we need to check for the model + as XKBMODEL, since $model doesn't exist. + * 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. + + -- Mathieu Trudel-Lapierre Fri, 27 Feb 2015 16:36:52 -0500 + console-setup (1.108) unstable; urgency=low [ Updated translations ] @@ -1870,6 +3557,179 @@ -- Anton Zinoviev Mon, 21 Mar 2011 07:08:43 +0200 +console-setup (1.70ubuntu11) vivid; urgency=medium + + * Make debian/keyboard-configuration.console-setup.init do the same as the + corresponding .upstart: I. e. just call loadkeys instead of setupcon, and + don't check the current console. (Font loading is already done via udev + rules). (LP: #1400393) + + -- Martin Pitt Wed, 17 Dec 2014 07:55:34 +0100 + +console-setup (1.70ubuntu10) vivid; urgency=medium + + * Add all language-packs as build dependencies, to get translated names + of keyboard names in the DEBIAN/config of keyboard-setup package. + + -- Dimitri John Ledkov Sun, 30 Nov 2014 22:21:38 +0000 + +console-setup (1.70ubuntu9) utopic; urgency=high + + * No change rebuild against new dh_installinit, to call update-rc.d at + postinst. + + -- Dimitri John Ledkov Wed, 28 May 2014 10:39:17 +0100 + +console-setup (1.70ubuntu8) trusty; urgency=medium + + * Map ppc64el/* to XKBMODEL=pc105. + + -- Colin Watson Wed, 29 Jan 2014 13:14:53 +0000 + +console-setup (1.70ubuntu7) raring; urgency=low + + * Override description of the ch layout from "German (Switzerland)" to + just "Switzerland" (LP: #869825). + + -- Colin Watson Wed, 13 Mar 2013 16:35:47 +0000 + +console-setup (1.70ubuntu6) quantal; urgency=low + + * debian/console-setup.console-font.upstart: Add Upstart job that sets up + console font when plymouth-splash is starting, to work around a possible + udev/plymouth race that would otherwise prevent the font being set + (thanks, Ahmed El-Mahmoudy and Andrey Bondarenko; LP: #632382). + + -- Colin Watson Tue, 09 Oct 2012 01:50:48 +0100 + +console-setup (1.70ubuntu5) precise-proposed; urgency=low + + * Update Ubuntu-specific translations from Launchpad (LP: #985605). + + -- Colin Watson Thu, 19 Apr 2012 16:03:16 +0100 + +console-setup (1.70ubuntu4) precise; urgency=low + + * Add definitions for four (ignored) dead-keys: dead_belowcomma, + dead_currency, dead_doublegrave, and dead_invertedbreve. Cherrypick + from Debian git. + (LP: #738314) + * Fix command injection in ckbcomp (thanks to Emanuel Bronshtein) + (LP: #782705) + + -- Bryce Harrington Mon, 19 Mar 2012 21:13:39 -0700 + +console-setup (1.70ubuntu3) precise; urgency=low + + * No change rebuild for new xkb-data. (LP: #953328) + + -- Stéphane Graber Thu, 15 Mar 2012 11:48:58 -0400 + +console-setup (1.70ubuntu2) precise; urgency=low + + * Drop the simplified keyboard-configuration/xkb-keymap question; it + breaks existing preseeding, might confuse Ubiquity, and people are + already used to the layout/variant questions in Ubuntu (LP: #894187). + + -- Colin Watson Thu, 24 Nov 2011 15:05:27 +0000 + +console-setup (1.70ubuntu1) precise; urgency=low + + * Merge from Debian testing, remaining changes: + - Include Terminus font in the compiled packages. Do not depend, but + conflict/provide/replace console-terminus. New upstream version of + the Terminus font (4.32). + - Add a "Do not configure keyboard; keep kernel keymap" model option, + preseedable by keyboard-configuration/modelcode=SKIP. + - Use keymapper to generate decision trees for a restricted subset of + the pc105 model. + - Update for new layouts and variants for Montenegro and Serbia, and + migrate configuration files from the old layouts. + - Generate a locale locally for translating keyboard names in + kbdnames-maker. + - Move boot tasks to a combination of two udev rules and a single + Upstart job, ensuring that they're run at points when we are able to + satisfy the constraints on the relevant ioctls. + - Don't gzip font or ACM files in /etc/console-setup/. The space saving + is negligible, and it's more efficient not to need to uncompress them + at boot time. + - Don't copy keyboard-configuration questions to /target in OEM mode. + oem-config will ask them later, and copying these confuses it. + - Add an apport hook. + - Change the default font from Fixed to VGA for Lat15; while it's not + entirely complete, it looks better and is largely good enough. + - Set keymap and font in the initramfs if possible and sensible. + - Don't try to call update-rc.d if it doesn't exist, such as in d-i. + - debian/vtrgb, debian/vtrgb.vga, debian/console-setup.setvtrgb.upstart, + debian/rules, debian/console-setup.postinst: use Ubuntu's virtual + terminal color scheme by default, with a VGA color scheme available + as an alternative. + - Explicitly build-depend on liblocale-gettext-perl for kbdnames-maker, + and likewise have keyboard-configuration depend on + liblocale-gettext-perl. + - Depend on debconf instead of pre-depending, because pre-depends have + no effect on config scripts. + - Make keyboard-configuration replace old console-setup/console-setup-mini + versions as well as conflicting with them. + - Depend on kbd (>= 1.15-1ubuntu3) for a valuable loadkeys improvement. + - 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. + - Fix default keyboard selection for language/country combinations + lacking a proper combined locale. + - Drop the layout/variant priority to high on fresh installs. + - 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'. + - Set default variant for French to oss. + - Set default layout for Simplified Chinese to 'cn'. + - Don't use the default keyboard variant if the layout is overridden by + preseeding. + - If keyboard-configuration/layoutcode is preseeded but not marked as + seen, then set the default layout but don't lower the layout question + priority or preseed console-setup/ask_detect. + - Use the default keyboard model if an existing configuration file sets + XKBMODEL="". + - console-setup-udeb (<< 1.53) didn't set the seen flag in the installed + system. Cope with this and avoid asking the layout and variant + questions again if the default debconf priority is at least high. + (squeeze has >> 1.53, so this can be dropped after 12.04.) + - Go back to always asking layout before variant. + - Fix keyboard layout detection to set the layout properly. + - Reset keyboard-configuration/toggle to the default if it's set to "No + toggling" and you select a non-Latin layout. + - Automatically save the font and keymap to /etc in + /etc/init.d/console-setup if it isn't being run from init. Similarly, + ensure that the font and keymap are saved to /etc during initial + installation. + - Replace usplash detection code with Plymouth detection code. + - Load the new keyboard configuration immediately when running + 'dpkg-reconfigure keyboard-configuration' in an installed system. + - Don't fail to configure keyboard-configuration if setxkbmap fails to + talk to the X display. + - Tolerate absence of setupcon in keyboard-configuration.postinst. + - Move keyboard detection templates from console-setup.templates to + keyboard-configuration.templates. + - Stop running debconf-updatepo on clean. + - Include pc105.tree for ubiquity. + - Run kbd_mode on each tty in ACTIVE_CONSOLES rather than on the current + tty, since the current tty might belong to X and changing X's tty out + of raw mode is a very bad idea. + - Weaken test for whether /usr is mounted; testing for /usr/share is + sufficient, and fixes operation in d-i. + - Make setupcon explicitly exit 0, so that postinsts don't fail in the + event that loadkeys can't find a console. + * Dropped changes: + - Special KPDL handling: rewritten upstream in version 1.24. + - Upgrade handling for broken 1.57ubuntu1-1.57ubuntu4: prerelease + versions from natty, code dropped. + - Allow underscores in rules variables: included upstream. + * Restore plugin-detect-keyboard handling code, accidentally dropped in + a previous merge; keyboard detecting code was probably broken in the gtk + frontend by this. + + -- Steve Langasek Tue, 08 Nov 2011 09:34:02 -0800 + console-setup (1.70) unstable; urgency=low * ckbcomp: permit '_' in all identifiers. Thanks to Jonny, Javier @@ -2084,6 +3944,277 @@ -- Anton Zinoviev Sat, 23 Oct 2010 10:14:45 +0300 +console-setup (1.57ubuntu27) oneiric; urgency=low + + * Update Greek, Persian, Hebrew, Punjabi, and Traditional Chinese + translations from console-setup 1.68, fixing encoding problems + (LP: #860562). + + -- Colin Watson Wed, 28 Sep 2011 15:58:32 +0100 + +console-setup (1.57ubuntu26) oneiric; urgency=low + + * Backport translations from console-setup 1.63, without which + keyboard-configuration is completely untranslated (and, indeed, + untranslatable). LP: #838669. + * Bump dependency on debconf as well, to make sure we can parse sr@latin + translation templates. + + -- Steve Langasek Mon, 26 Sep 2011 15:44:41 +0100 + +console-setup (1.57ubuntu25) oneiric; urgency=low + + * Backport from upstream (Anton Zinoviev): + - Include Terminus font in the compiled packages. Do not depend, but + conflict/provide/replace console-terminus. New upstream version of + the Terminus font (4.32). + + -- Colin Watson Tue, 23 Aug 2011 13:53:08 +0100 + +console-setup (1.57ubuntu24) oneiric; urgency=low + + * Fix default keyboard selection for language/country combinations lacking + a proper combined locale (LP: #814448). + + -- Colin Watson Fri, 19 Aug 2011 15:13:13 +0100 + +console-setup (1.57ubuntu23) oneiric; urgency=low + + * Explicitly build-depend on liblocale-gettext-perl for kbdnames-maker, + and likewise have keyboard-configuration depend on + liblocale-gettext-perl. + + -- Colin Watson Fri, 12 Aug 2011 16:55:54 +0100 + +console-setup (1.57ubuntu22) oneiric; urgency=low + + * Fix keyboard layout detection to set the layout properly (LP: #820554). + + -- Colin Watson Fri, 12 Aug 2011 16:11:59 +0100 + +console-setup (1.57ubuntu21) oneiric; urgency=low + + * Rebuild against xkb-data 2.2.1 (LP: #791883). + + -- Colin Watson Sat, 25 Jun 2011 05:08:24 +0100 + +console-setup (1.57ubuntu20) natty; urgency=low + + * Weaken test for whether /usr is mounted; testing for /usr/share is + sufficient, and fixes operation in d-i. + + -- Colin Watson Wed, 20 Apr 2011 15:29:46 +0100 + +console-setup (1.57ubuntu19) natty; urgency=low + + * Don't copy keyboard-configuration questions to /target in OEM mode. + oem-config will ask them later, and copying these confuses it + (LP: #741304). + + -- Colin Watson Fri, 15 Apr 2011 12:43:41 +0100 + +console-setup (1.57ubuntu18) natty; urgency=low + + * Don't use the default keyboard variant if the layout is overridden by + preseeding (LP: #758584). + + -- Colin Watson Tue, 12 Apr 2011 15:21:11 +0100 + +console-setup (1.57ubuntu17) natty; urgency=low + + * debian/vtrgb: Design team wanted a slightly different grey; more contrast + when white on grey + * debian/console-setup.postinst: fix failure to find file to md5sum; + go back to installing the original vtrgb as a lower priority alternative + + -- Dustin Kirkland Mon, 21 Mar 2011 21:38:00 -0500 + +console-setup (1.57ubuntu16) natty; urgency=low + + * debian/console-setup.postinst: don't add the vtrgb.vga + alternate to update-alternatives; let other packages or humans do this; + otherwise, every time this package upgrades, it would overwrite others' + overiding choices + + -- Dustin Kirkland Sun, 20 Mar 2011 17:54:21 -0500 + +console-setup (1.57ubuntu15) natty; urgency=low + + * debian/vtrgb.vga, debian/rules, debian/console-setup.postinst: + - install a vga configuration, for easy reference by others who want to go + back to legacy mode + - relocate the stock vtrgb from /usr to /etc, such that it can be edited + by an admin, LP: #738992 + + -- Dustin Kirkland Sun, 20 Mar 2011 17:19:34 -0500 + +console-setup (1.57ubuntu14) natty; urgency=low + + * Install setvtrgb job with --no-start --upstart-only (LP: #738159). + + -- Colin Watson Sat, 19 Mar 2011 12:07:57 +0000 + +console-setup (1.57ubuntu13) natty; urgency=low + + * debian/rules, debian/console-setup.postinst: use update-alternatives + to allow other packages to install different console color values, + LP: #737948 + + -- Dustin Kirkland Fri, 18 Mar 2011 22:02:12 -0500 + +console-setup (1.57ubuntu12) natty; urgency=low + + * Tolerate absence of setupcon in keyboard-configuration.postinst + (LP: #733497). + + -- Colin Watson Fri, 18 Mar 2011 11:28:34 +0000 + +console-setup (1.57ubuntu11) natty; urgency=low + + * Address console-setup portion of LP: #730672, by installing + the conffile and applying it at upstart + - debian/vtrgb: Ubuntu's virtual terminal color scheme + - debian/console-setup.setvtrgb.upstart: run setvtrgb during upstart + + -- Dustin Kirkland Thu, 17 Mar 2011 17:10:50 -0500 + +console-setup (1.57ubuntu10) natty; urgency=low + + * Don't fail to configure keyboard-configuration if setxkbmap fails to + talk to the X display (LP: #728764). + + -- Colin Watson Fri, 04 Mar 2011 13:40:49 +0000 + +console-setup (1.57ubuntu9) natty; urgency=low + + * The console-setup udev rule accidentally went missing in 1.57ubuntu1. + Reinstall it, this time in keyboard-configuration (LP: #713746). + * Load the new keyboard configuration immediately when running + 'dpkg-reconfigure keyboard-configuration' in an installed system + (LP: #713062). + * Make setupcon explicitly exit 0, so that postinsts don't fail in the + event that loadkeys can't find a console. + + -- Colin Watson Thu, 03 Mar 2011 16:14:06 +0000 + +console-setup (1.57ubuntu8) natty; urgency=low + + * Move keyboard detection templates from console-setup.templates to + keyboard-configuration.templates. + + -- Colin Watson Mon, 28 Feb 2011 19:21:18 +0000 + +console-setup (1.57ubuntu7) natty; urgency=low + + * No change build to pick up xkeyboard-config 2.1-1ubuntu3. + + -- Evan Dandrea Tue, 08 Feb 2011 15:05:54 +0000 + +console-setup (1.57ubuntu6) natty; urgency=low + + * Allow underscores in rules variables ($sun_t6_custom). + + -- Evan Dandrea Mon, 07 Feb 2011 15:14:44 +0000 + +console-setup (1.57ubuntu5) natty; urgency=low + + * Drop misguided Ubuntu-specific code to migrate from console-setup/* to + keyboard-configuration/* question names. This is already handled on + upgrade by reading the old /etc/default/console-setup file + (LP: #698263). + * console-setup-udeb (<< 1.53) didn't set the seen flag in the installed + system. Cope with this and avoid asking the layout and variant + questions again if the default debconf priority is at least high + (LP: #705883). + * If we detect the above breakage (upgrading from anything between + 1.57ubuntu1 and 1.57ubuntu4 inclusive, and the XKB* values in + /etc/default/keyboard differ from the commented-out values in + /etc/default/console-setup), reset to the commented-out values in + /etc/default/console-setup. + + -- Colin Watson Fri, 28 Jan 2011 12:19:42 +0000 + +console-setup (1.57ubuntu4) natty; urgency=low + + * Include pc105.tree for ubiquity. + + -- Evan Dandrea Mon, 24 Jan 2011 16:53:59 +0000 + +console-setup (1.57ubuntu3) natty; urgency=low + + * Correct fix for LP: #634402: explicitly check readability of + /etc/default/keyboard and /etc/default/console-setup in initramfs hooks, + rather than trying to guard '.' with '||' which doesn't work + (LP: #701954). + + -- Colin Watson Thu, 20 Jan 2011 20:55:01 +0000 + +console-setup (1.57ubuntu2) natty; urgency=low + + * Make keyboard-configuration replace old console-setup/console-setup-mini + versions as well as conflicting with them (thanks, Martin Pitt). + + -- Colin Watson Thu, 06 Jan 2011 12:24:45 +0000 + +console-setup (1.57ubuntu1) natty; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Use keymapper to generate decision trees for a restricted subset of + the pc105 model. + - 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. + - Reset keyboard-configuration/toggle to the default if it's set to "No + toggling" and you select a non-Latin layout. + - Change the default font from Fixed to VGA for Lat15; while it's not + entirely complete, it looks better and is largely good enough. + - Automatically save the font and keymap to /etc in + /etc/init.d/console-setup if it isn't being run from init. Similarly, + ensure that the font and keymap are saved to /etc during initial + installation. + - Set keymap and font in the initramfs if possible and sensible. + - Set default variant for French to oss. + - Set default for Dutch to us(intl), not just us. + - Set default layout for Vietnam to 'us'. + - Set default layout for Kurdish to tr(ku). + - Stop running debconf-updatepo on clean. + - Update for new layouts and variants for Montenegro and Serbia, and + migrate configuration files from the old layouts. + - Add a "Do not configure keyboard; keep kernel keymap" model option, + preseedable by keyboard-configuration/modelcode=SKIP. + - Drop the layout/variant priority to high on fresh installs. + - Honour OVERRIDE_ALLOW_PRESEEDING environment variable when deciding + whether to allow preseeding, which is ordinarily only allowed in d-i. + - If keyboard-configuration/layoutcode is preseeded but not marked as + seen, then set the default layout but don't lower the layout question + priority or preseed console-setup/ask_detect. + - Add an apport hook. + - Generate a locale locally for translating keyboard names in + kbdnames-maker. + - Replace usplash detection code with Plymouth detection code. + - Move boot tasks to a combination of two udev rules and a single + Upstart job, ensuring that they're run at points when we are able to + satisfy the constraints on the relevant ioctls. + - Depend on kbd (>= 1.15-1ubuntu3) for a valuable loadkeys improvement. + - Don't try to call update-rc.d if it doesn't exist, such as in d-i. + - Don't gzip font or ACM files in /etc/console-setup/. The space saving + is negligible, and it's more efficient not to need to uncompress them + at boot time. + - Remove iconv transliteration. We don't use non-UTF-8 locales, and it + breaks ubiquity as we haven't generated the configured locale by the + time we hit console-setup. + * Go back to always asking layout before variant. + * Migrate from old console-setup/* to new keyboard-configuration/* + question names. + * Use the default keyboard model if an existing configuration file sets + XKBMODEL="". + * Exit cleanly from initramfs hook if /etc/default/keyboard or + /etc/default/console-setup don't exist for some reason (LP: #634402). + * Fix description of upstart job to not incorrectly claim that it sets the + font (LP: #632366). + + -- Colin Watson Wed, 05 Jan 2011 17:02:40 +0000 + console-setup (1.57) unstable; urgency=low * udeb: properly preseed system based on installer values. @@ -2609,6 +4740,181 @@ -- Anton Zinoviev Thu, 14 May 2009 21:42:14 +0300 +console-setup (1.34ubuntu15) lucid; urgency=low + + * Make /usr/share/initramfs-tools/scripts/panic/console_setup executable. + + -- Colin Watson Fri, 23 Apr 2010 23:23:50 +0100 + +console-setup (1.34ubuntu14) lucid; urgency=low + + * Update Ubuntu-specific translations from Launchpad. + + -- Colin Watson Thu, 15 Apr 2010 00:08:23 +0100 + +console-setup (1.34ubuntu13) lucid; urgency=low + + * Remove iconv transliteration. We don't use non-UTF-8 locales, and + it breaks ubiquity as we haven't generated the configured locale by + the time we hit console-setup (LP: #542310). + + -- Evan Dandrea Fri, 26 Mar 2010 12:50:50 +0000 + +console-setup (1.34ubuntu12) lucid; urgency=low + + * console-setup-tty: Only call setfont once, for both font and ACM. + * Don't try to call update-rc.d if it doesn't exist, such as in d-i + (LP: #540835). + * Don't gzip font or ACM files in /etc/console-setup/. The space saving + is negligible, and it's more efficient not to need to uncompress them at + boot time. + + -- Colin Watson Fri, 19 Mar 2010 11:08:58 +0000 + +console-setup (1.34ubuntu11) lucid; urgency=low + + * Move boot tasks to a combination of two udev rules and a single Upstart + job, ensuring that they're run at points when we are able to satisfy the + constraints on the relevant ioctls. This may not work optimally with + vgacon, but you have to go to special effort to use that with Ubuntu + now, and it at least shouldn't break (LP: #524439). + * Set default layout for Guernsey, Jersey, and the Isle of Man to gb + (LP: #533003). + * Fix incorrect FONT and ACM tests in initramfs script. + * Depend on kbd (>= 1.15-1ubuntu3) for a valuable loadkeys improvement. + This was previously a recommends, but the udev rule won't work without + kbd or console-tools anyway, I'm not really interested in supporting a + system without either installed, and console-tools is thoroughly + obsolete now. + + -- Colin Watson Sat, 13 Mar 2010 12:56:30 +0000 + +console-setup (1.34ubuntu10) lucid; urgency=low + + * debian/console-setup.console-setup.init, + debian/console-setup.keyboard-setup.init: Replace the usplash detection + code with Plymouth detection code, since the same problem applies. + + -- Scott James Remnant Wed, 17 Feb 2010 13:14:32 +0000 + +console-setup (1.34ubuntu9) lucid; urgency=low + + * Generate a locale locally for translating keyboard names in + kbnames-maker. + + -- Evan Dandrea Thu, 04 Feb 2010 15:48:25 -0800 + +console-setup (1.34ubuntu8) lucid; urgency=low + + * Put kbdnames.gz in console-setup-udeb as well. + * Don't filter out models from kbdnames as we still ask the model + question. + + -- Evan Dandrea Wed, 27 Jan 2010 17:22:19 +0000 + +console-setup (1.34ubuntu7) lucid; urgency=low + + * Merge support for translated keyboard names from Debian. + * Update ckb/rules/base.xml to point at the new location. + + -- Evan Dandrea Wed, 20 Jan 2010 15:22:34 +0000 + +console-setup (1.34ubuntu6) lucid; urgency=low + + * debian/console-setup.initramfs-hook: There's no harm having the hook + run in the non-framebuffer case, it just copies things into the + initramfs which may be useful. + * debian/rules: That means we can copy the hook into scripts/panic as + well (stripping the OPTION from it), so when we need a shell, we'll + load the keymap. + + -- Scott James Remnant Fri, 18 Dec 2009 14:56:03 +0000 + +console-setup (1.34ubuntu5) lucid; urgency=low + + * We don't need the initramfs hooks if the initramfs doesn't load the + framebuffer or splash screen. + + -- Scott James Remnant Tue, 15 Dec 2009 14:56:59 +0000 + +console-setup (1.34ubuntu4) karmic; urgency=low + + * Fix backports of Asturian and Catalan changes in 1.34ubuntu3. + + -- Colin Watson Thu, 01 Oct 2009 20:27:35 +0100 + +console-setup (1.34ubuntu3) karmic; urgency=low + + [ Loïc Minier ] + * Use `dpkg --print-architecture` instead of the obsolete + --print-installation-architecture in debian/config.proto (LP: #403316). + + [ Colin Watson ] + * Forbid Unicode keysyms in the range 0xf000-0xffff, as kbd 1.15-1 rejects + the entire keymap if it contains any keysyms in that range (LP: + #416949). + * Add default codeset/layout/variant for Asturian. + * Backport from trunk (Jordi Mallach): + - Set XKBVARIANT to "cat" for Catalan. + + -- Colin Watson Thu, 01 Oct 2009 20:21:57 +0100 + +console-setup (1.34ubuntu2) karmic; urgency=low + + * Add an apport hook. + * Update translations from Launchpad. + * Backport from trunk (Anton Zinoviev, LP: #390292): + - Do not issue warnings for unknown keycodes with AT keyboards (these + are multimedia keys and they are unnecessary on the console). Thanks + to Anders LagerÃ¥s, closes: #531292. + + -- Colin Watson Tue, 01 Sep 2009 11:49:34 +0100 + +console-setup (1.34ubuntu1) karmic; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Use keymapper to generate decision trees for a restricted subset of + the pc105 model. + - 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. + - Reset console-setup/toggle to the default if it's set to "No toggling" + and you select a non-Latin layout. + - Change the default font from Fixed to VGA for Lat15; while it's not + entirely complete, it looks better and is largely good enough. + - Run kbd_mode on each tty in ACTIVE_CONSOLES rather than on the current + tty, since the current tty might belong to X and changing X's tty out + of raw mode is a very bad idea. + - Automatically save the font and keymap to /etc in + /etc/init.d/console-setup if it isn't being run from init. Similarly, + ensure that the font and keymap are saved to /etc during initial + installation. + - Set keymap and font in the initramfs if possible. + - Set default variant for French to oss. + - Set default for Dutch to us(intl), not just us. + - Set default layout for Vietnam to 'us'. + - Set default layout for Kurdish to tr(ku). + - Fix handling of commas in layout and variant names. + - debian/config.proto: Set sparc default model to pc105. + - Remove 'exit 0' from the end of debian/config.proto; this will be + sourced from the postinst in the installer, and exiting in the + successful case means that /etc/default/console-setup never gets + generated. + - Stop running debconf-updatepo on clean. + - Update for new layouts and variants for Japan, Montenegro, and Serbia, + and migrate configuration files from the old layouts. + - Add a "Do not configure keyboard; keep kernel keymap" model option, + preseedable by console-setup/modelcode=SKIP. + - Drop the layout/variant priority to high on fresh installs. + - Honour OVERRIDE_ALLOW_PRESEEDING environment variable when deciding + whether to allow preseeding, which is ordinarily only allowed in d-i. + - If console-setup/layoutcode is preseeded but not marked as seen, then + set the default layout but don't lower the layout question priority or + preseed console-setup/ask_detect. + - Treat the Kazakhstan layout (kz) as non-Latin. + + -- Colin Watson Tue, 05 May 2009 20:51:20 +0100 + console-setup (1.34) unstable; urgency=medium [ Colin Watson ] @@ -2758,6 +5064,113 @@ -- Anton Zinoviev Tue, 24 Mar 2009 20:53:51 +0200 +console-setup (1.28ubuntu8) jaunty; urgency=low + + * Update Ubuntu-specific strings from Launchpad. + * Treat the Kazakhstan layout (kz) as non-Latin (LP: #356816). + + -- Colin Watson Thu, 09 Apr 2009 01:15:09 +0100 + +console-setup (1.28ubuntu7) jaunty; urgency=low + + * Raise priority to critical for questions preseeded with a nonexistent + code (LP: #328078). + + -- Colin Watson Fri, 27 Mar 2009 11:45:13 +0000 + +console-setup (1.28ubuntu6) jaunty; urgency=low + + * Don't escape '(' and ')' when decoding/encoding the codeset, as the + pattern is passed to grep and this causes parentheses to be interpreted + as regular expression groups (thanks to Dmitry Agafonov for pointing out + the problem). + * If reading a user configuration file, disable --save, and don't use + /etc/console-setup/boottime.kmap.gz (LP: #332728). + * Update Keyboard/KeyboardNames.pl based on xkb-data 1.5-2ubuntu5. + + -- Colin Watson Mon, 02 Mar 2009 16:30:50 +0000 + +console-setup (1.28ubuntu5) jaunty; urgency=low + + * Backport from trunk: + - Sort the null variant to the top of the choices list rather than to the + bottom. + * Set and check a flag on console-setup/dont_ask_layout to make sure that + it's only asked at most once per package installation (LP: #320374). + * Update Keyboard/KeyboardNames.pl based on xkb-data 1.4-1ubuntu3. + + -- Colin Watson Sat, 31 Jan 2009 12:07:37 +0000 + +console-setup (1.28ubuntu4) jaunty; urgency=low + + * Set plain or shifted PrintScreen key to generate VoidSymbol rather than + Ctrl-backslash (LP: #279973). + + -- Colin Watson Mon, 15 Dec 2008 10:09:28 +0000 + +console-setup (1.28ubuntu3) jaunty; urgency=low + + * Create /dev/tty[1-6] in our initramfs script before trying to operate on + them (LP: #130444). + + -- Colin Watson Wed, 26 Nov 2008 12:15:12 +0000 + +console-setup (1.28ubuntu2) jaunty; urgency=low + + * Default console-setup/ask_detect to false, since it's hard to back up + out of the detection widget once you've entered it. + + -- Colin Watson Tue, 25 Nov 2008 16:48:28 +0000 + +console-setup (1.28ubuntu1) jaunty; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Use keymapper to generate decision trees for a restricted subset of + the pc105 model. + - 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. + - Reset console-setup/toggle to the default if it's set to "No toggling" + and you select a non-Latin layout. + - Change the default font from Terminus to VGA where supported. + - Run kbd_mode on each tty in ACTIVE_CONSOLES rather than on the current + tty, since the current tty might belong to X and changing X's tty out + of raw mode is a very bad idea. + - Automatically save the font and keymap to /etc in + /etc/init.d/console-setup if it isn't being run from init. Similarly, + ensure that the font and keymap are saved to /etc during initial + installation. + - Disable workaround in ckbcomp for the kernel not applying Caps Lock to + non-ASCII letters, except for Turkish layouts; the cure is worse than + the disease because it makes Caps Lock equivalent to Shift Lock. + - Set keymap and font in the initramfs if possible. + - Set default variant for French to oss. + - Set default for Dutch to us(intl), not just us. + - Set default layout for Vietnam to 'us'. + - Set default layout for Kurdish to tr(ku). + - Fix handling of commas in layout and variant names. + - Fix keymap reduction not to try to express keymap A in terms of keymap + B when B includes keys not mapped by A. + - debian/config.proto: Set sparc default model to pc105. + - Remove 'exit 0' from the end of debian/config.proto; this will be + sourced from the postinst in the installer, and exiting in the + successful case means that /etc/default/console-setup never gets + generated. + - Stop running debconf-updatepo on clean. + - Update for new layouts and variants for Japan, Montenegro, and Serbia, + and migrate configuration files from the old layouts. + - Add a "Do not configure keyboard; keep kernel keymap" model option, + preseedable by console-setup/modelcode=SKIP. + - Drop the layout/variant priority to high on fresh installs. + - Honour OVERRIDE_ALLOW_PRESEEDING environment variable when deciding + whether to allow preseeding, which is ordinarily only allowed in d-i. + - If console-setup/layoutcode is preseeded but not marked as seen, then + set the default layout but don't lower the layout question priority or + preseed console-setup/ask_detect. + - Fix property counts in Goha and legacy BDF fonts. + + -- Colin Watson Thu, 06 Nov 2008 14:36:26 +0000 + console-setup (1.28) unstable; urgency=low [ Debconf translations ] @@ -2796,6 +5209,67 @@ -- Christian Perrier Tue, 08 Jul 2008 20:40:35 +0200 +console-setup (1.25ubuntu3) intrepid; urgency=low + + * Fix property counts in Goha and legacy BDF fonts. + * Switch from console-tools-udeb to kbd-udeb, in line with Debian. + + -- Colin Watson Thu, 28 Aug 2008 00:09:48 +0100 + +console-setup (1.25ubuntu2) intrepid; urgency=low + + * If console-setup/layoutcode is preseeded but not marked as seen, then + set the default layout but don't lower the layout question priority or + preseed console-setup/ask_detect (LP: #64058). + + -- Colin Watson Mon, 30 Jun 2008 23:49:31 +0100 + +console-setup (1.25ubuntu1) intrepid; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Use keymapper to generate decision trees for a restricted subset of + the pc105 model. + - 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. + - Reset console-setup/toggle to the default if it's set to "No toggling" + and you select a non-Latin layout. + - Change the default font from Terminus to VGA where supported. + - Run kbd_mode on each tty in ACTIVE_CONSOLES rather than on the current + tty, since the current tty might belong to X and changing X's tty out + of raw mode is a very bad idea. + - Automatically save the font and keymap to /etc in + /etc/init.d/console-setup if it isn't being run from init. Similarly, + ensure that the font and keymap are saved to /etc during initial + installation. + - Disable workaround in ckbcomp for the kernel not applying Caps Lock to + non-ASCII letters, except for Turkish layouts; the cure is worse than + the disease because it makes Caps Lock equivalent to Shift Lock. + - Set keymap and font in the initramfs if possible. + - Set default variant for French to oss. + - Set default for Dutch to us(intl), not just us. + - Set default layout for Vietnam to 'us'. + - Set default layout for Kurdish to tr(ku). + - Fix handling of commas in layout and variant names. + - Fix keymap reduction not to try to express keymap A in terms of keymap + B when B includes keys not mapped by A. + - debian/config.proto: Set sparc default model to pc105. + - Remove 'exit 0' from the end of debian/config.proto; this will be + sourced from the postinst in the installer, and exiting in the + successful case means that /etc/default/console-setup never gets + generated. + - Switch back to console-tools-udeb for now. + - Stop running debconf-updatepo on clean. + - Update for new layouts and variants for Japan, Montenegro, and Serbia, + and migrate configuration files from the old layouts. + - Add a "Do not configure keyboard; keep kernel keymap" model option, + preseedable by console-setup/modelcode=SKIP. + - Drop the layout/variant priority to high on fresh installs. + - Honour OVERRIDE_ALLOW_PRESEEDING environment variable when deciding + whether to allow preseeding, which is ordinarily only allowed in d-i. + + -- Colin Watson Tue, 24 Jun 2008 02:39:34 +0100 + console-setup (1.25) unstable; urgency=low [ Anton Zinoviev ] @@ -2813,6 +5287,52 @@ -- Christian Perrier Wed, 18 Jun 2008 20:24:01 +0200 +console-setup (1.24ubuntu1) intrepid; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Use keymapper to generate decision trees for a restricted subset of + the pc105 model. + - 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. + - Reset console-setup/toggle to the default if it's set to "No toggling" + and you select a non-Latin layout. + - Change the default font from Terminus to VGA where supported. + - Run kbd_mode on each tty in ACTIVE_CONSOLES rather than on the current + tty, since the current tty might belong to X and changing X's tty out + of raw mode is a very bad idea. + - Automatically save the font and keymap to /etc in + /etc/init.d/console-setup if it isn't being run from init. Similarly, + ensure that the font and keymap are saved to /etc during initial + installation. + - Disable workaround in ckbcomp for the kernel not applying Caps Lock to + non-ASCII letters, except for Turkish layouts; the cure is worse than + the disease because it makes Caps Lock equivalent to Shift Lock. + - Set keymap and font in the initramfs if possible. + - Set default variant for French to oss. + - Set default for Dutch to us(intl), not just us. + - Set default layout for Vietnam to 'us'. + - Set default layout for Kurdish to tr(ku). + - Fix handling of commas in layout and variant names. + - Fix keymap reduction not to try to express keymap A in terms of keymap + B when B includes keys not mapped by A. + - debian/config.proto: Set sparc default model to pc105. + - Remove 'exit 0' from the end of debian/config.proto; this will be + sourced from the postinst in the installer, and exiting in the + successful case means that /etc/default/console-setup never gets + generated. + - Switch back to console-tools-udeb for now. + - Stop running debconf-updatepo on clean. + - Update for new layouts and variants for Japan, Montenegro, and Serbia, + and migrate configuration files from the old layouts. + - Add a "Do not configure keyboard; keep kernel keymap" model option, + preseedable by console-setup/modelcode=SKIP. + - Drop the layout/variant priority to high on fresh installs. + - Honour OVERRIDE_ALLOW_PRESEEDING environment variable when deciding + whether to allow preseeding, which is ordinarily only allowed in d-i. + + -- Colin Watson Wed, 11 Jun 2008 22:32:10 +0100 + console-setup (1.24) unstable; urgency=medium [ Anton Zinoviev ] @@ -2887,6 +5407,100 @@ -- Anton Zinoviev Fri, 04 Apr 2008 22:41:21 +0300 +console-setup (1.21ubuntu8) hardy; urgency=low + + * Rebuild against xkeyboard-config 1.1~cvs.20080104.1-1ubuntu6. + + -- Colin Watson Mon, 21 Apr 2008 20:40:40 +0100 + +console-setup (1.21ubuntu7) hardy; urgency=low + + * Honour OVERRIDE_ALLOW_PRESEEDING environment variable when deciding + whether to allow preseeding, which is ordinarily only allowed in d-i + (LP: #188492). + + -- Colin Watson Mon, 14 Apr 2008 11:49:55 +0100 + +console-setup (1.21ubuntu6) hardy; urgency=low + + * Handle some special cases for the KPDL key (LP: #189529). + + -- Colin Watson Wed, 02 Apr 2008 00:06:25 +0100 + +console-setup (1.21ubuntu5) hardy; urgency=low + + * Silence error messages for keycodes 214, 215, 216, and 217, which are + various special keys in the default X.org PC keyboard map that we don't + need to handle. + * Map dead_stroke to U+002D HYPHEN-MINUS. + * Add a "Do not configure keyboard; keep kernel keymap" model option, + preseedable by console-setup/modelcode=SKIP (LP: #59889). + * Drop the layout/variant priority to high on fresh installs + (LP: #205959). + * Support rules with multiple consequents (thanks, Adam Simpkins; + LP: #139710). + * Allow specifying alternate rules using XKBRULES (thanks, Adam Simpkins; + LP: #139712). + + -- Colin Watson Mon, 31 Mar 2008 14:33:25 +0100 + +console-setup (1.21ubuntu4) hardy; urgency=low + + * Set default layout for Kurdish to tr(ku) (LP: #28683). + + -- Colin Watson Mon, 03 Mar 2008 13:46:06 +0000 + +console-setup (1.21ubuntu3) hardy; urgency=low + + * Set default layout for Vietnam to 'us' (LP: #191451). + * Treat 'any' as a synonym for 'NoSymbol' in XKB input files (LP: #93077). + + -- Colin Watson Tue, 26 Feb 2008 14:05:12 +0000 + +console-setup (1.21ubuntu2) hardy; urgency=low + + * Set default for Dutch to us(intl), not just us (LP: #129982). + + -- Colin Watson Tue, 29 Jan 2008 00:14:54 +0000 + +console-setup (1.21ubuntu1) hardy; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Use keymapper to generate decision trees for a restricted subset of + the pc105 model. + - 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. + - Reset console-setup/toggle to the default if it's set to "No toggling" + and you select a non-Latin layout. + - Change the default font from Terminus to VGA where supported. + - Run kbd_mode on each tty in ACTIVE_CONSOLES rather than on the current + tty, since the current tty might belong to X and changing X's tty out + of raw mode is a very bad idea. + - Automatically save the font and keymap to /etc in + /etc/init.d/console-setup if it isn't being run from init. Similarly, + ensure that the font and keymap are saved to /etc during initial + installation. + - Disable workaround in ckbcomp for the kernel not applying Caps Lock to + non-ASCII letters, except for Turkish layouts; the cure is worse than + the disease because it makes Caps Lock equivalent to Shift Lock. + - Set keymap and font in the initramfs if possible. + - Set default variant for French to oss. + - Fix handling of commas in layout and variant names. + - Fix keymap reduction not to try to express keymap A in terms of keymap + B when B includes keys not mapped by A. + - debian/config.proto: Set sparc default model to pc105. + - Remove 'exit 0' from the end of debian/config.proto; this will be + sourced from the postinst in the installer, and exiting in the + successful case means that /etc/default/console-setup never gets + generated. + - Switch back to console-tools-udeb for now. + - Stop running debconf-updatepo on clean. + * Update for new layouts and variants for Japan, Montenegro, and Serbia, + and migrate configuration files from the old layouts. + + -- Colin Watson Mon, 28 Jan 2008 23:01:31 +0000 + console-setup (1.21) unstable; urgency=low * Silently ignore 'vendor' tag in xorg.xml. @@ -2945,6 +5559,69 @@ -- Christian Perrier Sat, 05 Jan 2008 09:04:03 +0100 +console-setup (1.19ubuntu3) hardy; urgency=low + + * Set default layout for Dutch to 'us' (LP: #129982). + * Set default layout for Simplified Chinese to 'cn'. + * Set default layout for Morocco to 'ma'. + + -- Colin Watson Mon, 28 Jan 2008 17:11:21 +0000 + +console-setup (1.19ubuntu2) hardy; urgency=low + + * Handle an empty codeset in the configuration file gracefully (a remnant + of a previous bug, perhaps Debian #420802?), and re-ask the question on + upgrade (LP: #91399). + + -- Colin Watson Fri, 11 Jan 2008 00:30:07 +0000 + +console-setup (1.19ubuntu1) hardy; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Use keymapper to generate decision trees for a restricted subset of + the pc105 model. + - 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. + - Only default to Canadian layout for fr_CA; use U.S. English for other + *_CA locales. + - Reset console-setup/toggle to the default if it's set to "No toggling" + and you select a non-Latin layout. + - Change the default font from Terminus to VGA where supported. + - Run kbd_mode on each tty in ACTIVE_CONSOLES rather than on the current + tty, since the current tty might belong to X and changing X's tty out + of raw mode is a very bad idea. + - Automatically save the font and keymap to /etc in + /etc/init.d/console-setup if it isn't being run from init. Similarly, + ensure that the font and keymap are saved to /etc during initial + installation. + - Disable workaround in ckbcomp for the kernel not applying Caps Lock to + non-ASCII letters, except for Turkish layouts; the cure is worse than + the disease because it makes Caps Lock equivalent to Shift Lock. + - Set keymap and font in the initramfs if possible. + - Set default variant for French to oss. + - Fix handling of commas in layout and variant names. + - Fix keymap reduction not to try to express keymap A in terms of keymap + B when B includes keys not mapped by A. + - debian/config.proto: Set sparc default model to pc105. + - Remove 'exit 0' from the end of debian/config.proto; this will be + sourced from the postinst in the installer, and exiting in the + successful case means that /etc/default/console-setup never gets + generated. + - Set default model to pc105 on powerpc/ps3 systems. + * Switch back to console-tools-udeb for now; we'd like to use kbd for + Hardy, but Alpha 1 is looming ... + * Stop running debconf-updatepo on clean; this is not standard in d-i and + should be done manually where necessary in Ubuntu. + * Backport from trunk: + - Run setupcon with --save in the postinst to ensure that required data + is copied to /etc. + - Load the saved keymap in /etc/console-setup/boottime.kmap.gz if + available rather than running ckbcomp (which is slow), unless we're + being called with --save or --save-only. + + -- Colin Watson Tue, 27 Nov 2007 15:05:15 +0000 + console-setup (1.19) unstable; urgency=low [ Jérémy Bobbio ] @@ -2992,6 +5669,85 @@ -- Anton Zinoviev Sun, 15 Jul 2007 16:35:55 +0300 +console-setup (1.16ubuntu5) gutsy; urgency=low + + * Rebuild against xkb-data 0.9-4ubuntu2. + + -- Colin Watson Mon, 24 Sep 2007 12:53:36 +0100 + +console-setup (1.16ubuntu4) gutsy; urgency=low + + * Set default model to pc105 on powerpc/ps3 systems. + + -- Colin Watson Fri, 08 Jun 2007 14:12:20 +0100 + +console-setup (1.16ubuntu3) gutsy; urgency=low + + * Remove 'exit 0' from the end of debian/config.proto; this will be + sourced from the postinst in the installer, and exiting in the + successful case means that /etc/default/console-setup never gets + generated (thanks, Evan Dandrea). + + -- Colin Watson Mon, 04 Jun 2007 22:53:23 +0100 + +console-setup (1.16ubuntu2) gutsy; urgency=low + + * Make Keyboard/keymaptree executable again. + + -- Colin Watson Sun, 03 Jun 2007 21:30:57 +0100 + +console-setup (1.16ubuntu1) gutsy; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Use keymapper to generate decision trees for a restricted subset of + the pc105 model. + - 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. + - Only default to Canadian layout for fr_CA; use U.S. English for other + *_CA locales. + - Set default charmap for d-i to UTF-8. + - Remove unhelpful defaults for several questions. + - Allow preseeding of console-setup/modelcode, console-setup/layoutcode, + console-setup/variantcode, console-setup/optionscode, and + console-setup/fontsize. + - Reset console-setup/toggle to the default if it's set to "No toggling" + and you select a non-Latin layout. + - Change the default font from Terminus to VGA where supported. + - Add a few bits of installer integration to console-setup-udeb borrowed + from kbd-chooser. + - console-setup Depends: perl; something in ckbcomp is causing perl to + 'use utf8' implicitly, and some of the necessary modules aren't in + perl-base. + - Run kbd_mode on each tty in ACTIVE_CONSOLES rather than on the current + tty, since the current tty might belong to X and changing X's tty out + of raw mode is a very bad idea. + - Automatically save the font and keymap to /etc in + /etc/init.d/console-setup if it isn't being run from init. Similarly, + ensure that the font and keymap are saved to /etc during initial + installation. + - Disable workaround in ckbcomp for the kernel not applying Caps Lock to + non-ASCII letters, except for Turkish layouts; the cure is worse than + the disease because it makes Caps Lock equivalent to Shift Lock. + - Use 'setupcon --save-only' to make sure the font is available on the + root filesystem for the next boot but not to load it immediately, + avoiding console manipulation when X or usplash is running. + - Set keymap and font in the initramfs if possible. + - Set default variant for French to oss. + - Fix handling of commas in layout and variant names. + - Fix keymap reduction not to try to express keymap A in terms of keymap + B when B includes keys not mapped by A. + - debian/config.proto: Set sparc default model to pc105. + - debian/control: Remove outdated note about loadkeys in + console-setup-udeb's description. + * Allow kbd's initramfs hook as an alternative to that provided by + console-tools. + * Don't run 'setupcon -k' from rcS if usplash is running, as that means + the console will be in raw mode and loadkeys will do confusing things to + the keymap (LP: #84156). + + -- Colin Watson Sun, 03 Jun 2007 14:53:42 +0100 + console-setup (1.16) unstable; urgency=low * Update ckbconf with the most recent list of xkeysyms. @@ -3041,6 +5797,73 @@ -- Anton Zinoviev Tue, 1 May 2007 23:48:12 +0300 +console-setup (1.15ubuntu1) gutsy; urgency=low + + * Resynchronise with Debian (LP: #94177). Remaining changes: + - Use keymapper to generate decision trees for a restricted subset of + the pc105 model. + - 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. + - Ship MyKeyboardNames.pl (as KeyboardNames.pl) and kbdnames-maker in + /usr/share/console-setup. + - Only default to Canadian layout for fr_CA; use U.S. English for other + *_CA locales. + - Fix default layout for Bosnian and default variant for Hindi. + - Set default charmap for d-i to UTF-8. + - Remove unhelpful defaults for several questions. + - Adjust the default keyboard model for Brazilian and Japanese layouts. + - Allow preseeding of console-setup/modelcode, console-setup/layoutcode, + console-setup/variantcode, console-setup/optionscode, and + console-setup/fontsize. + - Use jp(latin),jp rather than us,jp by default for Japanese. + - Reset console-setup/toggle to the default if it's set to "No toggling" + and you select a non-Latin layout. + - Change the default font from Terminus to VGA where supported. + - Add a few bits of installer integration to console-setup-udeb borrowed + from kbd-chooser. + - console-setup Depends: perl; something in ckbcomp is causing perl to + 'use utf8' implicitly, and some of the necessary modules aren't in + perl-base. + - Run kbd_mode on each tty in ACTIVE_CONSOLES rather than on the current + tty, since the current tty might belong to X and changing X's tty out + of raw mode is a very bad idea. + - Map fr_CH to ch(fr) (Swiss French). + - Fix codeset question priority for Esperanto. + - Automatically save the font and keymap to /etc in + /etc/init.d/console-setup if it isn't being run from init. Similarly, + ensure that the font and keymap are saved to /etc during initial + installation. + - Disable workaround in ckbcomp for the kernel not applying Caps Lock to + non-ASCII letters, except for Turkish layouts; the cure is worse than + the disease because it makes Caps Lock equivalent to Shift Lock. + - Add a --save-only option to setupcon, to save the keyboard/font on the + root filesystem but not actually tell the kernel to set it up. Use it + to make sure the font is available on the root filesystem for the next + boot but not to load it immediately, avoiding console manipulation + when X or usplash is running. + - Set keymap and font in the initramfs if possible. + - Add lt to list of non-Latin keymaps. + - Set default variant for French to oss. + - Fix handling of commas in layout and variant names. + - Fix keymap reduction not to try to express keymap A in terms of keymap + B when B includes keys not mapped by A. + - Source debconf confmodule earlier in postinst. + - Fix horrible confusion if the locale has no supported default codeset. + - Fix console-setup/codeset default to be one of the available choices. + - Don't set an AltGr key by default for US layouts. + - Add amiga, ataritt, sun4, and sun5 models, since they are used as + defaults on certain architectures. + - Map keycode 133 to AT scancode 124 for Japanese. + * debian/config.proto: Set sparc default model to pc105 (LP: #105595). + * debian/control: Multiply Installer-Menu-Item number by 100. + * debian/control: Remove outdated note about loadkeys in + console-setup-udeb's description. + * debian/console-setup.postinst: Drop font fixups for upgrades from + development versions of Edgy. + + -- Colin Watson Wed, 25 Apr 2007 11:52:52 +0100 + console-setup (1.15) unstable; urgency=low * Updated Georgian letters for Fixed16 and Fixed14. Thanks to Vladimer @@ -3059,6 +5882,171 @@ -- Christian Perrier Sun, 4 Mar 2007 19:54:11 +0100 +console-setup (1.13ubuntu13) feisty; urgency=low + + * debian/console-setup.console-setup.init: Don't break if fgconsole fails. + + -- Colin Watson Tue, 10 Apr 2007 16:16:08 +0100 + +console-setup (1.13ubuntu12) feisty; urgency=low + + * Map keycode 133 to AT scancode 124 for Japanese (thanks, Jun Kobayashi; + LP: #97466). + + -- Colin Watson Wed, 4 Apr 2007 16:48:15 +0100 + +console-setup (1.13ubuntu11) feisty; urgency=low + + * Add amiga, ataritt, sun4, and sun5 models, since they are used as + defaults on certain architectures (LP: #97225). + + -- Colin Watson Wed, 4 Apr 2007 10:11:03 +0100 + +console-setup (1.13ubuntu10) feisty; urgency=low + + * Source debconf confmodule earlier in postinst (it should always be + sourced as early as possible, as it re-executes the calling script). + * Fix horrible confusion if the locale has no supported default codeset + (LP: #84401). + * Fix console-setup/codeset default to be one of the available choices. + * Try harder to ensure that we aren't running under X when deciding + whether to run setupcon on upgrade (thanks to Kurt J. Bosch for + suggestions; LP: #93338). + * Don't set an AltGr key by default for US layouts (LP: #76901). + + -- Colin Watson Sun, 1 Apr 2007 16:49:02 +0100 + +console-setup (1.13ubuntu9) feisty; urgency=low + + * Keyboard/kbdcompiler: Fix keymap reduction not to try to express keymap + A in terms of keymap B when B includes keys not mapped by A, fixing a + number of incorrectly-reduced keymaps (LP: #74375). + * Keyboard/kbdcompiler: Update handling of jp to match + debian/config.proto. + * Keyboard/keymaptree.use: Remove jp; we cannot detect it correctly + without further intelligence, as it's designed for jp106 keyboard + models. + + -- Colin Watson Sat, 17 Mar 2007 10:06:05 +0000 + +console-setup (1.13ubuntu8) feisty; urgency=low + + * Fix handling of commas in layout and variant names. + + -- Colin Watson Fri, 9 Mar 2007 20:05:00 +0000 + +console-setup (1.13ubuntu7) feisty; urgency=low + + * Add lt to list of non-Latin keymaps (LP: #38931). + * Map Caps Lock to Shift Lock for Turkish layouts. + * Build keymap tree from MyKeyboardNames.pl rather than KeyboardNames.pl. + * Add fr:oss to keymap tree. + * Set default variant for French to oss (LP: #89835). + * Remove Keyboard/*.tree on clean. + * Fix six files in debian/ that were supposed to be symlinks. + * Move console-setup-udeb's post-base-installer script to be a + base-installer script instead, so that console-setup will be configured + properly along with the initramfs during debootstrap. + * Set Maintainer to me. + + -- Colin Watson Tue, 6 Mar 2007 12:09:57 +0000 + +console-setup (1.13ubuntu6) feisty; urgency=low + + * Set keymap and font in the initramfs if possible. Setting these as early + as possible is a good thing; we can't set up the font correctly once + usplash is running; and setting up the font between usplash and X + requires an ugly mode switch. + + -- Colin Watson Mon, 22 Jan 2007 14:21:24 +0000 + +console-setup (1.13ubuntu5) feisty; urgency=low + + * Add a --save-only option to setupcon, to save the keyboard/font on the + root filesystem but not actually tell the kernel to set it up. + * Back out part of setup-console-under-usplash changes: attempts to change + the font must be guarded against being run while on an X display or + while usplash is running, because some kernel console drivers (at least + vgacon) are fundamentally unable to change the font only on some virtual + consoles, and will corrupt video memory if you try (LP: #73955). We now + use setupcon --save-only to make sure the font is available on the root + filesystem for the next boot but don't load it immediately. + + -- Colin Watson Mon, 15 Jan 2007 20:08:33 +0000 + +console-setup (1.13ubuntu4) feisty; urgency=low + + * Include ro(std) in keymap tree, after talking with Eddy Petrişor. + * Disable workaround in ckbcomp for the kernel not applying Caps Lock to + non-ASCII letters; the cure is worse than the disease because it makes + Caps Lock equivalent to Shift Lock (LP: #69725). + * Install MyKeyboardNames.pl (built from /usr/share/X11/xkb) rather than + KeyboardNames.pl (built from the out-of-date copy in Keyboard/ckb) as + /usr/share/console-setup/KeyboardNames.pl (LP: #71864). + + -- Colin Watson Fri, 5 Jan 2007 14:15:04 +0000 + +console-setup (1.13ubuntu3) feisty; urgency=low + + * Remove ch(fr) from keymap tree again; it's not distinguishable from ch + without checking shift key state, which keymapper currently doesn't do. + + -- Colin Watson Wed, 29 Nov 2006 11:28:48 +0000 + +console-setup (1.13ubuntu2) feisty; urgency=low + + * Make Keyboard/keymaptree executable again. + + -- Colin Watson Tue, 28 Nov 2006 20:09:22 +0000 + +console-setup (1.13ubuntu1) feisty; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Use keymapper to generate decision trees for a restricted subset of + the pc105 model. + - 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. + - Ship KeyboardNames.pl and kbdnames-maker in /usr/share/console-setup. + - Only default to Canadian layout for fr_CA; use U.S. English for other + *_CA locales. + - Fix default layout for Bosnian and default variant for Hindi. + - Set default charmap for d-i to UTF-8. + - Remove unhelpful defaults for several questions. + - Adjust the default keyboard model for Brazilian and Japanese layouts. + - Allow preseeding of console-setup/modelcode, console-setup/layoutcode, + console-setup/variantcode, console-setup/optionscode, and + console-setup/fontsize. + - Use jp(latin),jp rather than us,jp by default for Japanese. + - Reset console-setup/toggle to the default if it's set to "No toggling" + and you select a non-Latin layout. + - Change the default font from Terminus to VGA where supported. + - Skip now-unnecessary console check in init scripts. + - Fix up font face and size on upgrading from old versions in Edgy. + - Add a few bits of installer integration to console-setup-udeb borrowed + from kbd-chooser. + - console-setup Depends: perl; something in ckbcomp is causing perl to + 'use utf8' implicitly, and some of the necessary modules aren't in + perl-base. + - Run kbd_mode on each tty in ACTIVE_CONSOLES rather than on the current + tty, since the current tty might belong to X and changing X's tty out + of raw mode is a very bad idea. + * Restore udeb generation. + + * Map fr_CH to ch(fr) (Swiss French). + * Include ch(fr) in keymap tree. + * Fix codeset question priority for Esperanto. + * Remove X and usplash checks in keyboard-setup and console-setup init + scripts, since neither are needed following the fix in console-setup + 1.7ubuntu19. + * Allow setupcon to be run on install again, for the same reason. + * Automatically save the font and keymap to /etc in + /etc/init.d/console-setup if it isn't being run from init; this allows + us to tolerate XKB data being moved to /usr. Similarly, ensure that the + font and keymap are saved to /etc during initial installation. + + -- Colin Watson Fri, 24 Nov 2006 18:09:32 +0000 + console-setup (1.13) unstable; urgency=low * Unfuzzy the translations. @@ -3144,6 +6132,202 @@ -- Anton Zinoviev Tue, 19 Sep 2006 11:56:15 +0300 +console-setup (1.7ubuntu19) edgy; urgency=low + + * If upgrading from an older version than this one, check for the Terminus + font face and change it to VGA (if you do like it, you can change it + back and it won't be touched again). If Terminus was in use, also check + for the 12x6 font size and change it to 16, since that was apparently + selected due to a strange use-of-debconf bug. + * Run kbd_mode on each tty in ACTIVE_CONSOLES rather than on the current + tty, since the current tty might belong to X and changing X's tty out of + raw mode is a very bad idea (closes: Malone #66929; requires kbd 1.12-15 + or console-tools 1:0.2.3dbs-62ubuntu10). + * Adjust the default keyboard model for Brazilian (closes: Malone #66774) + and Japanese (closes: Malone #66719) layouts. + + -- Colin Watson Fri, 20 Oct 2006 20:16:09 +0100 + +console-setup (1.7ubuntu18) edgy; urgency=low + + * Change the default font to VGA where supported; Terminus does not seem + to have widespread aesthetic appeal. + * Use jp(latin),jp rather than us,jp by default for Japanese, and set the + model to jp106 (closes: Malone #63915). + * Build-depend on keymapper (>= 0.5.3-7) for improved Alt-handling logic. + + -- Colin Watson Thu, 12 Oct 2006 02:42:15 +0100 + +console-setup (1.7ubuntu17) edgy; urgency=low + + * Only default to Canadian layout for fr_CA; use U.S. English for other + *_CA locales (closes: Malone #64418). + * Install kbdnames-maker in /usr/share/console-setup, to make it easier + for non-Perl programs to use KeyboardNames.pl. + + -- Colin Watson Wed, 11 Oct 2006 12:52:36 +0100 + +console-setup (1.7ubuntu16) edgy; urgency=low + + * Backport from trunk (Anton Zinoviev, closes: Malone #63921): + - New mini-font georgian16.bdf to be used for the Georgian letters in + Fixed16, author: Gia Shervashidze. Thanks to Vladimer Sichinava. + + -- Colin Watson Wed, 4 Oct 2006 11:37:15 +0100 + +console-setup (1.7ubuntu15) edgy; urgency=low + + * Fix build failure caused by wrong path to KeyboardNames.pl. + + -- Colin Watson Tue, 3 Oct 2006 15:44:59 +0100 + +console-setup (1.7ubuntu14) edgy; urgency=low + + * Ship KeyboardNames.pl in /usr/share/console-setup. + + -- Colin Watson Tue, 3 Oct 2006 11:09:27 +0100 + +console-setup (1.7ubuntu13) edgy; urgency=low + + * Remove obsolete XORGCONFIGFILE variable. + * Reset console-setup/toggle to the default if it's set to "No toggling" + and you select a non-Latin layout (closes: Malone #63178). + + -- Colin Watson Mon, 2 Oct 2006 14:47:58 +0100 + +console-setup (1.7ubuntu12) edgy; urgency=low + + * Don't run the init script (and thereby setupcon) on upgrade; just print + a message telling you to run setupcon from a virtual console if you want + to update your console configuration (closes: Malone #61723). + * Update debian-installer/keymap handling from trunk (Anton Zinoviev). + Drop /etc/X11/xorg.conf upgrade handling, also per trunk, as I've been + convinced that that is much less safe due to the prevalence of GNOME/KDE + keymap overrides, and furthermore it made it more difficult to have + ubiquity tell console-setup just to guess a default from the locale. + * Drop the priority of the model and layout questions to medium if a + configuration file already exists, since they'll have been asked at + medium first time round and if we then ask them at critical the second + time round they will be unexpectedly shown (closes: Malone #59883). + * Backport from trunk: + - config.proto: Handle properly the case when the user backs up from the + first Debconf question. + + -- Colin Watson Sat, 23 Sep 2006 00:40:48 +0100 + +console-setup (1.7ubuntu11) edgy; urgency=low + + * Fix default layout for Bosnian and default variant for Hindi. + + -- Colin Watson Fri, 22 Sep 2006 15:57:23 +0100 + +console-setup (1.7ubuntu10) edgy; urgency=low + + * console-setup Depends: perl; something in ckbcomp is causing perl to + 'use utf8' implicitly, and some of the necessary modules aren't in + perl-base (closes: Malone #60203). + * Allow preseeding of console-setup/modelcode, console-setup/layoutcode, + console-setup/variantcode, console-setup/optionscode, and + console-setup/fontsize. + * Don't set up the console font at boot time if usplash is running, since + that seems to trigger a kernel bug that corrupts the usplash display + (closes: Malone #60483). + + -- Colin Watson Thu, 21 Sep 2006 01:01:54 +0100 + +console-setup (1.7ubuntu9) edgy; urgency=low + + * Switch build-dependency and dependency back to xkb-data, now that it's + fixed. Make the dependencies versioned until after Edgy is released to + avoid problems with partially-upgraded systems where only the broken + xkb-data is installed. + + -- Colin Watson Wed, 13 Sep 2006 10:24:20 +0100 + +console-setup (1.7ubuntu8) edgy; urgency=low + + * Add setupcon --force option and use it in postinst (Anton Zinoviev, + http://lists.alioth.debian.org/pipermail/pkg-kbd-devel/2006-August/000278.html). + * Check $DISPLAY rather than /proc/self/fd/2 in /etc/init.d/keyboard-setup + and /etc/init.d/console-setup; use setupcon --force. + + -- Colin Watson Mon, 11 Sep 2006 09:47:36 +0100 + +console-setup (1.7ubuntu7) edgy; urgency=low + + * Handle debian-installer/locale not being available (closes: Malone + #59718). + * Remove stray Keyboard/amiga.ekmap in source package. + * Fix a potential infinite loop in the config script while moving past the + variant question with an unsupported layout. + + -- Colin Watson Sun, 10 Sep 2006 12:07:53 +0100 + +console-setup (1.7ubuntu6) edgy; urgency=low + + * If there's no console-setup configuration when console-setup.config + runs, then: + - If there is an xorg.conf, set the defaults from there. + - Failing that, if debian-installer/keymap is set, try to guess correct + defaults from that using the same algorithm as formerly applied by + xserver-xorg.config. The only serious change I made to the algorithm + is that it now maps (mac-usb-)uk to plain gb, not gb(intl), since + that's closer to what UK keyboard users generally expect. + + -- Colin Watson Fri, 8 Sep 2006 00:13:26 +0100 + +console-setup (1.7ubuntu5) edgy; urgency=low + + * Only call setupcon from postinst script if /lib/debian-installer exists, + to make sure we're really in d-i. (Calling setupcon from X appears to + make things rather messy.) + + -- Colin Watson Thu, 7 Sep 2006 17:11:12 +0100 + +console-setup (1.7ubuntu4) edgy; urgency=low + + * Remove cs from the list of non-Latin layouts, as it has special + per-variant handling. + * Fix syntax error in config script. + * Don't try to use the detect-keyboard plugin if running noninteractively. + + -- Colin Watson Thu, 7 Sep 2006 15:39:38 +0100 + +console-setup (1.7ubuntu3) edgy; urgency=low + + * Use keymapper to generate decision trees for a restricted subset of the + pc105 model. (I tried building trees for the whole model, but this took + far too long.) + * 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. + * Fix debian/po/POTFILES.in to point to console-setup.templates. + * Make console-setup-udeb depend on console-setup-fonts-udeb, at least for + now. + * Convert init script to LSB logging functions. + * Add a few bits of installer integration to console-setup-udeb borrowed + from kbd-chooser (/lib/debian-installer.d/S55console-setup, + post-base-installer hook). + * Temporarily build-depend and depend on just xkeyboard-config to work + around Malone #59220. + * Set default charmap for d-i to UTF-8. + * Remove unhelpful "none" defaults for several questions. + + -- Colin Watson Thu, 7 Sep 2006 09:18:42 +0100 + +console-setup (1.7ubuntu2) edgy; urgency=low + + * Make console-setup-udeb depend on console-tools-udeb. + + -- Tollef Fog Heen Wed, 23 Aug 2006 14:36:58 +0200 + +console-setup (1.7ubuntu1) edgy; urgency=low + + * Call setupcon with input and output from /dev/tty in postinst and make + sure setupcon understands that properly. + + -- Tollef Fog Heen Wed, 23 Aug 2006 12:54:27 +0200 + console-setup (1.7) unstable; urgency=low [ Christian Perrier ] @@ -3251,3 +6435,4 @@ and pointing few typos). -- Anton Zinoviev Sat, 14 Jan 2006 16:20:35 +0200 + diff -Nru console-setup-1.222/debian/changelog console-setup-1.222ubuntu1/debian/changelog --- console-setup-1.222/debian/changelog 2023-06-21 21:34:22.000000000 +0200 +++ console-setup-1.222ubuntu1/debian/changelog 2023-06-29 15:02:36.000000000 +0200 @@ -1,3 +1,87 @@ +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, 29 Jun 2023 15:02:36 +0200 + console-setup (1.222) unstable; urgency=medium * Team upload @@ -16,6 +100,96 @@ -- Gunnar Hjalmarsson Wed, 21 Jun 2023 19:20:15 +0200 +console-setup (1.221ubuntu2) mantic; urgency=medium + + * Rebuild against latest xkeyboard-config. + + -- Colin Watson Tue, 20 Jun 2023 18:58:06 +0100 + +console-setup (1.221ubuntu1) mantic; urgency=medium + + * Merge with Debian unstable (LP: #2020749). 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 + + -- Shengjing Zhu Thu, 25 May 2023 14:30:01 +0000 + console-setup (1.221) unstable; urgency=medium * Team upload. @@ -54,6 +228,105 @@ -- Holger Wansing Tue, 14 Mar 2023 21:19:40 +0100 +console-setup (1.217ubuntu3) lunar; urgency=medium + + * Rebuild against latest xkeyboard-config + + -- Jeremy Bicha Thu, 23 Feb 2023 20:24:27 -0500 + +console-setup (1.217ubuntu2) lunar; urgency=medium + + * Make Keyboard/keymaptree executable again. + + -- Matthias Klose Sat, 18 Feb 2023 14:15:56 +0100 + +console-setup (1.217ubuntu1) lunar; urgency=medium + + * Merge with Debian; 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. + - Change the default font from Fixed to VGA for Lat15; while it's not + entirely complete, it looks better and is largely good enough. + - 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: 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. + - debian/control: we also need xkb-data-i18n as a Build-Depends-Indep to + build a complete set of translated keyboard layout/variant names. + - 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 layout for Kurdish to tr(ku). + - Set default for Dutch to us(intl), not just us. + - Set default layout for Vietnam to 'us'. + - 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. + - Fix command injection in ckbcomp. + - Generate a locale locally for translating keyboard names in + kbdnames-maker. + - Keyboard/Makefile: make sure KeyboardNames.pl is built with accurate data + from xkb-data. + - xmlreader, KeyboardNames.pl: Added model entry to skip model selection. + - Make sure we give a meaningful name to ch layouts: "Switzerland" instead + of "German (Switzerland), since it includes French too. + - 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. + - debian/control: Build depend on keymapper + - debian/keyboard-configuration.config: + - change back the french default layout to be fr+oss and not fr+latin9 + the change was dropped by error in a previous merge + - 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. + + -- Matthias Klose Sat, 18 Feb 2023 12:23:05 +0100 + console-setup (1.217) unstable; urgency=medium [ Updated translations ] @@ -130,6 +403,93 @@ -- Samuel Thibault Tue, 18 Oct 2022 17:14:22 +0200 +console-setup (1.210ubuntu1) kinetic; urgency=medium + + * Merge with Debian; 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. + - Change the default font from Fixed to VGA for Lat15; while it's not + entirely complete, it looks better and is largely good enough. + - 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: 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. + - debian/control: we also need xkb-data-i18n as a Build-Depends-Indep to + build a complete set of translated keyboard layout/variant names. + - 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 layout for Kurdish to tr(ku). + - Set default for Dutch to us(intl), not just us. + - Set default layout for Vietnam to 'us'. + - 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. + - Fix command injection in ckbcomp. + - Generate a locale locally for translating keyboard names in + kbdnames-maker. + - Keyboard/Makefile: make sure KeyboardNames.pl is built with accurate data + from xkb-data. + - xmlreader, KeyboardNames.pl: Added model entry to skip model selection. + - Make sure we give a meaningful name to ch layouts: "Switzerland" instead + of "German (Switzerland), since it includes French too. + - 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. + - debian/control: Build depend on keymapper + - debian/keyboard-configuration.config: + - change back the french default layout to be fr+oss and not fr+latin9 + the change was dropped by error in a previous merge + - 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. + + -- Matthias Klose Thu, 25 Aug 2022 10:25:03 +0200 + console-setup (1.210) unstable; urgency=medium * Team upload. @@ -213,6 +573,109 @@ -- Samuel Thibault Sun, 31 Oct 2021 18:13:37 +0100 +console-setup (1.205ubuntu3) jammy; urgency=medium + + * Keyboard/kbdcompiler: + - backport a build fix from Debian + + -- Sebastien Bacher Mon, 22 Nov 2021 17:39:53 +0100 + +console-setup (1.205ubuntu2) jammy; urgency=medium + + * debian/preprocessor: + - backport Debian change to use mktemp instead of tempfile, should fix + the ubiquity build + + -- Sebastien Bacher Mon, 22 Nov 2021 17:17:37 +0100 + +console-setup (1.205ubuntu1) impish; urgency=low + + [ Łukasz 'sil2100' Zemczak ] + * Merge from Debian unstable. 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. + - Change the default font from Fixed to VGA for Lat15; while it's not + entirely complete, it looks better and is largely good enough. + - 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: 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. + - debian/control: we also need xkb-data-i18n as a Build-Depends-Indep to + build a complete set of translated keyboard layout/variant names. + - 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 layout for Kurdish to tr(ku). + - Set default for Dutch to us(intl), not just us. + - Set default layout for Vietnam to 'us'. + - 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. + - Fix command injection in ckbcomp. + - Generate a locale locally for translating keyboard names in + kbdnames-maker. + - Keyboard/Makefile: make sure KeyboardNames.pl is built with accurate data + from xkb-data. + - xmlreader, KeyboardNames.pl: Added model entry to skip model selection. + - Make sure we give a meaningful name to ch layouts: "Switzerland" instead + of "German (Switzerland), since it includes French too. + - 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. + - debian/control: Build depend on keymapper + - debian/keyboard-configuration.config: + - change back the french default layout to be fr+oss and not fr+latin9 + the change was dropped by error in a previous merge + - 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. + + -- Łukasz 'sil2100' Zemczak Wed, 11 Aug 2021 16:40:34 +0200 + console-setup (1.205) unstable; urgency=medium * Team upload. @@ -256,6 +719,99 @@ -- Holger Wansing Sat, 20 Mar 2021 21:54:30 +0100 +console-setup (1.201ubuntu2) hirsute; urgency=medium + + * Stop building the udeb on request. + + -- Łukasz 'sil2100' Zemczak Mon, 22 Feb 2021 14:28:53 +0100 + +console-setup (1.201ubuntu1) hirsute; urgency=low + + * Merge from Debian unstable. 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. + - Change the default font from Fixed to VGA for Lat15; while it's not + entirely complete, it looks better and is largely good enough. + - 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: 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. + - debian/control: we also need xkb-data-i18n as a Build-Depends-Indep to + build a complete set of translated keyboard layout/variant names. + - 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 layout for Kurdish to tr(ku). + - Set default for Dutch to us(intl), not just us. + - Set default layout for Vietnam to 'us'. + - 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. + - Fix command injection in ckbcomp. + - Generate a locale locally for translating keyboard names in + kbdnames-maker. + - Keyboard/Makefile: make sure KeyboardNames.pl is built with accurate data + from xkb-data. + - xmlreader, KeyboardNames.pl: Added model entry to skip model selection. + - Make sure we give a meaningful name to ch layouts: "Switzerland" instead + of "German (Switzerland), since it includes French too. + - 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. + - debian/control: Build depend on keymapper + - debian/keyboard-configuration.config: + - change back the french default layout to be fr+oss and not fr+latin9 + the change was dropped by error in a previous merge + - 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. + + -- Łukasz 'sil2100' Zemczak Mon, 22 Feb 2021 13:10:01 +0100 + console-setup (1.201) unstable; urgency=medium * Team upload. @@ -322,6 +878,93 @@ -- Cyril Brulebois Tue, 01 Dec 2020 02:02:30 +0100 +console-setup (1.198ubuntu1) hirsute; urgency=low + + * Merge from Debian unstable. 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. + - Change the default font from Fixed to VGA for Lat15; while it's not + entirely complete, it looks better and is largely good enough. + - 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: 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. + - debian/control: we also need xkb-data-i18n as a Build-Depends-Indep to + build a complete set of translated keyboard layout/variant names. + - 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 layout for Kurdish to tr(ku). + - Set default for Dutch to us(intl), not just us. + - Set default layout for Vietnam to 'us'. + - 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. + - Fix command injection in ckbcomp. + - Generate a locale locally for translating keyboard names in + kbdnames-maker. + - Keyboard/Makefile: make sure KeyboardNames.pl is built with accurate data + from xkb-data. + - xmlreader, KeyboardNames.pl: Added model entry to skip model selection. + - Make sure we give a meaningful name to ch layouts: "Switzerland" instead + of "German (Switzerland), since it includes French too. + - 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. + - debian/control: Build depend on keymapper + - debian/keyboard-configuration.config: + - change back the french default layout to be fr+oss and not fr+latin9 + the change was dropped by error in a previous merge + - 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. + + -- Łukasz 'sil2100' Zemczak Mon, 09 Nov 2020 16:03:40 +0100 + console-setup (1.198) unstable; urgency=medium * Team upload @@ -406,6 +1049,102 @@ -- Holger Wansing Sun, 12 Jul 2020 20:23:26 +0200 +console-setup (1.195ubuntu2) groovy; urgency=medium + + * 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. LP: #1880266 + + -- Dimitri John Ledkov Sat, 23 May 2020 04:58:43 +0100 + +console-setup (1.195ubuntu1) groovy; urgency=low + + * Merge from Debian unstable. 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. + - Change the default font from Fixed to VGA for Lat15; while it's not + entirely complete, it looks better and is largely good enough. + - 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: 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. + - debian/control: we also need xkb-data-i18n as a Build-Depends-Indep to + build a complete set of translated keyboard layout/variant names. + - 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 layout for Kurdish to tr(ku). + - Set default for Dutch to us(intl), not just us. + - Set default layout for Vietnam to 'us'. + - 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. + - Fix command injection in ckbcomp. + - Generate a locale locally for translating keyboard names in + kbdnames-maker. + - Keyboard/Makefile: make sure KeyboardNames.pl is built with accurate data + from xkb-data. + - xmlreader, KeyboardNames.pl: Added model entry to skip model selection. + - Make sure we give a meaningful name to ch layouts: "Switzerland" instead + of "German (Switzerland), since it includes French too. + - 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. + - debian/control: Build depend on keymapper + - debian/keyboard-configuration.config: + - change back the french default layout to be fr+oss and not fr+latin9 + the change was dropped by error in a previous merge + * Dropped changes, included in Debian: + - keyboard-configuration.config: + replace not intuitive second lt(us) layout with us(altgr-intl), + which contains Euro (€) and other symbols, often used in Lithuania. + + -- Steve Langasek Wed, 20 May 2020 17:17:51 -0700 + console-setup (1.195) unstable; urgency=medium [ Mantas Kriaučiūnas ] @@ -420,6 +1159,107 @@ -- Dimitri John Ledkov Thu, 26 Mar 2020 13:34:12 +0000 +console-setup (1.194ubuntu3) focal; urgency=medium + + [ Mantas Kriaučiūnas ] + * keyboard-configuration.config:: + replace not intuitive second lt(us) layout with us(altgr-intl), + which contains Euro (€) and other symbols, often used in Lithuania. + (lp: #1863001) + + -- Sebastien Bacher Fri, 27 Mar 2020 11:10:06 +0100 + +console-setup (1.194ubuntu2) focal; urgency=medium + + * debian/keyboard-configuration.config: + - change back the french default layout to be fr+oss and not fr+latin9 + the change was dropped by error in a previous merge + + -- Sebastien Bacher Thu, 05 Dec 2019 15:09:57 +0100 + +console-setup (1.194ubuntu1) focal; urgency=medium + + * Merge from Debian unstable. 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. + - Change the default font from Fixed to VGA for Lat15; while it's not + entirely complete, it looks better and is largely good enough. + - 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: 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. + - debian/control: we also need xkb-data-i18n as a Build-Depends-Indep to + build a complete set of translated keyboard layout/variant names. + - 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 layout for Kurdish to tr(ku). + - Set default for Dutch to us(intl), not just us. + - Set default layout for Vietnam to 'us'. + - 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. + - Fix command injection in ckbcomp. + - Generate a locale locally for translating keyboard names in + kbdnames-maker. + - Keyboard/Makefile: make sure KeyboardNames.pl is built with accurate data + from xkb-data. + - xmlreader, KeyboardNames.pl: Added model entry to skip model selection. + - Make sure we give a meaningful name to ch layouts: "Switzerland" instead + of "German (Switzerland), since it includes French too. + - 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. + * Dropped changes: + - kbdnames-maker: Call `{bind,}textdomain` after switching locale. + * debian/control: Build depend on keymapper + + -- Balint Reczey Wed, 27 Nov 2019 15:34:42 +0100 + console-setup (1.194) unstable; urgency=medium * Team upload @@ -453,6 +1293,109 @@ -- Cyril Brulebois Thu, 04 Jul 2019 17:41:47 +0200 +console-setup (1.191ubuntu3) eoan; urgency=medium + + * No change rebuild to include all previous changes + + -- Balint Reczey Tue, 23 Apr 2019 13:38:57 +0200 + +console-setup (1.191ubuntu2) eoan; urgency=medium + + * Call setupcon --force only when debian-installer is active + and always redirect output to /dev/null to not block. (LP: #520546) + + -- Balint Reczey Tue, 23 Apr 2019 13:08:17 +0200 + +console-setup (1.191ubuntu1) eoan; urgency=low + + * Merge from Debian unstable. 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. + - Change the default font from Fixed to VGA for Lat15; while it's not + entirely complete, it looks better and is largely good enough. + - 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: 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. + - debian/control: we also need xkb-data-i18n as a Build-Depends-Indep to + build a complete set of translated keyboard layout/variant names. + - 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 layout for Kurdish to tr(ku). + - Set default for Dutch to us(intl), not just us. + - Set default layout for Vietnam to 'us'. + - 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. + - Fix command injection in ckbcomp. + - Generate a locale locally for translating keyboard names in + kbdnames-maker. + - kbdnames-maker: Call `{bind,}textdomain` after switching locale. + - Keyboard/Makefile: make sure KeyboardNames.pl is built with accurate data + from xkb-data. + - xmlreader, KeyboardNames.pl: Added model entry to skip model selection. + - Make sure we give a meaningful name to ch layouts: "Switzerland" instead + of "German (Switzerland), since it includes French too. + - 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. + * Dropped changes: + - drop handling of obsolete upstart jobs, not needed post-18.04. + - drop breaks/replaces on ancient keyboard-configuration package. + - keyboard-configuration.config: drop layout migration code, which + definitely predates bionic. + * debian/console-setup.initramfs-top: only ever initialize /dev/tty1. We + do not ever use more than 1 VT in the initramfs, and we reinitialize + anyway from the rootfs so this saves us no time (and in fact wastes a + lot of time in some configurations). LP: #1823327. + + -- Steve Langasek Mon, 22 Apr 2019 07:27:25 -0700 + console-setup (1.191) unstable; urgency=medium * Team upload @@ -636,6 +1579,184 @@ -- Christian Perrier Mon, 12 Mar 2018 19:12:28 +0100 +console-setup (1.178ubuntu12) disco; urgency=medium + + * setupcon: use /run for tempfiles (and dump the various unnecessary + fallback paths), since /run is always mountable rw at least as early as + /tmp is and is guaranteed to be safe from tmpcleaners at boot. Only keep + /tmp as a fallback in case we have access to write to /tmp and to a + console, but not to /run. LP: #1824227. + + -- Steve Langasek Wed, 10 Apr 2019 12:51:56 -0700 + +console-setup (1.178ubuntu11) disco; urgency=medium + + * kbdnames-maker: Call `{bind,}textdomain` after switching locale. + There's a change in perl 5.28 to use `uselocale()` & friends instead of + gettext directly, to support thread safety. Apparently this causes the + results of `gettext()` calls to be cached now where they weren't before, + and this breaks our keyboard name generation. For example, we have + `en_GB*model*sun_type6_jp*Sun Type 6 (Japonesa)` instead of + `en_GB*model*sun_type6_jp*Sun Type 6 (Japanese)`, and many many other + examples. Calling `bindtextdomain()` and then `textdomain()` after + changing locale causes the cache to be invalidated and we get correct + results again. LP: #1817453 + + -- Iain Lane Fri, 15 Mar 2019 12:34:06 +0000 + +console-setup (1.178ubuntu10) disco; urgency=medium + + * No-change rebuild to pick up any new keyboard data. Resolves crash + in Ubiquity KDE front end on non English language selection. (LP: #1810647) + + -- Rik Mills Wed, 23 Jan 2019 07:34:00 +0000 + +console-setup (1.178ubuntu9) cosmic; urgency=medium + + * keyboard-configuration.config: Fix exit/return thinko (LP: #1788597) + + -- Adam Conrad Thu, 23 Aug 2018 16:32:45 -0600 + +console-setup (1.178ubuntu8) cosmic; urgency=medium + + * keyboard-configuration.config: Only treat missing XKBOPTIONS as empty. + + -- Adam Conrad Wed, 08 Aug 2018 17:32:23 -0600 + +console-setup (1.178ubuntu7) cosmic; urgency=medium + + * keyboard-configuration.config: While sourcing config files to re-seed + debconf, load missing variables as empty values of same (LP: #1762952) + + -- Adam Conrad Wed, 08 Aug 2018 16:50:48 -0600 + +console-setup (1.178ubuntu6) cosmic; urgency=medium + + * 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 (LP: #1762952) + + -- Adam Conrad Wed, 25 Jul 2018 05:50:59 -0600 + +console-setup (1.178ubuntu5) cosmic; urgency=medium + + * Revert to 1.178ubuntu2, as 1.178ubuntu[34] caused an installer regression. + + -- Adam Conrad Tue, 24 Jul 2018 19:34:59 -0600 + +console-setup (1.178ubuntu4) cosmic; urgency=medium + + * debian/console-setup-udeb.postinst: Guard the dpkg call in the postinst, + so it isn't attempted in the debian-installer environment (LP: #1782835) + + -- Adam Conrad Fri, 20 Jul 2018 14:22:45 -0600 + +console-setup (1.178ubuntu3) cosmic; urgency=medium + + * debian/keyboard-configuration.postinst: + - Don't change /etc/default/keyboard at package upgrades on + desktops, since it may conflict with how desktops deal with + keyboard configuration (LP: #1762952). + + -- Gunnar Hjalmarsson Tue, 15 May 2018 01:12:00 +0200 + +console-setup (1.178ubuntu2) bionic; urgency=medium + + * 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. + (LP: #1758647) + + -- Łukasz 'sil2100' Zemczak Thu, 19 Apr 2018 08:53:32 +0200 + +console-setup (1.178ubuntu1) bionic; urgency=low + + * Merge from Debian unstable. Remaining changes: + - 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. + - Change the default font from Fixed to VGA for Lat15; while it's not + entirely complete, it looks better and is largely good enough. + - 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: use Ubuntu's virtual terminal color + scheme by default, with a VGA color scheme available as an alternative. + - Don't copy keyboard-configuration questions to /target in OEM mode. + oem-config will ask them later, and copying these confuses it. + - Tolerate absence of setupcon in postinst scripts. + - Added templates for keyboard detection. + - 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. + - Fix default keyboard selection for language/country combinations + lacking a proper combined locale. + - Map ppc64el/* to XKBMODEL=pc105. + - 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. + - Don't make debian/copyright a symlink to COPYRIGHT, this is disallowed + by the Ubuntu archive installer. + - Include pc105.tree for ubiquity; make sure it gets built. + - Add Keyboard/Makefile rule to build pc105.tree. + - Fix command injection in ckbcomp. + - Generate a locale locally for translating keyboard names in + kbdnames-maker. + - xmlreader, KeyboardNames.pl: Added model entry to skip model selection. + - setupcon: + - 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. + - Map XKBMODEL=SKIP to '' for compatibility with existing + configs. + - Explicitly exit 0, so that postinsts don't fail in the event that + loadkeys can't find a console. + - Handle unattended upgrades without breaking plymouth when updating + console fonts. + - 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 sure we give a meaningful name to ch layouts: "Switzerland" instead + of "German (Switzerland), since it includes French too. + - Add console-setup-tty and the udev rule that uses it to set Unicode, font, + and keyboard mode at early boot. + - Keyboard/Makefile: make sure KeyboardNames.pl is built with accurate data + from xkb-data. + - Don't cat over the keymaps; they're already moved to the right place. + - debian/console-setup.postinst: Replace the checking of fgconsole in [1-6] + with checking if fgconsole is a tty according to logind. The previous + assumption was that a graphical environment would be on vt7, which isn't + true with gnome-shell any more. + - debian/console-setup.postinst, debian/keyboard-configuration.postinst: + Don't call setupcon --force -k any more - it breaks wayland sessions. + (LP: #1710637) + - debian/control: drop console-setup-freebsd: we don't keep it around since + it's uninstallable because vidcontrol/kbdcontrol. + - debian/keyboard-configuration.config: re-lower the priority for the layout + question that got garbled in the merge. + - Don't use console-setup-tty or its udev rule. This dates back to lucid and + now systemd is apparently able to handle this correctly. It's now actively + breaking graphical sessions. (LP: #1710637) + - debian/control: we also need xkb-data-i18n as a Build-Depends-Indep to + build a complete set of translated keyboard layout/variant names. + - Drop dependency from console-setup to initramfs-tools | + linux-initramfs-tool; this was a versioned dependency used for upgrades, + now long obsolete. + * Fix previous patches: + - Correctly setup console in initramfs again (LP: #1719612) + - Make COPYRIGHT a symlink to debian/copyright, and keep various + other symlinks in place that were dropped in earlier uploads. + - Do some extra work to disable kfreebsd, dh was complaining about + unknown packages and failing. + - debian/clean: Delete Keyboard/tree-keymaps/ on clean + + -- Julian Andres Klode Mon, 19 Feb 2018 09:29:02 +0100 + console-setup (1.178) unstable; urgency=medium [ Updated translations ] @@ -735,6 +1856,122 @@ -- Christian Perrier Fri, 15 Sep 2017 06:16:35 +0200 +console-setup (1.166ubuntu7) artful; urgency=medium + + * Drop dependency from console-setup to initramfs-tools | + linux-initramfs-tool; this was a versioned dependency used for upgrades, + now long obsolete. + + -- Steve Langasek Thu, 05 Oct 2017 12:04:08 -0700 + +console-setup (1.166ubuntu6) artful; urgency=medium + + * debian/control: we also need xkb-data-i18n as a Build-Depends-Indep to + build a complete set of translated keyboard layout/variant names. + + -- Mathieu Trudel-Lapierre Thu, 28 Sep 2017 17:46:56 -0400 + +console-setup (1.166ubuntu5) artful; urgency=medium + + * Don't use console-setup-tty or its udev rule. This dates back to lucid and + now systemd is apparently able to handle this correctly. It's now actively + breaking graphical sessions. (LP: #1710637) + + -- Mathieu Trudel-Lapierre Mon, 18 Sep 2017 16:36:50 -0400 + +console-setup (1.166ubuntu4) artful; urgency=medium + + * Keyboard/Makefile: Add a rule to make KeyboardNames.pl, needed by ubiquity + (see Debian Bug#874474) + + -- Iain Lane Wed, 06 Sep 2017 13:39:01 +0100 + +console-setup (1.166ubuntu3) artful; urgency=medium + + * debian/keyboard-configuration.config: re-lower the priority for the layout + question that got garbled in the merge. + + -- Mathieu Trudel-Lapierre Tue, 05 Sep 2017 14:58:49 -0400 + +console-setup (1.166ubuntu2) artful; urgency=medium + + * debian/control: drop console-setup-freebsd: we don't keep it around since + it's uninstallable because vidcontrol/kbdcontrol. + + -- Mathieu Trudel-Lapierre Wed, 23 Aug 2017 19:06:27 -0400 + +console-setup (1.166ubuntu1) artful; urgency=medium + + [ Mathieu Trudel-Lapierre ] + * Merge from Debian unstable; remaining changes: + - 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. + - Change the default font from Fixed to VGA for Lat15; while it's not + entirely complete, it looks better and is largely good enough. + - 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: use Ubuntu's virtual terminal color + scheme by default, with a VGA color scheme available as an alternative. + - Don't copy keyboard-configuration questions to /target in OEM mode. + oem-config will ask them later, and copying these confuses it. + - Tolerate absence of setupcon in postinst scripts. + - Added templates for keyboard detection. + - 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. + - Fix default keyboard selection for language/country combinations + lacking a proper combined locale. + - Map ppc64el/* to XKBMODEL=pc105. + - 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. + - Don't make debian/copyright a symlink to COPYRIGHT, this is disallowed + by the Ubuntu archive installer. + - Include pc105.tree for ubiquity; make sure it gets built. + - Add Keyboard/Makefile rule to build pc105.tree. + - Fix command injection in ckbcomp. + - Generate a locale locally for translating keyboard names in + kbdnames-maker. + - xmlreader, KeyboardNames.pl: Added model entry to skip model selection. + - setupcon: + - 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. + - Map XKBMODEL=SKIP to '' for compatibility with existing + configs. + - Explicitly exit 0, so that postinsts don't fail in the event that + loadkeys can't find a console. + - Handle unattended upgrades without breaking plymouth when updating + console fonts. + - 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 sure we give a meaningful name to ch layouts: "Switzerland" instead + of "German (Switzerland), since it includes French too. + - Add console-setup-tty and the udev rule that uses it to set Unicode, font, + and keyboard mode at early boot. + * Keyboard/Makefile: make sure KeyboardNames.pl is built with accurate data + from xkb-data. + * Don't cat over the keymaps; they're already moved to the right place. + + [ Iain Lane ] + * debian/console-setup.postinst: Replace the checking of fgconsole in [1-6] + with checking if fgconsole is a tty according to logind. The previous + assumption was that a graphical environment would be on vt7, which isn't + true with gnome-shell any more. + * debian/console-setup.postinst, debian/keyboard-configuration.postinst: + Don't call setupcon --force -k any more - it breaks wayland sessions. + (LP: #1710637) + + -- Mathieu Trudel-Lapierre Thu, 10 Aug 2017 15:06:17 -0400 + console-setup (1.166) unstable; urgency=medium [ Updated translations ] @@ -942,6 +2179,209 @@ -- Christian Perrier Sun, 22 May 2016 08:47:29 +0200 +console-setup (1.142ubuntu8) artful; urgency=medium + + * Drop upstart system jobs. + + -- Dimitri John Ledkov Mon, 21 Aug 2017 16:15:49 +0100 + +console-setup (1.142ubuntu7) artful; urgency=medium + + * Do the same as ubuntu6 in Keyboard/compose_translator too. + * Cherry-pick b887014dc243d3966bbb6bda975803798df7c33f from Samuel Thibaut + and 6800af170ff5017b67b7e0b85b61a6176eb56361 from Gregor Hermann, as well + as fixing Keyboard/kbdnames - perl doesn't look at `.' any more. + + -- Iain Lane Mon, 21 Aug 2017 10:48:31 +0100 + +console-setup (1.142ubuntu6) artful; urgency=medium + + * Use pragma utf8 instead of the deprecated encoding pragma. Shamelessly + copied from Debian's 1.143 change by Anton Zinoviev. + + -- Mathieu Trudel-Lapierre Fri, 04 Aug 2017 15:23:53 -0400 + +console-setup (1.142ubuntu5) yakkety; urgency=medium + + * debian/console-setup-linux.setvtrgb.service: add condition to only + execute when /dev/tty0 exists. This is the same condition as used by + getty@.service unit to prevent attempting setting up VT when none are + present. This is a common case on serial only architectures and + virtual machines. Resolves degraded boots on s390x/ppc64el. + + -- Dimitri John Ledkov Mon, 26 Sep 2016 13:31:08 +0100 + +console-setup (1.142ubuntu4) yakkety; urgency=medium + + * debian/keyboard-configuration.postinst: we shouldn't fail if + dpkg-maintscript-helpers can't figure out the package for removal of + console-setup and keyboard-setup init scripts -- in ubiquity we won't have + the outer checked directory /lib/debian-installer.d; and we won't have any + files to remove on account of likely being a new install. (LP: #1578285) + + -- Mathieu Trudel-Lapierre Wed, 08 Jun 2016 14:39:12 -0400 + +console-setup (1.142ubuntu3) yakkety; urgency=medium + + * Replace initscripts dependency with init-system-helpers (>= 1.29~), to + allow dropping initscripts at some point. (Closes: #804988) + + -- Martin Pitt Mon, 30 May 2016 08:15:32 +0200 + +console-setup (1.142ubuntu2) yakkety; urgency=medium + + * Unbreak my last console-setup upload: + - debian/control: We want the locales package, not locales-all. + - Use keymapper to generate decision trees for a restricted subset of + the pc105 model. + * debian/rules: enable the setvtrgb.service correctly. + * debian/rules: remove keyboard-configuration trying to install console-setup + since it's now in console-setup. + * debian/keyboard-configuration.links: removed. + * debian/control: fix Breaks/Replaces so the initscript move to the + console-setup-linux package from keyboard-configuration goes smoothly. + + -- Mathieu Trudel-Lapierre Fri, 29 Apr 2016 23:38:34 -0400 + +console-setup (1.142ubuntu1) yakkety; urgency=medium + + * Merge from Debian unstable; remaining changes: + - Don't gzip font or ACM files in /etc/console-setup/. The space saving + is negligible, and it's more efficient not to need to uncompress them + at boot time. + - Include pc105.tree for ubiquity. + - Set keymap and font in the initramfs if possible and sensible. + - Add an apport hook. + - Depend on kbd (>= 1.15-1ubuntu3) for a valuable loadkeys improvement. + - Include support for translated keyboard names. + - Depend on debconf instead of pre-depending, because pre-depends have + no effect on config scripts. + - debian/vtrgb, debian/vtrgb.vga, + debian/console-setup-linux.setvtrgb.upstart, debian/rules, + debian/console-setup-linux.postinst: use Ubuntu's virtual terminal color + scheme by default, with a VGA color scheme available as an alternative. + - Make setupcon explicitly exit 0, so that postinsts don't fail in the + event that loadkeys can't find a console. + - Generate a locale locally for translating keyboard names in + kbdnames-maker. + - Don't copy keyboard-configuration questions to /target in OEM mode. + oem-config will ask them later, and copying these confuses it. + - Change the default font from Fixed to VGA for Lat15; while it's not + entirely complete, it looks better and is largely good enough. + - 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. + - Fix default keyboard selection for language/country combinations + lacking a proper combined locale. + - Drop the layout/variant priority to high on fresh installs. + - Set default for Dutch to us(intl), not just us. + - Set default layout for Vietnam to 'us'. + - Set default variant for French to oss. + - Set default layout for Simplified Chinese to 'cn'. + - Don't use the default keyboard variant if the layout is overridden by + preseeding. + - If keyboard-configuration/layoutcode is preseeded but not marked as + seen, then set the default layout but don't lower the layout question + priority or preseed console-setup/ask_detect. + - Use the default keyboard model if an existing configuration file sets + XKBMODEL="". + - Go back to always asking layout before variant. + - Fix keyboard layout detection to set the layout properly. + - Reset keyboard-configuration/toggle to the default if it's set to "No + toggling" and you select a non-Latin layout. + - Automatically save the font and keymap to /etc in + /etc/init.d/console-setup if it isn't being run from init. Similarly, + ensure that the font and keymap are saved to /etc during initial + installation. + - Load the new keyboard configuration immediately when running + 'dpkg-reconfigure keyboard-configuration' in an installed system. + - Don't fail to configure keyboard-configuration if setxkbmap fails to + talk to the X display. + - Tolerate absence of setupcon in keyboard-configuration.postinst. + - Drop the simplified keyboard-configuration/xkb-keymap question. + - Fix command injection in ckbcomp. + - debian/console-setup.console-font.upstart: Add Upstart job that sets up + console font when plymouth-splash is starting. + - Override description of the ch layout from "German (Switzerland)" to + just "Switzerland". + - Map ppc64el/* to XKBMODEL=pc105. + - setupcon: Map XKBMODEL=SKIP to '' for compatibility with existing + configs. + - 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. + - setupcon: revert ridiculous upstream twiddling of keymap cache filenames: + - 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. + - Move vtrgb handling to console-setup-linux package, since this is clearly + Linux-specific. + - Add missing console-setup-linux.prerm to remove /etc/vtrgb alternatives + - Keyboard/kbdcompiler: fix bug in filtering of unsupported variants that + breaks generation of the pc105.tree for d-i keyboard detection. + - debian/keyboard-configuration.postinst: udpkg is not part of an installed + Debian system; don't fail to configure if it's absent and the script is + called outside of an installer context. + - Don't make debian/copyright a symlink to COPYRIGHT, this is disallowed + by the Ubuntu archive installer. + - debian/keyboard-configuration.config: fix typo in model check for SKIP; + even when looking up the layout/variant, we need to check for the model + as XKBMODEL, since $model doesn't exist. + - 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. + - Properly handle settings CODESET and FONSIZE when they equals 'guess' or + are unset. + - keyboard_present.sh: Quiet config/postinst when we have no USB devices. + - debian/keyboard-configuration.config: run grep with -a (to deal with files + as ASCII data) when searching for keyboard, locale, and layout names. + - Add ConditionPathExists=/dev/tty0 to the console-setup.service, to + avoid running the unit on platforms without virtual consoles + - debian/rules: Drop obsolete and no-op dh_installinit --upstart-only + option. + - Add debian/keyboard-configuration.links to (statically) enable + console-setup.service. It is not being pulled in by plymouth any more, and + doing so was brittle and unexpected. + - console-setup.service: Set RemainAfterExit. + - 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. + - debian/control: allow dracut to be installable by adding an alternate + depends on linux-initramfs-tool for console-setup. + - Reinstate checking for XKBLAYOUT being in the config file: this handles + the cases where installs done with ubiquity don't have their debconf seen + flag set for model/layout questions. If layout is already configure, lower + the corresponding question's priority to medium so we don't ask it again. + - Add systemd unit for console-setup. That avoids waiting for $remote_fs + during early boot. (Note: there is no need to enable it, it gets pulled + in through systemd-vconsole-setup.service) + - Drop console-setup-freebsd; it's useless and uninstallable given that we + don't have a freebsd port. + - Make debian/keyboard-configuration.console-setup.init do the same as the + corresponding .upstart: I. e. just call loadkeys instead of setupcon, and + don't check the current console. (Font loading is already done via udev + rules). + * Dropped changes, included in Debian: + - Stop running debconf-updatepo on clean. + - Update for new layouts and variants for Montenegro and Serbia, and + migrate configuration files from the old layouts. + * Dropped changes, no longer needed: + - Move boot tasks to a combination of two udev rules and a single + Upstart job, ensuring that they're run at points when we are able to + satisfy the constraints on the relevant ioctls. + - Replace usplash detection code with Plymouth detection code. + - Use keymapper to generate decision trees for a restricted subset of + the pc105 model. + * debian/console-setup-linux.setvtrgb.service: port our vtrgb upstart job to + a systemd unit service so we can again apply the right color scheme. + * Fonts/Makefile: sort BDFS_TO_DOUBLE; this will avoid unnecessary delta + showing on every upload just because the fonts are not in the same order. + + -- Mathieu Trudel-Lapierre Fri, 29 Apr 2016 11:36:58 -0400 + console-setup (1.142) unstable; urgency=medium [ Updated translations ] @@ -1303,6 +2743,253 @@ -- Christian Perrier Sat, 26 Jul 2014 08:52:31 +0200 +console-setup (1.108ubuntu15) xenial; urgency=medium + + * Properly handle settings CODESET and FONSIZE when they equals 'guess' or are unset. + - console-setup-tty, debian/console-setup.initramfs-hook, + debian/console-setup.initramfs-top + (LP: #1565542) + + -- Evgeniy Yanyuk Tue, 19 Apr 2016 15:22:17 -0400 + +console-setup (1.108ubuntu14) xenial; urgency=medium + + * keyboard_present.sh: Quiet config/postinst when we have no USB devices. + + -- Adam Conrad Tue, 12 Apr 2016 13:15:05 -0600 + +console-setup (1.108ubuntu13) xenial; urgency=medium + + * debian/keyboard-configuration.config: run grep with -a (to deal with files + as ASCII data) when searching for keyboard, locale, and layout names. + (LP: #1549529) + + -- Mathieu Trudel-Lapierre Mon, 04 Apr 2016 13:47:04 -0400 + +console-setup (1.108ubuntu12) xenial; urgency=medium + + * No-change rebuild to properly generate console-setup-udeb's list of + valid keyboard layouts and variants. + + -- Mathieu Trudel-Lapierre Thu, 24 Mar 2016 10:50:39 -0400 + +console-setup (1.108ubuntu11) xenial; urgency=medium + + * Add ConditionPathExists=/dev/tty0 to the console-setup.service, to + avoid running the unit on platforms without virtual consoles, + e.g. s390x. LP: #1552733 + + -- Dimitri John Ledkov Thu, 03 Mar 2016 14:41:05 +0000 + +console-setup (1.108ubuntu10) xenial; urgency=medium + + * debian/rules: Drop obsolete and no-op dh_installinit --upstart-only + option. (LP: #1519228) + * Add debian/keyboard-configuration.links to (statically) enable + console-setup.service. It is not being pulled in by plymouth any more, and + doing so was brittle and unexpected. (LP: #1531442) + * console-setup.service: Set RemainAfterExit. + + -- Martin Pitt Mon, 11 Jan 2016 15:02:09 +0100 + +console-setup (1.108ubuntu9) wily; urgency=medium + + * Cherry-pick fix from git for udpkg/Hurd noise in keyboard-configuration. + + -- Adam Conrad Tue, 20 Oct 2015 12:51:36 +0100 + +console-setup (1.108ubuntu8) wily; urgency=medium + + * Properly handle setting XKBVARIANT when using keyboard detection. + (LP: #1506551) + + -- Mathieu Trudel-Lapierre Mon, 19 Oct 2015 11:13:01 +0100 + +console-setup (1.108ubuntu7) wily; urgency=medium + + * Fix incorrect versioning change from last upload; initramfs-tools + 0.85eubuntu12 looks wrong but was in fact correct. + * 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 (LP: #1484101). + + -- Colin Watson Fri, 02 Oct 2015 11:18:04 +0100 + +console-setup (1.108ubuntu6) wily; urgency=medium + + * debian/control: allow dracut to be installable by adding an alternate + depends on linux-initramfs-tool for console-setup. + + -- Mathieu Trudel-Lapierre Tue, 08 Sep 2015 22:36:52 -0400 + +console-setup (1.108ubuntu5) vivid; urgency=medium + + * Reinstate checking for XKBLAYOUT being in the config file: this handles + the cases where installs done with ubiquity don't have their debconf seen + flag set for model/layout questions. If layout is already configure, lower + the corresponding question's priority to medium so we don't ask it again. + (LP: #1446231) + + -- Mathieu Trudel-Lapierre Tue, 21 Apr 2015 17:19:21 -0400 + +console-setup (1.108ubuntu4) vivid; urgency=medium + + * Add systemd unit for console-setup. That avoids waiting for $remote_fs + during early boot. (Note: there is no need to enable it, it gets pulled + in through systemd-vconsole-setup.service) (LP: #1430280) + + -- Martin Pitt Wed, 11 Mar 2015 15:33:49 +0100 + +console-setup (1.108ubuntu3) vivid; urgency=medium + + * Drop console-setup-freebsd; it's useless and uninstallable given that we + don't have a freebsd port. + + -- Mathieu Trudel-Lapierre Tue, 03 Mar 2015 10:15:31 -0500 + +console-setup (1.108ubuntu2) vivid; urgency=medium + + * Fix the mess I made with the previous upload: + * Reinstate changelog entry from 1.70ubuntu10; the changes aren't necessary + as keyboard-configuration does get the translated names of keyboards. + * Reinstate changes from 1.70ubuntu11: + - Make debian/keyboard-configuration.console-setup.init do the same as the + corresponding .upstart: I. e. just call loadkeys instead of setupcon, and + don't check the current console. (Font loading is already done via udev + rules). + + -- Mathieu Trudel-Lapierre Mon, 02 Mar 2015 17:55:46 -0500 + +console-setup (1.108ubuntu1) vivid; urgency=medium + + [ Steve Langasek ] + * Merge from Debian unstable, remaining changes: (LP: #1426721) + - Don't gzip font or ACM files in /etc/console-setup/. The space saving + is negligible, and it's more efficient not to need to uncompress them + at boot time. + - Include pc105.tree for ubiquity. + - Move boot tasks to a combination of two udev rules and a single + Upstart job, ensuring that they're run at points when we are able to + satisfy the constraints on the relevant ioctls. + - Stop running debconf-updatepo on clean. + - Set keymap and font in the initramfs if possible and sensible. + - Add an apport hook. + - Use keymapper to generate decision trees for a restricted subset of + the pc105 model. + - Depend on kbd (>= 1.15-1ubuntu3) for a valuable loadkeys improvement. + - Include support for translated keyboard names. + - Depend on debconf instead of pre-depending, because pre-depends have + no effect on config scripts. + - debian/vtrgb, debian/vtrgb.vga, + debian/console-setup-linux.setvtrgb.upstart, debian/rules, + debian/console-setup-linux.postinst: use Ubuntu's virtual terminal color + scheme by default, with a VGA color scheme available as an alternative. + - Make setupcon explicitly exit 0, so that postinsts don't fail in the + event that loadkeys can't find a console. + - Update for new layouts and variants for Montenegro and Serbia, and + migrate configuration files from the old layouts. + - Generate a locale locally for translating keyboard names in + kbdnames-maker. + - Don't copy keyboard-configuration questions to /target in OEM mode. + oem-config will ask them later, and copying these confuses it. + - Change the default font from Fixed to VGA for Lat15; while it's not + entirely complete, it looks better and is largely good enough. + - 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. + - Fix default keyboard selection for language/country combinations + lacking a proper combined locale. + - Drop the layout/variant priority to high on fresh installs. + - Set default for Dutch to us(intl), not just us. + - Set default layout for Vietnam to 'us'. + - Set default variant for French to oss. + - Set default layout for Simplified Chinese to 'cn'. + - Don't use the default keyboard variant if the layout is overridden by + preseeding. + - If keyboard-configuration/layoutcode is preseeded but not marked as + seen, then set the default layout but don't lower the layout question + priority or preseed console-setup/ask_detect. + - Use the default keyboard model if an existing configuration file sets + XKBMODEL="". + - Go back to always asking layout before variant. + - Fix keyboard layout detection to set the layout properly. + - Reset keyboard-configuration/toggle to the default if it's set to "No + toggling" and you select a non-Latin layout. + - Automatically save the font and keymap to /etc in + /etc/init.d/console-setup if it isn't being run from init. Similarly, + ensure that the font and keymap are saved to /etc during initial + installation. + - Replace usplash detection code with Plymouth detection code. + - Load the new keyboard configuration immediately when running + 'dpkg-reconfigure keyboard-configuration' in an installed system. + - Don't fail to configure keyboard-configuration if setxkbmap fails to + talk to the X display. + - Tolerate absence of setupcon in keyboard-configuration.postinst. + - Drop the simplified keyboard-configuration/xkb-keymap question. + - Fix command injection in ckbcomp. + - debian/console-setup.console-font.upstart: Add Upstart job that sets up + console font when plymouth-splash is starting. + - Override description of the ch layout from "German (Switzerland)" to + just "Switzerland". + - Map ppc64el/* to XKBMODEL=pc105. + * Dropped changes, included in Debian: + - "Do not configure keyboard; keep kernel keymap" model option, + preseedable by keyboard-configuration/modelcode=SKIP: this is now + supported upstream with either "unknown" or an empty string as the + model. + - Run kbd_mode on each tty in ACTIVE_CONSOLES rather than on the current + tty, since the current tty might belong to X and changing X's tty out + of raw mode is a very bad idea. + - Include Terminus font in the compiled packages. Do not depend, but + conflict/provide/replace console-terminus. New upstream version of + the Terminus font (4.32). + - Explicitly build-depend on liblocale-gettext-perl for kbdnames-maker, + and likewise have keyboard-configuration depend on + liblocale-gettext-perl. + - Make keyboard-configuration replace old console-setup/console-setup-mini + versions as well as conflicting with them. + - Weaken test for whether /usr is mounted; testing for /usr/share is + sufficient, and fixes operation in d-i. + - Set default layout for Kurdish to tr(ku). + * Dropped changes, no longer needed: + - Cope with systems installed with console-setup-udeb (<< 1.53) (which + predates Ubuntu 12.04 and Debian wheezy). + - Drop ancient handling of an empty codeset in the config file. + - Drop vtrgb upgrade handling from natty + - Drop upstart job transition from lucid + * setupcon: Map XKBMODEL=SKIP to '' for compatibility with existing + configs. + * 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. + * setupcon: revert ridiculous upstream twiddling of keymap cache filenames: + - 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. + * Move vtrgb handling to console-setup-linux package, since this is clearly + Linux-specific. + * Add missing console-setup-linux.prerm to remove /etc/vtrgb alternatives + * Keyboard/kbdcompiler: fix bug in filtering of unsupported variants that + breaks generation of the pc105.tree for d-i keyboard detection. + * debian/keyboard-configuration.postinst: udpkg is not part of an installed + Debian system; don't fail to configure if it's absent and the script is + called outside of an installer context. + * Don't make debian/copyright a symlink to COPYRIGHT, this is disallowed + by the Ubuntu archive installer. + + [ Mathieu Trudel-Lapierre ] + * debian/keyboard-configuration.config: fix typo in model check for SKIP; + even when looking up the layout/variant, we need to check for the model + as XKBMODEL, since $model doesn't exist. + * 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. + + -- Mathieu Trudel-Lapierre Fri, 27 Feb 2015 16:36:52 -0500 + console-setup (1.108) unstable; urgency=low [ Updated translations ] @@ -1870,6 +3557,179 @@ -- Anton Zinoviev Mon, 21 Mar 2011 07:08:43 +0200 +console-setup (1.70ubuntu11) vivid; urgency=medium + + * Make debian/keyboard-configuration.console-setup.init do the same as the + corresponding .upstart: I. e. just call loadkeys instead of setupcon, and + don't check the current console. (Font loading is already done via udev + rules). (LP: #1400393) + + -- Martin Pitt Wed, 17 Dec 2014 07:55:34 +0100 + +console-setup (1.70ubuntu10) vivid; urgency=medium + + * Add all language-packs as build dependencies, to get translated names + of keyboard names in the DEBIAN/config of keyboard-setup package. + + -- Dimitri John Ledkov Sun, 30 Nov 2014 22:21:38 +0000 + +console-setup (1.70ubuntu9) utopic; urgency=high + + * No change rebuild against new dh_installinit, to call update-rc.d at + postinst. + + -- Dimitri John Ledkov Wed, 28 May 2014 10:39:17 +0100 + +console-setup (1.70ubuntu8) trusty; urgency=medium + + * Map ppc64el/* to XKBMODEL=pc105. + + -- Colin Watson Wed, 29 Jan 2014 13:14:53 +0000 + +console-setup (1.70ubuntu7) raring; urgency=low + + * Override description of the ch layout from "German (Switzerland)" to + just "Switzerland" (LP: #869825). + + -- Colin Watson Wed, 13 Mar 2013 16:35:47 +0000 + +console-setup (1.70ubuntu6) quantal; urgency=low + + * debian/console-setup.console-font.upstart: Add Upstart job that sets up + console font when plymouth-splash is starting, to work around a possible + udev/plymouth race that would otherwise prevent the font being set + (thanks, Ahmed El-Mahmoudy and Andrey Bondarenko; LP: #632382). + + -- Colin Watson Tue, 09 Oct 2012 01:50:48 +0100 + +console-setup (1.70ubuntu5) precise-proposed; urgency=low + + * Update Ubuntu-specific translations from Launchpad (LP: #985605). + + -- Colin Watson Thu, 19 Apr 2012 16:03:16 +0100 + +console-setup (1.70ubuntu4) precise; urgency=low + + * Add definitions for four (ignored) dead-keys: dead_belowcomma, + dead_currency, dead_doublegrave, and dead_invertedbreve. Cherrypick + from Debian git. + (LP: #738314) + * Fix command injection in ckbcomp (thanks to Emanuel Bronshtein) + (LP: #782705) + + -- Bryce Harrington Mon, 19 Mar 2012 21:13:39 -0700 + +console-setup (1.70ubuntu3) precise; urgency=low + + * No change rebuild for new xkb-data. (LP: #953328) + + -- Stéphane Graber Thu, 15 Mar 2012 11:48:58 -0400 + +console-setup (1.70ubuntu2) precise; urgency=low + + * Drop the simplified keyboard-configuration/xkb-keymap question; it + breaks existing preseeding, might confuse Ubiquity, and people are + already used to the layout/variant questions in Ubuntu (LP: #894187). + + -- Colin Watson Thu, 24 Nov 2011 15:05:27 +0000 + +console-setup (1.70ubuntu1) precise; urgency=low + + * Merge from Debian testing, remaining changes: + - Include Terminus font in the compiled packages. Do not depend, but + conflict/provide/replace console-terminus. New upstream version of + the Terminus font (4.32). + - Add a "Do not configure keyboard; keep kernel keymap" model option, + preseedable by keyboard-configuration/modelcode=SKIP. + - Use keymapper to generate decision trees for a restricted subset of + the pc105 model. + - Update for new layouts and variants for Montenegro and Serbia, and + migrate configuration files from the old layouts. + - Generate a locale locally for translating keyboard names in + kbdnames-maker. + - Move boot tasks to a combination of two udev rules and a single + Upstart job, ensuring that they're run at points when we are able to + satisfy the constraints on the relevant ioctls. + - Don't gzip font or ACM files in /etc/console-setup/. The space saving + is negligible, and it's more efficient not to need to uncompress them + at boot time. + - Don't copy keyboard-configuration questions to /target in OEM mode. + oem-config will ask them later, and copying these confuses it. + - Add an apport hook. + - Change the default font from Fixed to VGA for Lat15; while it's not + entirely complete, it looks better and is largely good enough. + - Set keymap and font in the initramfs if possible and sensible. + - Don't try to call update-rc.d if it doesn't exist, such as in d-i. + - debian/vtrgb, debian/vtrgb.vga, debian/console-setup.setvtrgb.upstart, + debian/rules, debian/console-setup.postinst: use Ubuntu's virtual + terminal color scheme by default, with a VGA color scheme available + as an alternative. + - Explicitly build-depend on liblocale-gettext-perl for kbdnames-maker, + and likewise have keyboard-configuration depend on + liblocale-gettext-perl. + - Depend on debconf instead of pre-depending, because pre-depends have + no effect on config scripts. + - Make keyboard-configuration replace old console-setup/console-setup-mini + versions as well as conflicting with them. + - Depend on kbd (>= 1.15-1ubuntu3) for a valuable loadkeys improvement. + - 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. + - Fix default keyboard selection for language/country combinations + lacking a proper combined locale. + - Drop the layout/variant priority to high on fresh installs. + - 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'. + - Set default variant for French to oss. + - Set default layout for Simplified Chinese to 'cn'. + - Don't use the default keyboard variant if the layout is overridden by + preseeding. + - If keyboard-configuration/layoutcode is preseeded but not marked as + seen, then set the default layout but don't lower the layout question + priority or preseed console-setup/ask_detect. + - Use the default keyboard model if an existing configuration file sets + XKBMODEL="". + - console-setup-udeb (<< 1.53) didn't set the seen flag in the installed + system. Cope with this and avoid asking the layout and variant + questions again if the default debconf priority is at least high. + (squeeze has >> 1.53, so this can be dropped after 12.04.) + - Go back to always asking layout before variant. + - Fix keyboard layout detection to set the layout properly. + - Reset keyboard-configuration/toggle to the default if it's set to "No + toggling" and you select a non-Latin layout. + - Automatically save the font and keymap to /etc in + /etc/init.d/console-setup if it isn't being run from init. Similarly, + ensure that the font and keymap are saved to /etc during initial + installation. + - Replace usplash detection code with Plymouth detection code. + - Load the new keyboard configuration immediately when running + 'dpkg-reconfigure keyboard-configuration' in an installed system. + - Don't fail to configure keyboard-configuration if setxkbmap fails to + talk to the X display. + - Tolerate absence of setupcon in keyboard-configuration.postinst. + - Move keyboard detection templates from console-setup.templates to + keyboard-configuration.templates. + - Stop running debconf-updatepo on clean. + - Include pc105.tree for ubiquity. + - Run kbd_mode on each tty in ACTIVE_CONSOLES rather than on the current + tty, since the current tty might belong to X and changing X's tty out + of raw mode is a very bad idea. + - Weaken test for whether /usr is mounted; testing for /usr/share is + sufficient, and fixes operation in d-i. + - Make setupcon explicitly exit 0, so that postinsts don't fail in the + event that loadkeys can't find a console. + * Dropped changes: + - Special KPDL handling: rewritten upstream in version 1.24. + - Upgrade handling for broken 1.57ubuntu1-1.57ubuntu4: prerelease + versions from natty, code dropped. + - Allow underscores in rules variables: included upstream. + * Restore plugin-detect-keyboard handling code, accidentally dropped in + a previous merge; keyboard detecting code was probably broken in the gtk + frontend by this. + + -- Steve Langasek Tue, 08 Nov 2011 09:34:02 -0800 + console-setup (1.70) unstable; urgency=low * ckbcomp: permit '_' in all identifiers. Thanks to Jonny, Javier @@ -2084,6 +3944,277 @@ -- Anton Zinoviev Sat, 23 Oct 2010 10:14:45 +0300 +console-setup (1.57ubuntu27) oneiric; urgency=low + + * Update Greek, Persian, Hebrew, Punjabi, and Traditional Chinese + translations from console-setup 1.68, fixing encoding problems + (LP: #860562). + + -- Colin Watson Wed, 28 Sep 2011 15:58:32 +0100 + +console-setup (1.57ubuntu26) oneiric; urgency=low + + * Backport translations from console-setup 1.63, without which + keyboard-configuration is completely untranslated (and, indeed, + untranslatable). LP: #838669. + * Bump dependency on debconf as well, to make sure we can parse sr@latin + translation templates. + + -- Steve Langasek Mon, 26 Sep 2011 15:44:41 +0100 + +console-setup (1.57ubuntu25) oneiric; urgency=low + + * Backport from upstream (Anton Zinoviev): + - Include Terminus font in the compiled packages. Do not depend, but + conflict/provide/replace console-terminus. New upstream version of + the Terminus font (4.32). + + -- Colin Watson Tue, 23 Aug 2011 13:53:08 +0100 + +console-setup (1.57ubuntu24) oneiric; urgency=low + + * Fix default keyboard selection for language/country combinations lacking + a proper combined locale (LP: #814448). + + -- Colin Watson Fri, 19 Aug 2011 15:13:13 +0100 + +console-setup (1.57ubuntu23) oneiric; urgency=low + + * Explicitly build-depend on liblocale-gettext-perl for kbdnames-maker, + and likewise have keyboard-configuration depend on + liblocale-gettext-perl. + + -- Colin Watson Fri, 12 Aug 2011 16:55:54 +0100 + +console-setup (1.57ubuntu22) oneiric; urgency=low + + * Fix keyboard layout detection to set the layout properly (LP: #820554). + + -- Colin Watson Fri, 12 Aug 2011 16:11:59 +0100 + +console-setup (1.57ubuntu21) oneiric; urgency=low + + * Rebuild against xkb-data 2.2.1 (LP: #791883). + + -- Colin Watson Sat, 25 Jun 2011 05:08:24 +0100 + +console-setup (1.57ubuntu20) natty; urgency=low + + * Weaken test for whether /usr is mounted; testing for /usr/share is + sufficient, and fixes operation in d-i. + + -- Colin Watson Wed, 20 Apr 2011 15:29:46 +0100 + +console-setup (1.57ubuntu19) natty; urgency=low + + * Don't copy keyboard-configuration questions to /target in OEM mode. + oem-config will ask them later, and copying these confuses it + (LP: #741304). + + -- Colin Watson Fri, 15 Apr 2011 12:43:41 +0100 + +console-setup (1.57ubuntu18) natty; urgency=low + + * Don't use the default keyboard variant if the layout is overridden by + preseeding (LP: #758584). + + -- Colin Watson Tue, 12 Apr 2011 15:21:11 +0100 + +console-setup (1.57ubuntu17) natty; urgency=low + + * debian/vtrgb: Design team wanted a slightly different grey; more contrast + when white on grey + * debian/console-setup.postinst: fix failure to find file to md5sum; + go back to installing the original vtrgb as a lower priority alternative + + -- Dustin Kirkland Mon, 21 Mar 2011 21:38:00 -0500 + +console-setup (1.57ubuntu16) natty; urgency=low + + * debian/console-setup.postinst: don't add the vtrgb.vga + alternate to update-alternatives; let other packages or humans do this; + otherwise, every time this package upgrades, it would overwrite others' + overiding choices + + -- Dustin Kirkland Sun, 20 Mar 2011 17:54:21 -0500 + +console-setup (1.57ubuntu15) natty; urgency=low + + * debian/vtrgb.vga, debian/rules, debian/console-setup.postinst: + - install a vga configuration, for easy reference by others who want to go + back to legacy mode + - relocate the stock vtrgb from /usr to /etc, such that it can be edited + by an admin, LP: #738992 + + -- Dustin Kirkland Sun, 20 Mar 2011 17:19:34 -0500 + +console-setup (1.57ubuntu14) natty; urgency=low + + * Install setvtrgb job with --no-start --upstart-only (LP: #738159). + + -- Colin Watson Sat, 19 Mar 2011 12:07:57 +0000 + +console-setup (1.57ubuntu13) natty; urgency=low + + * debian/rules, debian/console-setup.postinst: use update-alternatives + to allow other packages to install different console color values, + LP: #737948 + + -- Dustin Kirkland Fri, 18 Mar 2011 22:02:12 -0500 + +console-setup (1.57ubuntu12) natty; urgency=low + + * Tolerate absence of setupcon in keyboard-configuration.postinst + (LP: #733497). + + -- Colin Watson Fri, 18 Mar 2011 11:28:34 +0000 + +console-setup (1.57ubuntu11) natty; urgency=low + + * Address console-setup portion of LP: #730672, by installing + the conffile and applying it at upstart + - debian/vtrgb: Ubuntu's virtual terminal color scheme + - debian/console-setup.setvtrgb.upstart: run setvtrgb during upstart + + -- Dustin Kirkland Thu, 17 Mar 2011 17:10:50 -0500 + +console-setup (1.57ubuntu10) natty; urgency=low + + * Don't fail to configure keyboard-configuration if setxkbmap fails to + talk to the X display (LP: #728764). + + -- Colin Watson Fri, 04 Mar 2011 13:40:49 +0000 + +console-setup (1.57ubuntu9) natty; urgency=low + + * The console-setup udev rule accidentally went missing in 1.57ubuntu1. + Reinstall it, this time in keyboard-configuration (LP: #713746). + * Load the new keyboard configuration immediately when running + 'dpkg-reconfigure keyboard-configuration' in an installed system + (LP: #713062). + * Make setupcon explicitly exit 0, so that postinsts don't fail in the + event that loadkeys can't find a console. + + -- Colin Watson Thu, 03 Mar 2011 16:14:06 +0000 + +console-setup (1.57ubuntu8) natty; urgency=low + + * Move keyboard detection templates from console-setup.templates to + keyboard-configuration.templates. + + -- Colin Watson Mon, 28 Feb 2011 19:21:18 +0000 + +console-setup (1.57ubuntu7) natty; urgency=low + + * No change build to pick up xkeyboard-config 2.1-1ubuntu3. + + -- Evan Dandrea Tue, 08 Feb 2011 15:05:54 +0000 + +console-setup (1.57ubuntu6) natty; urgency=low + + * Allow underscores in rules variables ($sun_t6_custom). + + -- Evan Dandrea Mon, 07 Feb 2011 15:14:44 +0000 + +console-setup (1.57ubuntu5) natty; urgency=low + + * Drop misguided Ubuntu-specific code to migrate from console-setup/* to + keyboard-configuration/* question names. This is already handled on + upgrade by reading the old /etc/default/console-setup file + (LP: #698263). + * console-setup-udeb (<< 1.53) didn't set the seen flag in the installed + system. Cope with this and avoid asking the layout and variant + questions again if the default debconf priority is at least high + (LP: #705883). + * If we detect the above breakage (upgrading from anything between + 1.57ubuntu1 and 1.57ubuntu4 inclusive, and the XKB* values in + /etc/default/keyboard differ from the commented-out values in + /etc/default/console-setup), reset to the commented-out values in + /etc/default/console-setup. + + -- Colin Watson Fri, 28 Jan 2011 12:19:42 +0000 + +console-setup (1.57ubuntu4) natty; urgency=low + + * Include pc105.tree for ubiquity. + + -- Evan Dandrea Mon, 24 Jan 2011 16:53:59 +0000 + +console-setup (1.57ubuntu3) natty; urgency=low + + * Correct fix for LP: #634402: explicitly check readability of + /etc/default/keyboard and /etc/default/console-setup in initramfs hooks, + rather than trying to guard '.' with '||' which doesn't work + (LP: #701954). + + -- Colin Watson Thu, 20 Jan 2011 20:55:01 +0000 + +console-setup (1.57ubuntu2) natty; urgency=low + + * Make keyboard-configuration replace old console-setup/console-setup-mini + versions as well as conflicting with them (thanks, Martin Pitt). + + -- Colin Watson Thu, 06 Jan 2011 12:24:45 +0000 + +console-setup (1.57ubuntu1) natty; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Use keymapper to generate decision trees for a restricted subset of + the pc105 model. + - 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. + - Reset keyboard-configuration/toggle to the default if it's set to "No + toggling" and you select a non-Latin layout. + - Change the default font from Fixed to VGA for Lat15; while it's not + entirely complete, it looks better and is largely good enough. + - Automatically save the font and keymap to /etc in + /etc/init.d/console-setup if it isn't being run from init. Similarly, + ensure that the font and keymap are saved to /etc during initial + installation. + - Set keymap and font in the initramfs if possible and sensible. + - Set default variant for French to oss. + - Set default for Dutch to us(intl), not just us. + - Set default layout for Vietnam to 'us'. + - Set default layout for Kurdish to tr(ku). + - Stop running debconf-updatepo on clean. + - Update for new layouts and variants for Montenegro and Serbia, and + migrate configuration files from the old layouts. + - Add a "Do not configure keyboard; keep kernel keymap" model option, + preseedable by keyboard-configuration/modelcode=SKIP. + - Drop the layout/variant priority to high on fresh installs. + - Honour OVERRIDE_ALLOW_PRESEEDING environment variable when deciding + whether to allow preseeding, which is ordinarily only allowed in d-i. + - If keyboard-configuration/layoutcode is preseeded but not marked as + seen, then set the default layout but don't lower the layout question + priority or preseed console-setup/ask_detect. + - Add an apport hook. + - Generate a locale locally for translating keyboard names in + kbdnames-maker. + - Replace usplash detection code with Plymouth detection code. + - Move boot tasks to a combination of two udev rules and a single + Upstart job, ensuring that they're run at points when we are able to + satisfy the constraints on the relevant ioctls. + - Depend on kbd (>= 1.15-1ubuntu3) for a valuable loadkeys improvement. + - Don't try to call update-rc.d if it doesn't exist, such as in d-i. + - Don't gzip font or ACM files in /etc/console-setup/. The space saving + is negligible, and it's more efficient not to need to uncompress them + at boot time. + - Remove iconv transliteration. We don't use non-UTF-8 locales, and it + breaks ubiquity as we haven't generated the configured locale by the + time we hit console-setup. + * Go back to always asking layout before variant. + * Migrate from old console-setup/* to new keyboard-configuration/* + question names. + * Use the default keyboard model if an existing configuration file sets + XKBMODEL="". + * Exit cleanly from initramfs hook if /etc/default/keyboard or + /etc/default/console-setup don't exist for some reason (LP: #634402). + * Fix description of upstart job to not incorrectly claim that it sets the + font (LP: #632366). + + -- Colin Watson Wed, 05 Jan 2011 17:02:40 +0000 + console-setup (1.57) unstable; urgency=low * udeb: properly preseed system based on installer values. @@ -2609,6 +4740,181 @@ -- Anton Zinoviev Thu, 14 May 2009 21:42:14 +0300 +console-setup (1.34ubuntu15) lucid; urgency=low + + * Make /usr/share/initramfs-tools/scripts/panic/console_setup executable. + + -- Colin Watson Fri, 23 Apr 2010 23:23:50 +0100 + +console-setup (1.34ubuntu14) lucid; urgency=low + + * Update Ubuntu-specific translations from Launchpad. + + -- Colin Watson Thu, 15 Apr 2010 00:08:23 +0100 + +console-setup (1.34ubuntu13) lucid; urgency=low + + * Remove iconv transliteration. We don't use non-UTF-8 locales, and + it breaks ubiquity as we haven't generated the configured locale by + the time we hit console-setup (LP: #542310). + + -- Evan Dandrea Fri, 26 Mar 2010 12:50:50 +0000 + +console-setup (1.34ubuntu12) lucid; urgency=low + + * console-setup-tty: Only call setfont once, for both font and ACM. + * Don't try to call update-rc.d if it doesn't exist, such as in d-i + (LP: #540835). + * Don't gzip font or ACM files in /etc/console-setup/. The space saving + is negligible, and it's more efficient not to need to uncompress them at + boot time. + + -- Colin Watson Fri, 19 Mar 2010 11:08:58 +0000 + +console-setup (1.34ubuntu11) lucid; urgency=low + + * Move boot tasks to a combination of two udev rules and a single Upstart + job, ensuring that they're run at points when we are able to satisfy the + constraints on the relevant ioctls. This may not work optimally with + vgacon, but you have to go to special effort to use that with Ubuntu + now, and it at least shouldn't break (LP: #524439). + * Set default layout for Guernsey, Jersey, and the Isle of Man to gb + (LP: #533003). + * Fix incorrect FONT and ACM tests in initramfs script. + * Depend on kbd (>= 1.15-1ubuntu3) for a valuable loadkeys improvement. + This was previously a recommends, but the udev rule won't work without + kbd or console-tools anyway, I'm not really interested in supporting a + system without either installed, and console-tools is thoroughly + obsolete now. + + -- Colin Watson Sat, 13 Mar 2010 12:56:30 +0000 + +console-setup (1.34ubuntu10) lucid; urgency=low + + * debian/console-setup.console-setup.init, + debian/console-setup.keyboard-setup.init: Replace the usplash detection + code with Plymouth detection code, since the same problem applies. + + -- Scott James Remnant Wed, 17 Feb 2010 13:14:32 +0000 + +console-setup (1.34ubuntu9) lucid; urgency=low + + * Generate a locale locally for translating keyboard names in + kbnames-maker. + + -- Evan Dandrea Thu, 04 Feb 2010 15:48:25 -0800 + +console-setup (1.34ubuntu8) lucid; urgency=low + + * Put kbdnames.gz in console-setup-udeb as well. + * Don't filter out models from kbdnames as we still ask the model + question. + + -- Evan Dandrea Wed, 27 Jan 2010 17:22:19 +0000 + +console-setup (1.34ubuntu7) lucid; urgency=low + + * Merge support for translated keyboard names from Debian. + * Update ckb/rules/base.xml to point at the new location. + + -- Evan Dandrea Wed, 20 Jan 2010 15:22:34 +0000 + +console-setup (1.34ubuntu6) lucid; urgency=low + + * debian/console-setup.initramfs-hook: There's no harm having the hook + run in the non-framebuffer case, it just copies things into the + initramfs which may be useful. + * debian/rules: That means we can copy the hook into scripts/panic as + well (stripping the OPTION from it), so when we need a shell, we'll + load the keymap. + + -- Scott James Remnant Fri, 18 Dec 2009 14:56:03 +0000 + +console-setup (1.34ubuntu5) lucid; urgency=low + + * We don't need the initramfs hooks if the initramfs doesn't load the + framebuffer or splash screen. + + -- Scott James Remnant Tue, 15 Dec 2009 14:56:59 +0000 + +console-setup (1.34ubuntu4) karmic; urgency=low + + * Fix backports of Asturian and Catalan changes in 1.34ubuntu3. + + -- Colin Watson Thu, 01 Oct 2009 20:27:35 +0100 + +console-setup (1.34ubuntu3) karmic; urgency=low + + [ Loïc Minier ] + * Use `dpkg --print-architecture` instead of the obsolete + --print-installation-architecture in debian/config.proto (LP: #403316). + + [ Colin Watson ] + * Forbid Unicode keysyms in the range 0xf000-0xffff, as kbd 1.15-1 rejects + the entire keymap if it contains any keysyms in that range (LP: + #416949). + * Add default codeset/layout/variant for Asturian. + * Backport from trunk (Jordi Mallach): + - Set XKBVARIANT to "cat" for Catalan. + + -- Colin Watson Thu, 01 Oct 2009 20:21:57 +0100 + +console-setup (1.34ubuntu2) karmic; urgency=low + + * Add an apport hook. + * Update translations from Launchpad. + * Backport from trunk (Anton Zinoviev, LP: #390292): + - Do not issue warnings for unknown keycodes with AT keyboards (these + are multimedia keys and they are unnecessary on the console). Thanks + to Anders LagerÃ¥s, closes: #531292. + + -- Colin Watson Tue, 01 Sep 2009 11:49:34 +0100 + +console-setup (1.34ubuntu1) karmic; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Use keymapper to generate decision trees for a restricted subset of + the pc105 model. + - 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. + - Reset console-setup/toggle to the default if it's set to "No toggling" + and you select a non-Latin layout. + - Change the default font from Fixed to VGA for Lat15; while it's not + entirely complete, it looks better and is largely good enough. + - Run kbd_mode on each tty in ACTIVE_CONSOLES rather than on the current + tty, since the current tty might belong to X and changing X's tty out + of raw mode is a very bad idea. + - Automatically save the font and keymap to /etc in + /etc/init.d/console-setup if it isn't being run from init. Similarly, + ensure that the font and keymap are saved to /etc during initial + installation. + - Set keymap and font in the initramfs if possible. + - Set default variant for French to oss. + - Set default for Dutch to us(intl), not just us. + - Set default layout for Vietnam to 'us'. + - Set default layout for Kurdish to tr(ku). + - Fix handling of commas in layout and variant names. + - debian/config.proto: Set sparc default model to pc105. + - Remove 'exit 0' from the end of debian/config.proto; this will be + sourced from the postinst in the installer, and exiting in the + successful case means that /etc/default/console-setup never gets + generated. + - Stop running debconf-updatepo on clean. + - Update for new layouts and variants for Japan, Montenegro, and Serbia, + and migrate configuration files from the old layouts. + - Add a "Do not configure keyboard; keep kernel keymap" model option, + preseedable by console-setup/modelcode=SKIP. + - Drop the layout/variant priority to high on fresh installs. + - Honour OVERRIDE_ALLOW_PRESEEDING environment variable when deciding + whether to allow preseeding, which is ordinarily only allowed in d-i. + - If console-setup/layoutcode is preseeded but not marked as seen, then + set the default layout but don't lower the layout question priority or + preseed console-setup/ask_detect. + - Treat the Kazakhstan layout (kz) as non-Latin. + + -- Colin Watson Tue, 05 May 2009 20:51:20 +0100 + console-setup (1.34) unstable; urgency=medium [ Colin Watson ] @@ -2758,6 +5064,113 @@ -- Anton Zinoviev Tue, 24 Mar 2009 20:53:51 +0200 +console-setup (1.28ubuntu8) jaunty; urgency=low + + * Update Ubuntu-specific strings from Launchpad. + * Treat the Kazakhstan layout (kz) as non-Latin (LP: #356816). + + -- Colin Watson Thu, 09 Apr 2009 01:15:09 +0100 + +console-setup (1.28ubuntu7) jaunty; urgency=low + + * Raise priority to critical for questions preseeded with a nonexistent + code (LP: #328078). + + -- Colin Watson Fri, 27 Mar 2009 11:45:13 +0000 + +console-setup (1.28ubuntu6) jaunty; urgency=low + + * Don't escape '(' and ')' when decoding/encoding the codeset, as the + pattern is passed to grep and this causes parentheses to be interpreted + as regular expression groups (thanks to Dmitry Agafonov for pointing out + the problem). + * If reading a user configuration file, disable --save, and don't use + /etc/console-setup/boottime.kmap.gz (LP: #332728). + * Update Keyboard/KeyboardNames.pl based on xkb-data 1.5-2ubuntu5. + + -- Colin Watson Mon, 02 Mar 2009 16:30:50 +0000 + +console-setup (1.28ubuntu5) jaunty; urgency=low + + * Backport from trunk: + - Sort the null variant to the top of the choices list rather than to the + bottom. + * Set and check a flag on console-setup/dont_ask_layout to make sure that + it's only asked at most once per package installation (LP: #320374). + * Update Keyboard/KeyboardNames.pl based on xkb-data 1.4-1ubuntu3. + + -- Colin Watson Sat, 31 Jan 2009 12:07:37 +0000 + +console-setup (1.28ubuntu4) jaunty; urgency=low + + * Set plain or shifted PrintScreen key to generate VoidSymbol rather than + Ctrl-backslash (LP: #279973). + + -- Colin Watson Mon, 15 Dec 2008 10:09:28 +0000 + +console-setup (1.28ubuntu3) jaunty; urgency=low + + * Create /dev/tty[1-6] in our initramfs script before trying to operate on + them (LP: #130444). + + -- Colin Watson Wed, 26 Nov 2008 12:15:12 +0000 + +console-setup (1.28ubuntu2) jaunty; urgency=low + + * Default console-setup/ask_detect to false, since it's hard to back up + out of the detection widget once you've entered it. + + -- Colin Watson Tue, 25 Nov 2008 16:48:28 +0000 + +console-setup (1.28ubuntu1) jaunty; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Use keymapper to generate decision trees for a restricted subset of + the pc105 model. + - 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. + - Reset console-setup/toggle to the default if it's set to "No toggling" + and you select a non-Latin layout. + - Change the default font from Terminus to VGA where supported. + - Run kbd_mode on each tty in ACTIVE_CONSOLES rather than on the current + tty, since the current tty might belong to X and changing X's tty out + of raw mode is a very bad idea. + - Automatically save the font and keymap to /etc in + /etc/init.d/console-setup if it isn't being run from init. Similarly, + ensure that the font and keymap are saved to /etc during initial + installation. + - Disable workaround in ckbcomp for the kernel not applying Caps Lock to + non-ASCII letters, except for Turkish layouts; the cure is worse than + the disease because it makes Caps Lock equivalent to Shift Lock. + - Set keymap and font in the initramfs if possible. + - Set default variant for French to oss. + - Set default for Dutch to us(intl), not just us. + - Set default layout for Vietnam to 'us'. + - Set default layout for Kurdish to tr(ku). + - Fix handling of commas in layout and variant names. + - Fix keymap reduction not to try to express keymap A in terms of keymap + B when B includes keys not mapped by A. + - debian/config.proto: Set sparc default model to pc105. + - Remove 'exit 0' from the end of debian/config.proto; this will be + sourced from the postinst in the installer, and exiting in the + successful case means that /etc/default/console-setup never gets + generated. + - Stop running debconf-updatepo on clean. + - Update for new layouts and variants for Japan, Montenegro, and Serbia, + and migrate configuration files from the old layouts. + - Add a "Do not configure keyboard; keep kernel keymap" model option, + preseedable by console-setup/modelcode=SKIP. + - Drop the layout/variant priority to high on fresh installs. + - Honour OVERRIDE_ALLOW_PRESEEDING environment variable when deciding + whether to allow preseeding, which is ordinarily only allowed in d-i. + - If console-setup/layoutcode is preseeded but not marked as seen, then + set the default layout but don't lower the layout question priority or + preseed console-setup/ask_detect. + - Fix property counts in Goha and legacy BDF fonts. + + -- Colin Watson Thu, 06 Nov 2008 14:36:26 +0000 + console-setup (1.28) unstable; urgency=low [ Debconf translations ] @@ -2796,6 +5209,67 @@ -- Christian Perrier Tue, 08 Jul 2008 20:40:35 +0200 +console-setup (1.25ubuntu3) intrepid; urgency=low + + * Fix property counts in Goha and legacy BDF fonts. + * Switch from console-tools-udeb to kbd-udeb, in line with Debian. + + -- Colin Watson Thu, 28 Aug 2008 00:09:48 +0100 + +console-setup (1.25ubuntu2) intrepid; urgency=low + + * If console-setup/layoutcode is preseeded but not marked as seen, then + set the default layout but don't lower the layout question priority or + preseed console-setup/ask_detect (LP: #64058). + + -- Colin Watson Mon, 30 Jun 2008 23:49:31 +0100 + +console-setup (1.25ubuntu1) intrepid; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Use keymapper to generate decision trees for a restricted subset of + the pc105 model. + - 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. + - Reset console-setup/toggle to the default if it's set to "No toggling" + and you select a non-Latin layout. + - Change the default font from Terminus to VGA where supported. + - Run kbd_mode on each tty in ACTIVE_CONSOLES rather than on the current + tty, since the current tty might belong to X and changing X's tty out + of raw mode is a very bad idea. + - Automatically save the font and keymap to /etc in + /etc/init.d/console-setup if it isn't being run from init. Similarly, + ensure that the font and keymap are saved to /etc during initial + installation. + - Disable workaround in ckbcomp for the kernel not applying Caps Lock to + non-ASCII letters, except for Turkish layouts; the cure is worse than + the disease because it makes Caps Lock equivalent to Shift Lock. + - Set keymap and font in the initramfs if possible. + - Set default variant for French to oss. + - Set default for Dutch to us(intl), not just us. + - Set default layout for Vietnam to 'us'. + - Set default layout for Kurdish to tr(ku). + - Fix handling of commas in layout and variant names. + - Fix keymap reduction not to try to express keymap A in terms of keymap + B when B includes keys not mapped by A. + - debian/config.proto: Set sparc default model to pc105. + - Remove 'exit 0' from the end of debian/config.proto; this will be + sourced from the postinst in the installer, and exiting in the + successful case means that /etc/default/console-setup never gets + generated. + - Switch back to console-tools-udeb for now. + - Stop running debconf-updatepo on clean. + - Update for new layouts and variants for Japan, Montenegro, and Serbia, + and migrate configuration files from the old layouts. + - Add a "Do not configure keyboard; keep kernel keymap" model option, + preseedable by console-setup/modelcode=SKIP. + - Drop the layout/variant priority to high on fresh installs. + - Honour OVERRIDE_ALLOW_PRESEEDING environment variable when deciding + whether to allow preseeding, which is ordinarily only allowed in d-i. + + -- Colin Watson Tue, 24 Jun 2008 02:39:34 +0100 + console-setup (1.25) unstable; urgency=low [ Anton Zinoviev ] @@ -2813,6 +5287,52 @@ -- Christian Perrier Wed, 18 Jun 2008 20:24:01 +0200 +console-setup (1.24ubuntu1) intrepid; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Use keymapper to generate decision trees for a restricted subset of + the pc105 model. + - 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. + - Reset console-setup/toggle to the default if it's set to "No toggling" + and you select a non-Latin layout. + - Change the default font from Terminus to VGA where supported. + - Run kbd_mode on each tty in ACTIVE_CONSOLES rather than on the current + tty, since the current tty might belong to X and changing X's tty out + of raw mode is a very bad idea. + - Automatically save the font and keymap to /etc in + /etc/init.d/console-setup if it isn't being run from init. Similarly, + ensure that the font and keymap are saved to /etc during initial + installation. + - Disable workaround in ckbcomp for the kernel not applying Caps Lock to + non-ASCII letters, except for Turkish layouts; the cure is worse than + the disease because it makes Caps Lock equivalent to Shift Lock. + - Set keymap and font in the initramfs if possible. + - Set default variant for French to oss. + - Set default for Dutch to us(intl), not just us. + - Set default layout for Vietnam to 'us'. + - Set default layout for Kurdish to tr(ku). + - Fix handling of commas in layout and variant names. + - Fix keymap reduction not to try to express keymap A in terms of keymap + B when B includes keys not mapped by A. + - debian/config.proto: Set sparc default model to pc105. + - Remove 'exit 0' from the end of debian/config.proto; this will be + sourced from the postinst in the installer, and exiting in the + successful case means that /etc/default/console-setup never gets + generated. + - Switch back to console-tools-udeb for now. + - Stop running debconf-updatepo on clean. + - Update for new layouts and variants for Japan, Montenegro, and Serbia, + and migrate configuration files from the old layouts. + - Add a "Do not configure keyboard; keep kernel keymap" model option, + preseedable by console-setup/modelcode=SKIP. + - Drop the layout/variant priority to high on fresh installs. + - Honour OVERRIDE_ALLOW_PRESEEDING environment variable when deciding + whether to allow preseeding, which is ordinarily only allowed in d-i. + + -- Colin Watson Wed, 11 Jun 2008 22:32:10 +0100 + console-setup (1.24) unstable; urgency=medium [ Anton Zinoviev ] @@ -2887,6 +5407,100 @@ -- Anton Zinoviev Fri, 04 Apr 2008 22:41:21 +0300 +console-setup (1.21ubuntu8) hardy; urgency=low + + * Rebuild against xkeyboard-config 1.1~cvs.20080104.1-1ubuntu6. + + -- Colin Watson Mon, 21 Apr 2008 20:40:40 +0100 + +console-setup (1.21ubuntu7) hardy; urgency=low + + * Honour OVERRIDE_ALLOW_PRESEEDING environment variable when deciding + whether to allow preseeding, which is ordinarily only allowed in d-i + (LP: #188492). + + -- Colin Watson Mon, 14 Apr 2008 11:49:55 +0100 + +console-setup (1.21ubuntu6) hardy; urgency=low + + * Handle some special cases for the KPDL key (LP: #189529). + + -- Colin Watson Wed, 02 Apr 2008 00:06:25 +0100 + +console-setup (1.21ubuntu5) hardy; urgency=low + + * Silence error messages for keycodes 214, 215, 216, and 217, which are + various special keys in the default X.org PC keyboard map that we don't + need to handle. + * Map dead_stroke to U+002D HYPHEN-MINUS. + * Add a "Do not configure keyboard; keep kernel keymap" model option, + preseedable by console-setup/modelcode=SKIP (LP: #59889). + * Drop the layout/variant priority to high on fresh installs + (LP: #205959). + * Support rules with multiple consequents (thanks, Adam Simpkins; + LP: #139710). + * Allow specifying alternate rules using XKBRULES (thanks, Adam Simpkins; + LP: #139712). + + -- Colin Watson Mon, 31 Mar 2008 14:33:25 +0100 + +console-setup (1.21ubuntu4) hardy; urgency=low + + * Set default layout for Kurdish to tr(ku) (LP: #28683). + + -- Colin Watson Mon, 03 Mar 2008 13:46:06 +0000 + +console-setup (1.21ubuntu3) hardy; urgency=low + + * Set default layout for Vietnam to 'us' (LP: #191451). + * Treat 'any' as a synonym for 'NoSymbol' in XKB input files (LP: #93077). + + -- Colin Watson Tue, 26 Feb 2008 14:05:12 +0000 + +console-setup (1.21ubuntu2) hardy; urgency=low + + * Set default for Dutch to us(intl), not just us (LP: #129982). + + -- Colin Watson Tue, 29 Jan 2008 00:14:54 +0000 + +console-setup (1.21ubuntu1) hardy; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Use keymapper to generate decision trees for a restricted subset of + the pc105 model. + - 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. + - Reset console-setup/toggle to the default if it's set to "No toggling" + and you select a non-Latin layout. + - Change the default font from Terminus to VGA where supported. + - Run kbd_mode on each tty in ACTIVE_CONSOLES rather than on the current + tty, since the current tty might belong to X and changing X's tty out + of raw mode is a very bad idea. + - Automatically save the font and keymap to /etc in + /etc/init.d/console-setup if it isn't being run from init. Similarly, + ensure that the font and keymap are saved to /etc during initial + installation. + - Disable workaround in ckbcomp for the kernel not applying Caps Lock to + non-ASCII letters, except for Turkish layouts; the cure is worse than + the disease because it makes Caps Lock equivalent to Shift Lock. + - Set keymap and font in the initramfs if possible. + - Set default variant for French to oss. + - Fix handling of commas in layout and variant names. + - Fix keymap reduction not to try to express keymap A in terms of keymap + B when B includes keys not mapped by A. + - debian/config.proto: Set sparc default model to pc105. + - Remove 'exit 0' from the end of debian/config.proto; this will be + sourced from the postinst in the installer, and exiting in the + successful case means that /etc/default/console-setup never gets + generated. + - Switch back to console-tools-udeb for now. + - Stop running debconf-updatepo on clean. + * Update for new layouts and variants for Japan, Montenegro, and Serbia, + and migrate configuration files from the old layouts. + + -- Colin Watson Mon, 28 Jan 2008 23:01:31 +0000 + console-setup (1.21) unstable; urgency=low * Silently ignore 'vendor' tag in xorg.xml. @@ -2945,6 +5559,69 @@ -- Christian Perrier Sat, 05 Jan 2008 09:04:03 +0100 +console-setup (1.19ubuntu3) hardy; urgency=low + + * Set default layout for Dutch to 'us' (LP: #129982). + * Set default layout for Simplified Chinese to 'cn'. + * Set default layout for Morocco to 'ma'. + + -- Colin Watson Mon, 28 Jan 2008 17:11:21 +0000 + +console-setup (1.19ubuntu2) hardy; urgency=low + + * Handle an empty codeset in the configuration file gracefully (a remnant + of a previous bug, perhaps Debian #420802?), and re-ask the question on + upgrade (LP: #91399). + + -- Colin Watson Fri, 11 Jan 2008 00:30:07 +0000 + +console-setup (1.19ubuntu1) hardy; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Use keymapper to generate decision trees for a restricted subset of + the pc105 model. + - 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. + - Only default to Canadian layout for fr_CA; use U.S. English for other + *_CA locales. + - Reset console-setup/toggle to the default if it's set to "No toggling" + and you select a non-Latin layout. + - Change the default font from Terminus to VGA where supported. + - Run kbd_mode on each tty in ACTIVE_CONSOLES rather than on the current + tty, since the current tty might belong to X and changing X's tty out + of raw mode is a very bad idea. + - Automatically save the font and keymap to /etc in + /etc/init.d/console-setup if it isn't being run from init. Similarly, + ensure that the font and keymap are saved to /etc during initial + installation. + - Disable workaround in ckbcomp for the kernel not applying Caps Lock to + non-ASCII letters, except for Turkish layouts; the cure is worse than + the disease because it makes Caps Lock equivalent to Shift Lock. + - Set keymap and font in the initramfs if possible. + - Set default variant for French to oss. + - Fix handling of commas in layout and variant names. + - Fix keymap reduction not to try to express keymap A in terms of keymap + B when B includes keys not mapped by A. + - debian/config.proto: Set sparc default model to pc105. + - Remove 'exit 0' from the end of debian/config.proto; this will be + sourced from the postinst in the installer, and exiting in the + successful case means that /etc/default/console-setup never gets + generated. + - Set default model to pc105 on powerpc/ps3 systems. + * Switch back to console-tools-udeb for now; we'd like to use kbd for + Hardy, but Alpha 1 is looming ... + * Stop running debconf-updatepo on clean; this is not standard in d-i and + should be done manually where necessary in Ubuntu. + * Backport from trunk: + - Run setupcon with --save in the postinst to ensure that required data + is copied to /etc. + - Load the saved keymap in /etc/console-setup/boottime.kmap.gz if + available rather than running ckbcomp (which is slow), unless we're + being called with --save or --save-only. + + -- Colin Watson Tue, 27 Nov 2007 15:05:15 +0000 + console-setup (1.19) unstable; urgency=low [ Jérémy Bobbio ] @@ -2992,6 +5669,85 @@ -- Anton Zinoviev Sun, 15 Jul 2007 16:35:55 +0300 +console-setup (1.16ubuntu5) gutsy; urgency=low + + * Rebuild against xkb-data 0.9-4ubuntu2. + + -- Colin Watson Mon, 24 Sep 2007 12:53:36 +0100 + +console-setup (1.16ubuntu4) gutsy; urgency=low + + * Set default model to pc105 on powerpc/ps3 systems. + + -- Colin Watson Fri, 08 Jun 2007 14:12:20 +0100 + +console-setup (1.16ubuntu3) gutsy; urgency=low + + * Remove 'exit 0' from the end of debian/config.proto; this will be + sourced from the postinst in the installer, and exiting in the + successful case means that /etc/default/console-setup never gets + generated (thanks, Evan Dandrea). + + -- Colin Watson Mon, 04 Jun 2007 22:53:23 +0100 + +console-setup (1.16ubuntu2) gutsy; urgency=low + + * Make Keyboard/keymaptree executable again. + + -- Colin Watson Sun, 03 Jun 2007 21:30:57 +0100 + +console-setup (1.16ubuntu1) gutsy; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Use keymapper to generate decision trees for a restricted subset of + the pc105 model. + - 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. + - Only default to Canadian layout for fr_CA; use U.S. English for other + *_CA locales. + - Set default charmap for d-i to UTF-8. + - Remove unhelpful defaults for several questions. + - Allow preseeding of console-setup/modelcode, console-setup/layoutcode, + console-setup/variantcode, console-setup/optionscode, and + console-setup/fontsize. + - Reset console-setup/toggle to the default if it's set to "No toggling" + and you select a non-Latin layout. + - Change the default font from Terminus to VGA where supported. + - Add a few bits of installer integration to console-setup-udeb borrowed + from kbd-chooser. + - console-setup Depends: perl; something in ckbcomp is causing perl to + 'use utf8' implicitly, and some of the necessary modules aren't in + perl-base. + - Run kbd_mode on each tty in ACTIVE_CONSOLES rather than on the current + tty, since the current tty might belong to X and changing X's tty out + of raw mode is a very bad idea. + - Automatically save the font and keymap to /etc in + /etc/init.d/console-setup if it isn't being run from init. Similarly, + ensure that the font and keymap are saved to /etc during initial + installation. + - Disable workaround in ckbcomp for the kernel not applying Caps Lock to + non-ASCII letters, except for Turkish layouts; the cure is worse than + the disease because it makes Caps Lock equivalent to Shift Lock. + - Use 'setupcon --save-only' to make sure the font is available on the + root filesystem for the next boot but not to load it immediately, + avoiding console manipulation when X or usplash is running. + - Set keymap and font in the initramfs if possible. + - Set default variant for French to oss. + - Fix handling of commas in layout and variant names. + - Fix keymap reduction not to try to express keymap A in terms of keymap + B when B includes keys not mapped by A. + - debian/config.proto: Set sparc default model to pc105. + - debian/control: Remove outdated note about loadkeys in + console-setup-udeb's description. + * Allow kbd's initramfs hook as an alternative to that provided by + console-tools. + * Don't run 'setupcon -k' from rcS if usplash is running, as that means + the console will be in raw mode and loadkeys will do confusing things to + the keymap (LP: #84156). + + -- Colin Watson Sun, 03 Jun 2007 14:53:42 +0100 + console-setup (1.16) unstable; urgency=low * Update ckbconf with the most recent list of xkeysyms. @@ -3041,6 +5797,73 @@ -- Anton Zinoviev Tue, 1 May 2007 23:48:12 +0300 +console-setup (1.15ubuntu1) gutsy; urgency=low + + * Resynchronise with Debian (LP: #94177). Remaining changes: + - Use keymapper to generate decision trees for a restricted subset of + the pc105 model. + - 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. + - Ship MyKeyboardNames.pl (as KeyboardNames.pl) and kbdnames-maker in + /usr/share/console-setup. + - Only default to Canadian layout for fr_CA; use U.S. English for other + *_CA locales. + - Fix default layout for Bosnian and default variant for Hindi. + - Set default charmap for d-i to UTF-8. + - Remove unhelpful defaults for several questions. + - Adjust the default keyboard model for Brazilian and Japanese layouts. + - Allow preseeding of console-setup/modelcode, console-setup/layoutcode, + console-setup/variantcode, console-setup/optionscode, and + console-setup/fontsize. + - Use jp(latin),jp rather than us,jp by default for Japanese. + - Reset console-setup/toggle to the default if it's set to "No toggling" + and you select a non-Latin layout. + - Change the default font from Terminus to VGA where supported. + - Add a few bits of installer integration to console-setup-udeb borrowed + from kbd-chooser. + - console-setup Depends: perl; something in ckbcomp is causing perl to + 'use utf8' implicitly, and some of the necessary modules aren't in + perl-base. + - Run kbd_mode on each tty in ACTIVE_CONSOLES rather than on the current + tty, since the current tty might belong to X and changing X's tty out + of raw mode is a very bad idea. + - Map fr_CH to ch(fr) (Swiss French). + - Fix codeset question priority for Esperanto. + - Automatically save the font and keymap to /etc in + /etc/init.d/console-setup if it isn't being run from init. Similarly, + ensure that the font and keymap are saved to /etc during initial + installation. + - Disable workaround in ckbcomp for the kernel not applying Caps Lock to + non-ASCII letters, except for Turkish layouts; the cure is worse than + the disease because it makes Caps Lock equivalent to Shift Lock. + - Add a --save-only option to setupcon, to save the keyboard/font on the + root filesystem but not actually tell the kernel to set it up. Use it + to make sure the font is available on the root filesystem for the next + boot but not to load it immediately, avoiding console manipulation + when X or usplash is running. + - Set keymap and font in the initramfs if possible. + - Add lt to list of non-Latin keymaps. + - Set default variant for French to oss. + - Fix handling of commas in layout and variant names. + - Fix keymap reduction not to try to express keymap A in terms of keymap + B when B includes keys not mapped by A. + - Source debconf confmodule earlier in postinst. + - Fix horrible confusion if the locale has no supported default codeset. + - Fix console-setup/codeset default to be one of the available choices. + - Don't set an AltGr key by default for US layouts. + - Add amiga, ataritt, sun4, and sun5 models, since they are used as + defaults on certain architectures. + - Map keycode 133 to AT scancode 124 for Japanese. + * debian/config.proto: Set sparc default model to pc105 (LP: #105595). + * debian/control: Multiply Installer-Menu-Item number by 100. + * debian/control: Remove outdated note about loadkeys in + console-setup-udeb's description. + * debian/console-setup.postinst: Drop font fixups for upgrades from + development versions of Edgy. + + -- Colin Watson Wed, 25 Apr 2007 11:52:52 +0100 + console-setup (1.15) unstable; urgency=low * Updated Georgian letters for Fixed16 and Fixed14. Thanks to Vladimer @@ -3059,6 +5882,171 @@ -- Christian Perrier Sun, 4 Mar 2007 19:54:11 +0100 +console-setup (1.13ubuntu13) feisty; urgency=low + + * debian/console-setup.console-setup.init: Don't break if fgconsole fails. + + -- Colin Watson Tue, 10 Apr 2007 16:16:08 +0100 + +console-setup (1.13ubuntu12) feisty; urgency=low + + * Map keycode 133 to AT scancode 124 for Japanese (thanks, Jun Kobayashi; + LP: #97466). + + -- Colin Watson Wed, 4 Apr 2007 16:48:15 +0100 + +console-setup (1.13ubuntu11) feisty; urgency=low + + * Add amiga, ataritt, sun4, and sun5 models, since they are used as + defaults on certain architectures (LP: #97225). + + -- Colin Watson Wed, 4 Apr 2007 10:11:03 +0100 + +console-setup (1.13ubuntu10) feisty; urgency=low + + * Source debconf confmodule earlier in postinst (it should always be + sourced as early as possible, as it re-executes the calling script). + * Fix horrible confusion if the locale has no supported default codeset + (LP: #84401). + * Fix console-setup/codeset default to be one of the available choices. + * Try harder to ensure that we aren't running under X when deciding + whether to run setupcon on upgrade (thanks to Kurt J. Bosch for + suggestions; LP: #93338). + * Don't set an AltGr key by default for US layouts (LP: #76901). + + -- Colin Watson Sun, 1 Apr 2007 16:49:02 +0100 + +console-setup (1.13ubuntu9) feisty; urgency=low + + * Keyboard/kbdcompiler: Fix keymap reduction not to try to express keymap + A in terms of keymap B when B includes keys not mapped by A, fixing a + number of incorrectly-reduced keymaps (LP: #74375). + * Keyboard/kbdcompiler: Update handling of jp to match + debian/config.proto. + * Keyboard/keymaptree.use: Remove jp; we cannot detect it correctly + without further intelligence, as it's designed for jp106 keyboard + models. + + -- Colin Watson Sat, 17 Mar 2007 10:06:05 +0000 + +console-setup (1.13ubuntu8) feisty; urgency=low + + * Fix handling of commas in layout and variant names. + + -- Colin Watson Fri, 9 Mar 2007 20:05:00 +0000 + +console-setup (1.13ubuntu7) feisty; urgency=low + + * Add lt to list of non-Latin keymaps (LP: #38931). + * Map Caps Lock to Shift Lock for Turkish layouts. + * Build keymap tree from MyKeyboardNames.pl rather than KeyboardNames.pl. + * Add fr:oss to keymap tree. + * Set default variant for French to oss (LP: #89835). + * Remove Keyboard/*.tree on clean. + * Fix six files in debian/ that were supposed to be symlinks. + * Move console-setup-udeb's post-base-installer script to be a + base-installer script instead, so that console-setup will be configured + properly along with the initramfs during debootstrap. + * Set Maintainer to me. + + -- Colin Watson Tue, 6 Mar 2007 12:09:57 +0000 + +console-setup (1.13ubuntu6) feisty; urgency=low + + * Set keymap and font in the initramfs if possible. Setting these as early + as possible is a good thing; we can't set up the font correctly once + usplash is running; and setting up the font between usplash and X + requires an ugly mode switch. + + -- Colin Watson Mon, 22 Jan 2007 14:21:24 +0000 + +console-setup (1.13ubuntu5) feisty; urgency=low + + * Add a --save-only option to setupcon, to save the keyboard/font on the + root filesystem but not actually tell the kernel to set it up. + * Back out part of setup-console-under-usplash changes: attempts to change + the font must be guarded against being run while on an X display or + while usplash is running, because some kernel console drivers (at least + vgacon) are fundamentally unable to change the font only on some virtual + consoles, and will corrupt video memory if you try (LP: #73955). We now + use setupcon --save-only to make sure the font is available on the root + filesystem for the next boot but don't load it immediately. + + -- Colin Watson Mon, 15 Jan 2007 20:08:33 +0000 + +console-setup (1.13ubuntu4) feisty; urgency=low + + * Include ro(std) in keymap tree, after talking with Eddy Petrişor. + * Disable workaround in ckbcomp for the kernel not applying Caps Lock to + non-ASCII letters; the cure is worse than the disease because it makes + Caps Lock equivalent to Shift Lock (LP: #69725). + * Install MyKeyboardNames.pl (built from /usr/share/X11/xkb) rather than + KeyboardNames.pl (built from the out-of-date copy in Keyboard/ckb) as + /usr/share/console-setup/KeyboardNames.pl (LP: #71864). + + -- Colin Watson Fri, 5 Jan 2007 14:15:04 +0000 + +console-setup (1.13ubuntu3) feisty; urgency=low + + * Remove ch(fr) from keymap tree again; it's not distinguishable from ch + without checking shift key state, which keymapper currently doesn't do. + + -- Colin Watson Wed, 29 Nov 2006 11:28:48 +0000 + +console-setup (1.13ubuntu2) feisty; urgency=low + + * Make Keyboard/keymaptree executable again. + + -- Colin Watson Tue, 28 Nov 2006 20:09:22 +0000 + +console-setup (1.13ubuntu1) feisty; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Use keymapper to generate decision trees for a restricted subset of + the pc105 model. + - 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. + - Ship KeyboardNames.pl and kbdnames-maker in /usr/share/console-setup. + - Only default to Canadian layout for fr_CA; use U.S. English for other + *_CA locales. + - Fix default layout for Bosnian and default variant for Hindi. + - Set default charmap for d-i to UTF-8. + - Remove unhelpful defaults for several questions. + - Adjust the default keyboard model for Brazilian and Japanese layouts. + - Allow preseeding of console-setup/modelcode, console-setup/layoutcode, + console-setup/variantcode, console-setup/optionscode, and + console-setup/fontsize. + - Use jp(latin),jp rather than us,jp by default for Japanese. + - Reset console-setup/toggle to the default if it's set to "No toggling" + and you select a non-Latin layout. + - Change the default font from Terminus to VGA where supported. + - Skip now-unnecessary console check in init scripts. + - Fix up font face and size on upgrading from old versions in Edgy. + - Add a few bits of installer integration to console-setup-udeb borrowed + from kbd-chooser. + - console-setup Depends: perl; something in ckbcomp is causing perl to + 'use utf8' implicitly, and some of the necessary modules aren't in + perl-base. + - Run kbd_mode on each tty in ACTIVE_CONSOLES rather than on the current + tty, since the current tty might belong to X and changing X's tty out + of raw mode is a very bad idea. + * Restore udeb generation. + + * Map fr_CH to ch(fr) (Swiss French). + * Include ch(fr) in keymap tree. + * Fix codeset question priority for Esperanto. + * Remove X and usplash checks in keyboard-setup and console-setup init + scripts, since neither are needed following the fix in console-setup + 1.7ubuntu19. + * Allow setupcon to be run on install again, for the same reason. + * Automatically save the font and keymap to /etc in + /etc/init.d/console-setup if it isn't being run from init; this allows + us to tolerate XKB data being moved to /usr. Similarly, ensure that the + font and keymap are saved to /etc during initial installation. + + -- Colin Watson Fri, 24 Nov 2006 18:09:32 +0000 + console-setup (1.13) unstable; urgency=low * Unfuzzy the translations. @@ -3144,6 +6132,202 @@ -- Anton Zinoviev Tue, 19 Sep 2006 11:56:15 +0300 +console-setup (1.7ubuntu19) edgy; urgency=low + + * If upgrading from an older version than this one, check for the Terminus + font face and change it to VGA (if you do like it, you can change it + back and it won't be touched again). If Terminus was in use, also check + for the 12x6 font size and change it to 16, since that was apparently + selected due to a strange use-of-debconf bug. + * Run kbd_mode on each tty in ACTIVE_CONSOLES rather than on the current + tty, since the current tty might belong to X and changing X's tty out of + raw mode is a very bad idea (closes: Malone #66929; requires kbd 1.12-15 + or console-tools 1:0.2.3dbs-62ubuntu10). + * Adjust the default keyboard model for Brazilian (closes: Malone #66774) + and Japanese (closes: Malone #66719) layouts. + + -- Colin Watson Fri, 20 Oct 2006 20:16:09 +0100 + +console-setup (1.7ubuntu18) edgy; urgency=low + + * Change the default font to VGA where supported; Terminus does not seem + to have widespread aesthetic appeal. + * Use jp(latin),jp rather than us,jp by default for Japanese, and set the + model to jp106 (closes: Malone #63915). + * Build-depend on keymapper (>= 0.5.3-7) for improved Alt-handling logic. + + -- Colin Watson Thu, 12 Oct 2006 02:42:15 +0100 + +console-setup (1.7ubuntu17) edgy; urgency=low + + * Only default to Canadian layout for fr_CA; use U.S. English for other + *_CA locales (closes: Malone #64418). + * Install kbdnames-maker in /usr/share/console-setup, to make it easier + for non-Perl programs to use KeyboardNames.pl. + + -- Colin Watson Wed, 11 Oct 2006 12:52:36 +0100 + +console-setup (1.7ubuntu16) edgy; urgency=low + + * Backport from trunk (Anton Zinoviev, closes: Malone #63921): + - New mini-font georgian16.bdf to be used for the Georgian letters in + Fixed16, author: Gia Shervashidze. Thanks to Vladimer Sichinava. + + -- Colin Watson Wed, 4 Oct 2006 11:37:15 +0100 + +console-setup (1.7ubuntu15) edgy; urgency=low + + * Fix build failure caused by wrong path to KeyboardNames.pl. + + -- Colin Watson Tue, 3 Oct 2006 15:44:59 +0100 + +console-setup (1.7ubuntu14) edgy; urgency=low + + * Ship KeyboardNames.pl in /usr/share/console-setup. + + -- Colin Watson Tue, 3 Oct 2006 11:09:27 +0100 + +console-setup (1.7ubuntu13) edgy; urgency=low + + * Remove obsolete XORGCONFIGFILE variable. + * Reset console-setup/toggle to the default if it's set to "No toggling" + and you select a non-Latin layout (closes: Malone #63178). + + -- Colin Watson Mon, 2 Oct 2006 14:47:58 +0100 + +console-setup (1.7ubuntu12) edgy; urgency=low + + * Don't run the init script (and thereby setupcon) on upgrade; just print + a message telling you to run setupcon from a virtual console if you want + to update your console configuration (closes: Malone #61723). + * Update debian-installer/keymap handling from trunk (Anton Zinoviev). + Drop /etc/X11/xorg.conf upgrade handling, also per trunk, as I've been + convinced that that is much less safe due to the prevalence of GNOME/KDE + keymap overrides, and furthermore it made it more difficult to have + ubiquity tell console-setup just to guess a default from the locale. + * Drop the priority of the model and layout questions to medium if a + configuration file already exists, since they'll have been asked at + medium first time round and if we then ask them at critical the second + time round they will be unexpectedly shown (closes: Malone #59883). + * Backport from trunk: + - config.proto: Handle properly the case when the user backs up from the + first Debconf question. + + -- Colin Watson Sat, 23 Sep 2006 00:40:48 +0100 + +console-setup (1.7ubuntu11) edgy; urgency=low + + * Fix default layout for Bosnian and default variant for Hindi. + + -- Colin Watson Fri, 22 Sep 2006 15:57:23 +0100 + +console-setup (1.7ubuntu10) edgy; urgency=low + + * console-setup Depends: perl; something in ckbcomp is causing perl to + 'use utf8' implicitly, and some of the necessary modules aren't in + perl-base (closes: Malone #60203). + * Allow preseeding of console-setup/modelcode, console-setup/layoutcode, + console-setup/variantcode, console-setup/optionscode, and + console-setup/fontsize. + * Don't set up the console font at boot time if usplash is running, since + that seems to trigger a kernel bug that corrupts the usplash display + (closes: Malone #60483). + + -- Colin Watson Thu, 21 Sep 2006 01:01:54 +0100 + +console-setup (1.7ubuntu9) edgy; urgency=low + + * Switch build-dependency and dependency back to xkb-data, now that it's + fixed. Make the dependencies versioned until after Edgy is released to + avoid problems with partially-upgraded systems where only the broken + xkb-data is installed. + + -- Colin Watson Wed, 13 Sep 2006 10:24:20 +0100 + +console-setup (1.7ubuntu8) edgy; urgency=low + + * Add setupcon --force option and use it in postinst (Anton Zinoviev, + http://lists.alioth.debian.org/pipermail/pkg-kbd-devel/2006-August/000278.html). + * Check $DISPLAY rather than /proc/self/fd/2 in /etc/init.d/keyboard-setup + and /etc/init.d/console-setup; use setupcon --force. + + -- Colin Watson Mon, 11 Sep 2006 09:47:36 +0100 + +console-setup (1.7ubuntu7) edgy; urgency=low + + * Handle debian-installer/locale not being available (closes: Malone + #59718). + * Remove stray Keyboard/amiga.ekmap in source package. + * Fix a potential infinite loop in the config script while moving past the + variant question with an unsupported layout. + + -- Colin Watson Sun, 10 Sep 2006 12:07:53 +0100 + +console-setup (1.7ubuntu6) edgy; urgency=low + + * If there's no console-setup configuration when console-setup.config + runs, then: + - If there is an xorg.conf, set the defaults from there. + - Failing that, if debian-installer/keymap is set, try to guess correct + defaults from that using the same algorithm as formerly applied by + xserver-xorg.config. The only serious change I made to the algorithm + is that it now maps (mac-usb-)uk to plain gb, not gb(intl), since + that's closer to what UK keyboard users generally expect. + + -- Colin Watson Fri, 8 Sep 2006 00:13:26 +0100 + +console-setup (1.7ubuntu5) edgy; urgency=low + + * Only call setupcon from postinst script if /lib/debian-installer exists, + to make sure we're really in d-i. (Calling setupcon from X appears to + make things rather messy.) + + -- Colin Watson Thu, 7 Sep 2006 17:11:12 +0100 + +console-setup (1.7ubuntu4) edgy; urgency=low + + * Remove cs from the list of non-Latin layouts, as it has special + per-variant handling. + * Fix syntax error in config script. + * Don't try to use the detect-keyboard plugin if running noninteractively. + + -- Colin Watson Thu, 7 Sep 2006 15:39:38 +0100 + +console-setup (1.7ubuntu3) edgy; urgency=low + + * Use keymapper to generate decision trees for a restricted subset of the + pc105 model. (I tried building trees for the whole model, but this took + far too long.) + * 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. + * Fix debian/po/POTFILES.in to point to console-setup.templates. + * Make console-setup-udeb depend on console-setup-fonts-udeb, at least for + now. + * Convert init script to LSB logging functions. + * Add a few bits of installer integration to console-setup-udeb borrowed + from kbd-chooser (/lib/debian-installer.d/S55console-setup, + post-base-installer hook). + * Temporarily build-depend and depend on just xkeyboard-config to work + around Malone #59220. + * Set default charmap for d-i to UTF-8. + * Remove unhelpful "none" defaults for several questions. + + -- Colin Watson Thu, 7 Sep 2006 09:18:42 +0100 + +console-setup (1.7ubuntu2) edgy; urgency=low + + * Make console-setup-udeb depend on console-tools-udeb. + + -- Tollef Fog Heen Wed, 23 Aug 2006 14:36:58 +0200 + +console-setup (1.7ubuntu1) edgy; urgency=low + + * Call setupcon with input and output from /dev/tty in postinst and make + sure setupcon understands that properly. + + -- Tollef Fog Heen Wed, 23 Aug 2006 12:54:27 +0200 + console-setup (1.7) unstable; urgency=low [ Christian Perrier ] @@ -3251,3 +6435,4 @@ and pointing few typos). -- Anton Zinoviev Sat, 14 Jan 2006 16:20:35 +0200 + diff -Nru console-setup-1.222/debian/clean console-setup-1.222ubuntu1/debian/clean --- console-setup-1.222/debian/clean 1970-01-01 01:00:00.000000000 +0100 +++ console-setup-1.222ubuntu1/debian/clean 2023-06-29 15:02:02.000000000 +0200 @@ -0,0 +1 @@ +Keyboard/tree-keymaps/ diff -Nru console-setup-1.222/debian/console-setup.apport console-setup-1.222ubuntu1/debian/console-setup.apport --- console-setup-1.222/debian/console-setup.apport 1970-01-01 01:00:00.000000000 +0100 +++ console-setup-1.222ubuntu1/debian/console-setup.apport 2023-06-29 15:02:02.000000000 +0200 @@ -0,0 +1,13 @@ +'''apport package hook for console-setup + +Copyright (C) 2009 Canonical Ltd. +Author: Colin Watson +''' + +import apport.hookutils + +def add_info(report): + apport.hookutils.attach_file_if_exists( + report, '/etc/default/keyboard', 'Keyboard') + apport.hookutils.attach_file_if_exists( + report, '/etc/default/console-setup', 'ConsoleSetup') diff -Nru console-setup-1.222/debian/console-setup.config console-setup-1.222ubuntu1/debian/console-setup.config --- console-setup-1.222/debian/console-setup.config 2023-06-21 21:20:52.000000000 +0200 +++ console-setup-1.222ubuntu1/debian/console-setup.config 2023-06-29 15:02:02.000000000 +0200 @@ -215,7 +215,14 @@ fi if [ "$locale" = C ]; then - CHARMAP=ISO-8859-15 + case "$kernel" in + freebsd) + CHARMAP=ISO-8859-15 + ;; + *) + CHARMAP=UTF-8 + ;; + esac charmap_priority=high elif which locale 2>/dev/null >/dev/null; then CHARMAP=`locale charmap` @@ -680,7 +687,6 @@ FONTFACE=Fixed ;; Lat15) - FONTFACE=Fixed ;; Lat2) FONTFACE=Fixed @@ -719,8 +725,6 @@ esac fi -FONTSIZE=16 - ### READ THE DEFAULTS ################################################## # Load the config file, if it exists. diff -Nru console-setup-1.222/debian/console-setup.initramfs-hook console-setup-1.222ubuntu1/debian/console-setup.initramfs-hook --- console-setup-1.222/debian/console-setup.initramfs-hook 1970-01-01 01:00:00.000000000 +0100 +++ console-setup-1.222ubuntu1/debian/console-setup.initramfs-hook 2023-06-29 15:02:02.000000000 +0200 @@ -0,0 +1,118 @@ +#! /bin/sh -e + +PREREQ="kbd|console_tools" + +prereqs () { + echo "$PREREQ" +} + +case $1 in +prereqs) + prereqs + exit 0 + ;; +esac + +. /usr/share/initramfs-tools/hook-functions +[ -r /etc/default/keyboard ] || exit 0 +[ -r /etc/default/console-setup ] || exit 0 +. /etc/default/console-setup # also sources /etc/default/keyboard + +# CODESET +[ "$CODESET" != guess ] || CODESET='' +if [ -z "$CODESET" ]; then + case "$CHARMAP" in + UTF-8) CODESET=Uni2;; + ARMSCII-8) CODESET=Armenian ;; + CP1251) CODESET=CyrSlav ;; + CP1255) CODESET=Hebrew ;; + CP1256) CODESET=Arabic ;; + GEORGIAN-ACADEMY) CODESET=Georgian ;; + GEORGIAN-PS) CODESET=Georgian ;; + IBM1133) CODESET=Lao ;; + ISIRI-3342) CODESET=Arabic ;; + ISO-8859-1) CODESET=Lat15 ;; + ISO-8859-2) CODESET=Lat2 ;; + ISO-8859-3) CODESET=Lat38 ;; + ISO-8859-4) CODESET=Lat7 ;; # sometimes Lat15 + ISO-8859-5) CODESET=CyrSlav ;; + ISO-8859-6) CODESET=Arabic ;; + ISO-8859-7) CODESET=Greek ;; + ISO-8859-8) CODESET=Hebrew ;; + ISO-8859-9) CODESET=Lat15 ;; + ISO-8859-10) CODESET=Lat15 ;; + ISO-8859-11) CODESET=Thai ;; + ISO-8859-13) CODESET=Lat7 ;; + ISO-8859-14) CODESET=Lat38 ;; + ISO-8859-15) CODESET=Lat15 ;; + ISO-8859-16) CODESET=Lat2 ;; + KOI8-R) CODESET=CyrKoi ;; + KOI8-U) CODESET=CyrKoi ;; + TIS-620) CODESET=Thai ;; + VISCII) CODESET=Vietnamese ;; + *) ;; + esac +fi + +# FONTSIZE +if [ -z "$FONTSIZE" -o "$FONTSIZE" = guess ]; then + FONTSIZE=16 +fi +case "$FONTSIZE" in + 8x*) + FONTSIZE=${FONTSIZE#*x} + ;; + *x8) + FONTSIZE=${FONTSIZE%x*} + ;; + *x*) + a=${FONTSIZE%x*} + b=${FONTSIZE#*x} + if [ "$a" -lt "$b" ]; then + FONTSIZE=${b}x${a} + fi + ;; +esac + +# Copy console-setup configuration +mkdir -p "$DESTDIR/etc/default" +cp -p /etc/default/keyboard "$DESTDIR/etc/default" +cp -p /etc/default/console-setup "$DESTDIR/etc/default" + +# Assume setupcon --save has been run +if [ -f "$FONT" ]; then + FONT="/etc/console-setup/${FONT##*/}" + FONT="${FONT%.gz}" +else + FONT="/etc/console-setup/$CODESET-$FONTFACE$FONTSIZE.psf" +fi +if [ -f "$FONT" ]; then + mkdir -p "$DESTDIR${FONT%/*}" + cp -p "$FONT" "$DESTDIR$FONT" +fi +if [ -f "$FONT.gz" ]; then + mkdir -p "$DESTDIR${FONT%/*}" + cp -p "$FONT.gz" "$DESTDIR$FONT.gz" +fi +if [ -f "$ACM" ]; then + ACM="/etc/console-setup/${ACM##*/}" + ACM="${ACM%.gz}" +else + ACM="/etc/console-setup/$CHARMAP.acm" +fi +if [ -f "$ACM" ]; then + mkdir -p "$DESTDIR${ACM%/*}" + cp -p "$ACM" "$DESTDIR$ACM" +fi +if [ -f "$ACM.gz" ]; then + mkdir -p "$DESTDIR${ACM%/*}" + cp -p "$ACM.gz" "$DESTDIR$ACM.gz" +fi +if [ -f "/etc/console-setup/cached_${CHARMAP}_del.kmap.gz" ]; then + mkdir -p "$DESTDIR/etc/console-setup" + cp -p "/etc/console-setup/cached_${CHARMAP}_del.kmap.gz" \ + "$DESTDIR/etc/console-setup/cached_${CHARMAP}_del.kmap.gz" +fi + +exit 0 +a diff -Nru console-setup-1.222/debian/console-setup.initramfs-top console-setup-1.222ubuntu1/debian/console-setup.initramfs-top --- console-setup-1.222/debian/console-setup.initramfs-top 1970-01-01 01:00:00.000000000 +0100 +++ console-setup-1.222ubuntu1/debian/console-setup.initramfs-top 2023-06-29 15:02:02.000000000 +0200 @@ -0,0 +1,136 @@ +#! /bin/sh +# A crude much-simplified clone of setupcon for use in the initramfs. + +OPTION=FRAMEBUFFER +PREREQ="framebuffer" + +prereqs () { + echo "$PREREQ" +} + +case $1 in +prereqs) + prereqs + exit 0 + ;; +esac + +[ -r /etc/default/console-setup ] || exit 0 +. /etc/default/console-setup + +[ "$ACTIVE_CONSOLES" ] || exit 0 + +# CODESET +[ "$CODESET" != guess ] || CODESET='' +if [ -z "$CODESET" ]; then + case "$CHARMAP" in + UTF-8) CODESET=Uni2;; + ARMSCII-8) CODESET=Armenian ;; + CP1251) CODESET=CyrSlav ;; + CP1255) CODESET=Hebrew ;; + CP1256) CODESET=Arabic ;; + GEORGIAN-ACADEMY) CODESET=Georgian ;; + GEORGIAN-PS) CODESET=Georgian ;; + IBM1133) CODESET=Lao ;; + ISIRI-3342) CODESET=Arabic ;; + ISO-8859-1) CODESET=Lat15 ;; + ISO-8859-2) CODESET=Lat2 ;; + ISO-8859-3) CODESET=Lat38 ;; + ISO-8859-4) CODESET=Lat7 ;; # sometimes Lat15 + ISO-8859-5) CODESET=CyrSlav ;; + ISO-8859-6) CODESET=Arabic ;; + ISO-8859-7) CODESET=Greek ;; + ISO-8859-8) CODESET=Hebrew ;; + ISO-8859-9) CODESET=Lat15 ;; + ISO-8859-10) CODESET=Lat15 ;; + ISO-8859-11) CODESET=Thai ;; + ISO-8859-13) CODESET=Lat7 ;; + ISO-8859-14) CODESET=Lat38 ;; + ISO-8859-15) CODESET=Lat15 ;; + ISO-8859-16) CODESET=Lat2 ;; + KOI8-R) CODESET=CyrKoi ;; + KOI8-U) CODESET=CyrKoi ;; + TIS-620) CODESET=Thai ;; + VISCII) CODESET=Vietnamese ;; + *) ;; + esac +fi + +# FONTSIZE +if [ -z "$FONTSIZE" -o "$FONTSIZE" = guess ]; then + FONTSIZE=16 +fi +case "$FONTSIZE" in + 8x*) + FONTSIZE=${FONTSIZE#*x} + ;; + *x8) + FONTSIZE=${FONTSIZE%x*} + ;; + *x*) + a=${FONTSIZE%x*} + b=${FONTSIZE#*x} + if [ "$a" -lt "$b" ]; then + FONTSIZE=${b}x${a} + fi + ;; +esac + +if [ "$VERBOSE_OUTPUT" = yes ]; then + verbose= +else + verbose='>/dev/null 2>&1' +fi + +[ -c /dev/tty1 ] || mknod /dev/tty1 c 4 1 + +[ -w /dev/tty1 ] || continue + +if [ "$CHARMAP" = UTF-8 ] || [ -z "$ACM$CHARMAP" ]; then + printf '\033%%G' >/dev/tty1 +else + printf '\033%%@' >/dev/tty1 +fi + +if [ "$FONT" ]; then + FONT="/etc/console-setup/${FONT##*/}" + FONT="${FONT%.gz}" +else + FONT="/etc/console-setup/$CODESET-$FONTFACE$FONTSIZE.psf" +fi +if [ -f "$FONT" ] || [ -f "$FONT.gz" ]; then + if type consolechars >/dev/null 2>&1; then + eval consolechars -v --tty=/dev/tty1 -f "$FONT" $verbose + elif type setfont >/dev/null 2>&1; then + eval setfont -v -C /dev/tty1 "$FONT" $verbose + fi +fi + +if [ "$ACM" ]; then + ACM="/etc/console-setup/${ACM##*/}" + ACM="${ACM%.gz}" +else + ACM="/etc/console-setup/$CHARMAP.acm" +fi +if [ -f "$ACM" ] || [ -f "$ACM.gz" ]; then + if type consolechars >/dev/null 2>&1; then + eval consolechars -v --tty=/dev/tty1 --acm "$ACM" \ + $verbose + elif type setfont >/dev/null 2>&1; then + eval setfont -v -C "/dev/tty1" -m "$ACM" $verbose + fi +fi + +if type kbd_mode >/dev/null 2>&1; then + if [ "$CHARMAP" = UTF-8 ] || [ -z "$ACM" ]; then + kbd_mode -u /dev/null; then + eval loadkeys "/etc/console-setup/cached_${CHARMAP}_del.kmap.gz" $verbose +fi + +exit 0 diff -Nru console-setup-1.222/debian/console-setup-linux.postinst console-setup-1.222ubuntu1/debian/console-setup-linux.postinst --- console-setup-1.222/debian/console-setup-linux.postinst 1970-01-01 01:00:00.000000000 +0100 +++ console-setup-1.222ubuntu1/debian/console-setup-linux.postinst 2023-06-29 15:02:02.000000000 +0200 @@ -0,0 +1,11 @@ +#!/bin/sh + +set -e + +CONFIGDIR=/etc/console-setup + +update-alternatives --install /etc/vtrgb vtrgb "$CONFIGDIR/vtrgb" 50 +update-alternatives --install /etc/vtrgb vtrgb "$CONFIGDIR/vtrgb.vga" 20 + +#DEBHELPER# + diff -Nru console-setup-1.222/debian/console-setup-linux.prerm console-setup-1.222ubuntu1/debian/console-setup-linux.prerm --- console-setup-1.222/debian/console-setup-linux.prerm 1970-01-01 01:00:00.000000000 +0100 +++ console-setup-1.222ubuntu1/debian/console-setup-linux.prerm 2023-06-29 15:02:02.000000000 +0200 @@ -0,0 +1,12 @@ +#!/bin/sh + +set -e + +CONFIGDIR=/etc/console-setup + +if [ "$1" = remove ]; then + update-alternatives --remove vtrgb "$CONFIGDIR/vtrgb" + update-alternatives --remove vtrgb "$CONFIGDIR/vtrgb.vga" +fi + +#DEBHELPER# diff -Nru console-setup-1.222/debian/console-setup-linux.setvtrgb.service console-setup-1.222ubuntu1/debian/console-setup-linux.setvtrgb.service --- console-setup-1.222/debian/console-setup-linux.setvtrgb.service 1970-01-01 01:00:00.000000000 +0100 +++ console-setup-1.222ubuntu1/debian/console-setup-linux.setvtrgb.service 2023-06-29 15:02:02.000000000 +0200 @@ -0,0 +1,15 @@ +[Unit] +Description=Set console scheme +DefaultDependencies=no +After=systemd-user-sessions.service plymouth-quit-wait.service +Before=system-getty.slice +ConditionPathExists=/sbin/setvtrgb +ConditionPathExists=/dev/tty0 + +[Service] +Type=oneshot +ExecStart=/sbin/setvtrgb /etc/vtrgb +RemainAfterExit=yes + +[Install] +WantedBy=sysinit.target diff -Nru console-setup-1.222/debian/console-setup.postinst console-setup-1.222ubuntu1/debian/console-setup.postinst --- console-setup-1.222/debian/console-setup.postinst 2023-06-21 21:20:52.000000000 +0200 +++ console-setup-1.222ubuntu1/debian/console-setup.postinst 2023-06-29 15:02:02.000000000 +0200 @@ -131,7 +131,25 @@ # We redirect the output so that postinst does not block when ScrollLock is on # This works even if we are not on the console setupcon --save-only >/dev/null 2>/dev/null || true -# This will protest if we are not on the console -setupcon >/dev/null 2>/dev/null || true +if type plymouth >/dev/null && plymouth --ping; then + # setting the keymap breaks with plymouth in raw mode, and setting the + # font will currently also break if on vgacon + : +elif [ -d /lib/debian-installer ]; then + setupcon --force >/dev/null 2>/dev/null || true +else + if ! setupcon >/dev/null 2>/dev/null; then + cat >&2 </dev/null 2>&1; then + update-initramfs -u +fi + +exit 0 diff -Nru console-setup-1.222/debian/console-setup-udeb.base-installer console-setup-1.222ubuntu1/debian/console-setup-udeb.base-installer --- console-setup-1.222/debian/console-setup-udeb.base-installer 2023-06-21 21:20:52.000000000 +0200 +++ console-setup-1.222ubuntu1/debian/console-setup-udeb.base-installer 2023-06-29 15:02:02.000000000 +0200 @@ -18,15 +18,16 @@ cp -a /etc/default/keyboard /target/etc/default/ LANG=C export LANG - # create the required templates - debconf-copydb -p "^keyboard-configuration/.*$" configdb target_configdb + if ! db_get oem-config/enable || [ "$RET" != true ]; then + # create the required templates + debconf-copydb -p "^keyboard-configuration/.*$" configdb target_configdb - # mark the questions as seen - for template in \ -## SEEN TEMPLATES ## all templates of keyb-conf except alerts and ctrl_alt_bksp - do - echo keyboard-configuration $template seen true - done | chroot /target debconf-set-selections + # mark the questions as seen + for template in \## SEEN TEMPLATES ## all templates of keyb-conf except alerts and ctrl_alt_bksp + do + echo keyboard-configuration $template seen true + done | chroot /target debconf-set-selections + fi ###################################################################### apt-install keyboard-configuration || true diff -Nru console-setup-1.222/debian/console-setup-udeb.postinst console-setup-1.222ubuntu1/debian/console-setup-udeb.postinst --- console-setup-1.222/debian/console-setup-udeb.postinst 2023-06-21 21:20:52.000000000 +0200 +++ console-setup-1.222ubuntu1/debian/console-setup-udeb.postinst 2023-06-29 15:02:02.000000000 +0200 @@ -79,21 +79,42 @@ db_set keyboard-configuration/store_defaults_in_debconf_db true fi -if \ - [ -d /lib/debian-installer.d ] && keyboard_present +if [ -d /lib/debian-installer ]; then if [ "$DISPLAY" ] && which setxkbmap >/dev/null; then - setxkbmap -option '' -model "$model" "$layout" "$variant" "$options" + setxkbmap -option '' -model "$model" "$layout" "$variant" "$options" || true + # setting the font corrupts X + # setting up the keyboard breaks wayland + if type setupcon >/dev/null 2>&1; then + # We redirect the output so that postinst does not block when ScrollLock is on + setupcon --save-only >/dev/null 2>/dev/null || true + cat >&2 </dev/null 2>&1; then + setupcon --force --save >/dev/null 2>/dev/null || true + fi ;; esac fi +else + # Setting the keymap breaks plymouth in raw mode, and setting the + # font will currently also break if on vgacon. + # Setting the font also corrupts X and postinst may be running with + # stripped environment thus we can't even detect X easily. + setupcon --save-only >/dev/null 2>/dev/null || true + cat >&2 </dev/null 2>&1; then + update-initramfs -u +fi + +exit 0 diff -Nru console-setup-1.222/debian/console-setup-udeb.templates console-setup-1.222ubuntu1/debian/console-setup-udeb.templates --- console-setup-1.222/debian/console-setup-udeb.templates 2023-06-21 21:20:52.000000000 +0200 +++ console-setup-1.222ubuntu1/debian/console-setup-udeb.templates 2023-06-29 15:02:02.000000000 +0200 @@ -99,7 +99,7 @@ Type: select # :sl1: __Choices: Caps Lock, Right Alt (AltGr), Right Control, Right Shift, Right Logo key, Menu key, Alt+Shift, Control+Shift, Control+Alt, Alt+Caps Lock, Left Control+Left Shift, Left Alt, Left Control, Left Shift, Left Logo key, Scroll Lock key, No toggling -Default: Alt+Shift +Default: No toggling # :sl1: _Description: Method for toggling between national and Latin mode: You will need a way to toggle the keyboard between the national @@ -191,3 +191,23 @@ Type: boolean Default: true Description: for internal use + +Template: console-setup/ask_detect +Type: boolean +Default: false +_Description: Detect keyboard layout? + You can try to have your keyboard layout detected by pressing a series of + keys. If you do not want to do this, you will be able to select your + keyboard layout from a list. + +Template: console-setup/detect +Type: detect-keyboard +Choices: ${FILENAME} +_Description: Detecting your keyboard layout + +Template: console-setup/detected +Type: note +_Description: Keyboard layout detection complete + Based on the keys you pressed, your keyboard layout appears to be + "${LAYOUT}". If this is not correct, you can go back and select your layout + from the full list instead. diff -Nru console-setup-1.222/debian/control console-setup-1.222ubuntu1/debian/control --- console-setup-1.222/debian/control 2023-06-21 21:20:52.000000000 +0200 +++ console-setup-1.222ubuntu1/debian/control 2023-06-29 15:02:02.000000000 +0200 @@ -1,9 +1,10 @@ Source: console-setup Section: utils Priority: optional -Maintainer: Debian Install System Team +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Install System Team Uploaders: Anton Zinoviev -Build-Depends-Indep: xkb-data (>= 1.6), locales-all, sharutils +Build-Depends-Indep: xkb-data (>= 1.6), locales-all, sharutils, keymapper Build-Depends: perl, debhelper (>= 9.20160709), po-debconf, libxml-parser-perl, bdfresize, liblocale-gettext-perl, unifont, unifont-bin Standards-Version: 3.9.1 Vcs-Browser: https://salsa.debian.org/installer-team/console-setup @@ -75,17 +76,6 @@ This package includes fonts in psf format and definitions of various 8-bit charmaps. -Package: console-setup-freebsd -Architecture: all -Multi-Arch: foreign -Depends: vidcontrol, kbdcontrol, keyboard-configuration (= ${source:Version}), ${misc:Depends}, init-system-helpers (>= 1.29~) | initscripts -Suggests: console-setup -Conflicts: console-setup-linux -Breaks: console-setup (<< 1.71) -Replaces: console-setup (<< 1.71) -Description: FreeBSD specific part of console-setup - This package includes raw, uuencoded fonts and various screen maps. - Package: bdf2psf Architecture: all Multi-Arch: foreign @@ -110,12 +100,13 @@ Package: console-setup-udeb Section: debian-installer -Depends: archdetect, cdebconf-udeb, kbd-udeb | kbdcontrol-udeb | hurd-udeb, ${misc:Depends} +Depends: archdetect, cdebconf-udeb, kbd-udeb | kbdcontrol-udeb | hurd-udeb, cdebconf-newt-detect-keys, ${misc:Depends} Provides: keyboard-setup Architecture: all Description: Configure the keyboard Keyboard configurator for Debian Installer based on console-setup Package-Type: udeb +Build-Profiles: XB-Installer-Menu-Item: 1200 Package: console-setup-amiga-ekmap @@ -125,6 +116,7 @@ Architecture: all Description: encoded Linux keyboard layouts for Amiga keyboards Package-Type: udeb +Build-Profiles: Package: console-setup-ataritt-ekmap Provides: console-setup-ekmap @@ -133,6 +125,7 @@ Architecture: all Description: encoded Linux keyboard layouts for Atari TT keyboards Package-Type: udeb +Build-Profiles: Package: console-setup-pc-ekmap Provides: console-setup-ekmap @@ -141,6 +134,7 @@ Architecture: all Description: encoded Linux keyboard layouts for PC keyboards Package-Type: udeb +Build-Profiles: Package: console-setup-sun4-ekmap Provides: console-setup-ekmap @@ -149,6 +143,7 @@ Architecture: all Description: encoded Linux keyboard layouts for Sun4 keyboards Package-Type: udeb +Build-Profiles: Package: console-setup-sun5-ekmap Provides: console-setup-ekmap @@ -157,6 +152,7 @@ Architecture: all Description: encoded Linux keyboard layouts for Sun5 keyboards Package-Type: udeb +Build-Profiles: Package: console-setup-pc-ekbd Provides: console-setup-ekmap @@ -165,6 +161,7 @@ Architecture: all Description: encoded FreeBSD keyboard layouts for PC keyboards Package-Type: udeb +Build-Profiles: Package: console-setup-linux-fonts-udeb Section: debian-installer @@ -172,13 +169,7 @@ Architecture: all Description: Linux console fonts for Debian Installer Package-Type: udeb - -Package: console-setup-freebsd-fonts-udeb -Section: debian-installer -Depends: ${misc:Depends} -Architecture: all -Description: FreeBSD console fonts for Debian Installer -Package-Type: udeb +Build-Profiles: Package: console-setup-linux-charmaps-udeb Section: debian-installer @@ -186,10 +177,4 @@ Architecture: all Description: Linux 8-bit charmaps for console-setup-udeb Package-Type: udeb - -Package: console-setup-freebsd-charmaps-udeb -Section: debian-installer -Depends: ${misc:Depends} -Architecture: all -Description: FreeBSD 8-bit charmaps for console-setup-udeb -Package-Type: udeb +Build-Profiles: diff -Nru console-setup-1.222/debian/keyboard-configuration.config console-setup-1.222ubuntu1/debian/keyboard-configuration.config --- console-setup-1.222/debian/keyboard-configuration.config 2023-06-21 21:20:52.000000000 +0200 +++ console-setup-1.222ubuntu1/debian/keyboard-configuration.config 2023-06-29 15:02:02.000000000 +0200 @@ -78,6 +78,14 @@ XKBVARIANT='' XKBOPTIONS='' +CAPB="$RET" +detect_keyboard=false +case $CAPB in + *plugin-detect-keyboard*) + detect_keyboard=: + ;; +esac + if [ -f /usr/share/console-setup/keyboard-configuration.config ]; then is_debian_installer=yes is_not_debian_installer='' @@ -88,9 +96,20 @@ ###################################################################### # Define auxiliary the functions db_default, regex_excape, -# regex_pattern_escape and regex_unescape. +# regex_pattern_escape, regex_unescape, and read_config. ###################################################################### +read_config() { + [ -r $1 ] || return 0 + . $1 || true + # Treat missing XKBOPTIONS as empty, other vars have sane defaults: + for var in XKBOPTIONS; do + if ! grep "^ *${var}=" $1 >/dev/null; then + eval ${var}="" + fi + done +} + which () { local IFS IFS=: @@ -353,6 +372,16 @@ locale=C fi +langcountry="$locale" +if ! type locale >/dev/null 2>&1 || [ "$OVERRIDE_USE_DEBCONF_LOCALE" ]; then + if db_get localechooser/languagelist && [ "$RET" ]; then + lang="$RET" + if db_get debian-installer/country && [ "$RET" ]; then + langcountry="${lang}_$RET" + fi + fi +fi + if [ "$LC_MESSAGES" -a "$LC_MESSAGES" != C ]; then messages=$LC_MESSAGES elif db_get debian-installer/locale && [ "$RET" ]; then @@ -476,6 +505,10 @@ XKBMODEL=pc105 model_priority=medium ;; + ppc64el/*) + XKBMODEL=pc105 + model_priority=medium + ;; sparc*) XKBMODEL=pc105 # sun4 or sun5 on older kernels model_priority=medium @@ -490,8 +523,8 @@ ;; esac -layout_priority=critical -case "$locale" in +layout_priority=high +case "$langcountry" in # Keyboards for countries *_AL*) XKBLAYOUT=al # Albania @@ -637,8 +670,11 @@ *_MK*) XKBLAYOUT=us,mk # Macedonia ;; +# According to https://launchpad.net/bugs/129982, Dutch users prefer the US +# intl keymap. *_NL*) XKBLAYOUT=us # Netherlands + XKBVARIANT=intl # International (with dead keys) ;; *_MM*) XKBLAYOUT=us,mm # Myanmar @@ -696,6 +732,10 @@ XKBLAYOUT=us,th # Thailand layout_priority=critical ;; + ku_TR*) + XKBLAYOUT=tr # Turkish + XKBVARIANT=ku # Kurdish, Latin Q + ;; *_TR*) XKBLAYOUT=tr # Turkish layout_priority=critical @@ -706,8 +746,10 @@ en_US*) XKBLAYOUT=us # U.S. English ;; +# According to https://launchpad.net/bugs/191451, most keyboards in Vietnam +# are in fact US keyboards. *_VN*) - XKBLAYOUT=vn # Vietnam + XKBLAYOUT=us # Vietnam ;; *_ZA*) XKBLAYOUT=za # South Africa @@ -742,7 +784,7 @@ ;; fr_*) XKBLAYOUT=fr # France - XKBVARIANT=latin9 + XKBVARIANT=oss # Alternative layout_priority=critical ;; gu_*) @@ -851,20 +893,20 @@ ###################################################################### # Get defaults from debconf, to allow preseeding in the udeb -if db_get keyboard-configuration/xkb-keymap && [ "$RET" ]; then - keymap="$RET" - layout="${keymap%\(*}" - variant="${keymap#$layout}" - variant="${variant%\)}" - variant="${variant#\(}" - XKBLAYOUT="$layout" - XKBVARIANT="$variant" -fi if db_get keyboard-configuration/modelcode && [ "$RET" ]; then XKBMODEL="$RET" fi if db_get keyboard-configuration/layoutcode && [ "$RET" ]; then + # Don't use the default variant if the layout is being overridden. + if [ "$RET" != "$XKBLAYOUT" ]; then + XKBVARIANT='' + fi XKBLAYOUT="$RET" + if db_fget keyboard-configuration/layoutcode seen && [ "$RET" = true ]; then + layout_priority=medium + db_set console-setup/ask_detect false + db_fset console-setup/ask_detect seen true + fi fi if db_get keyboard-configuration/variantcode && [ "$RET" ]; then XKBVARIANT="$RET" @@ -1004,13 +1046,9 @@ fi # Load the config file, if it exists. Overwrite the current values of -# XKBMODEL, XKBLAYOUT, XKBVARIANT, etc. in the process. -if [ -e $OLDCONFIGFILE ]; then - . $OLDCONFIGFILE || true -fi -if [ -e $CONFIGFILE ]; then - . $CONFIGFILE || true -fi +# XKBMODEL, XKBLAYOUT, XKBVARIANT, and XKBOPTIONS in the process. +read_config $OLDCONFIGFILE +read_config $CONFIGFILE XKBMODEL=$(echo $XKBMODEL | sed 's/ *//g') XKBLAYOUT=$(echo $XKBLAYOUT | sed 's/ *//g') @@ -1046,7 +1084,7 @@ db_set keyboard-configuration/variantcode "$XKBVARIANT" if [ -z "$XKBOPTIONS" -a ! -f $CONFIGFILE ]; then case "$XKBLAYOUT" in - *,*) XKBOPTIONS="grp:alt_shift_toggle,grp_led:scroll";; + *,*) XKBOPTIONS="grp_led:scroll";; us) XKBOPTIONS="";; *) XKBOPTIONS="lv3:ralt_switch";; esac @@ -1120,7 +1158,7 @@ # Compute debconf_* variables based on the value of $XKBOPTIONS. The # values of these variables are human-friendly text. -debconf_toggle='Alt+Shift' +debconf_toggle='No toggling' debconf_switch='No temporary switch' debconf_altgr='The default for the keyboard layout' debconf_compose='No compose key' @@ -1227,17 +1265,6 @@ db_default keyboard-configuration/compose "$debconf_compose" db_default keyboard-configuration/ctrl_alt_bksp "$debconf_ctrl_alt_bksp" -# Compute a default value for the xkb-keymap question used by the -# Debian installer (one question listing all supported layouts instead -# of one question for the layout only and another for the variant). -# Store the value in the debconf db. -if [ -n "$debconf_variant" ]; then - debconf_keymap="$debconf_layout($debconf_variant)" -else - debconf_keymap="$debconf_layout" -fi -db_default keyboard-configuration/xkb-keymap "$debconf_keymap" - ####################################################################### # Ask the Debconf questions starting from STATE=1. ####################################################################### @@ -1280,17 +1307,65 @@ ;; 2) if \ - [ "$unsupported_layout" = yes -a "$is_not_debian_installer" ] - then - # We use two different Debconf templates for the - # question about unsupported configuration. One for - # the case when the unsupported layout/variant - # combination has been taken from existing - # configuration file (obviously in this case the admin - # is responsible) and another for the case when it has - # been computed based on the system configuration such - # as the locale or xorg.conf (in which case the user - # may be unaware). + $detect_keyboard \ + && [ "$XKBMODEL" != SKIP ] \ + && [ -e "/usr/share/console-setup-mini/$XKBMODEL.tree" ] + then + db_input high console-setup/ask_detect || true + if db_go; then + STATE=$(($STATE + 1)) + else + STATE=$(($STATE - 1)) + fi + else + STATE=$(($STATE + $STATE - $old_state)) + fi + ;; + 3) + if \ + [ "$STATE" -ge "$old_state" ] \ + && $detect_keyboard \ + && [ "$XKBMODEL" != SKIP ] \ + && [ -e "/usr/share/console-setup-mini/$XKBMODEL.tree" ] \ + && db_get console-setup/ask_detect \ + && [ "$RET" = true ] + then + db_subst console-setup/detect FILENAME \ + "/usr/share/console-setup-mini/$XKBMODEL.tree" + if db_input critical console-setup/detect && db_go; then + db_get console-setup/detect + detected_keyboard="$RET" + # TODO: produce human-readable layout name + db_subst console-setup/detected LAYOUT "$detected_keyboard" + db_input high console-setup/detected || true + if db_go; then + unsupported_layout=no + STATE=$(($STATE + 1)) + else + detected_keyboard= + STATE=$(($STATE - 1)) + fi + else + STATE=$(($STATE - 1)) + fi + else + detected_keyboard= + STATE=$(($STATE + $STATE - $old_state)) + fi + ;; + 4) + if [ "$detected_keyboard" ] || [ "$XKBMODEL" = SKIP ]; then + STATE=$(( $STATE + $STATE - $old_state )) + elif [ "$unsupported_layout" = yes ]; then + # For the question about the keeping of the + # unsupported configuration we use two different + # Debconf templates depending on whether the + # unsupported layout/variant combination has been + # taken from existing configuration file (obviously in + # this case the admin is responsible) or it has been + # computed based on the system configuration such as + # the locale or xorg.conf (in which case the user may + # be unaware). if [ -f $CONFIGFILE ]; then template=keyboard-configuration/unsupported_config_layout else @@ -1343,27 +1418,16 @@ STATE=$(( $STATE + $STATE - $old_state )) fi ;; - 3) - if [ "$is_debian_installer" ]; then - # ask simplified layout question in Debian installer - db_input critical keyboard-configuration/xkb-keymap || true - if db_go; then - db_fset keyboard-configuration/layout seen true - db_fset keyboard-configuration/variant seen true - db_get keyboard-configuration/xkb-keymap - keymap="$RET" - debconf_layout="${keymap%\(*}" - debconf_variant="${keymap#$debconf_layout}" - debconf_variant="${debconf_variant%\)}" - debconf_variant="${debconf_variant#\(}" - STATE=$(($STATE + 1)) - else - STATE=$(($STATE - 1)) - fi - elif [ "$unsupported_layout" = yes ]; then + 5) + if [ "$detected_keyboard" ]; then + XKBLAYOUT="${detected_keyboard%%:*}" + debconf_layout="$XKBLAYOUT" + db_set keyboard-configuration/layoutcode "$XKBLAYOUT" # skip the question without making Debconf loop STATE=$(( $STATE + $STATE - $old_state )) - elif [ "$debconf_variant" != other ]; then + elif [ "$XKBMODEL" = SKIP ]; then + STATE=$(( $STATE + $STATE - $old_state )) + elif [ "$unsupported_layout" = yes ]; then # skip the question without making Debconf loop STATE=$(( $STATE + $STATE - $old_state )) elif \ @@ -1377,38 +1441,44 @@ STATE=$(($STATE + 1)) fi ;; - 4) - db_metaget keyboard-configuration/other description - othertext="$RET" - if [ "$unsupported_layout" = yes ]; then + 6) + adjust_layout=false + if [ "$detected_keyboard" ]; then + case $detected_keyboard in + *:*) + variant="${detected_keyboard#*:}" + ;; + *) + variant= + ;; + esac + debconf_variant="$variant" + adjust_layout=: # skip the question without making Debconf loop STATE=$(( $STATE + $STATE - $old_state )) - elif [ "$is_debian_installer" ]; then - # skip the question without making Debconf loop + elif [ "$XKBMODEL" = SKIP ]; then STATE=$(( $STATE + $STATE - $old_state )) - else - if \ - ! ask_debconf keyboard-configuration/variant \ - "$layout_priority" \ - "variant*${debconf_layout}" \ - "$debconf_variant" \ - "variant*${debconf_layout}*other*$othertext" - then - # skip the previous question - starting_state=$(($STATE - 1)) - STATE=$(($STATE - 2)) - elif [ "$RET" = other ]; then - debconf_variant="$RET" - STATE=$(($STATE - 1)) - else - debconf_variant="$RET" - STATE=$(($STATE + 1)) - fi - fi + elif [ "$unsupported_layout" = yes ]; then + STATE=$(( $STATE + $STATE - $old_state )) + elif \ + ! ask_debconf keyboard-configuration/variant \ + "$layout_priority" \ + "variant*${debconf_layout}" \ + "$debconf_variant" + then + # skip the previous question + starting_state=$(($STATE - 1)) + STATE=$(($STATE - 2)) + else + debconf_variant="$RET" + variant="$RET" + adjust_layout=: + STATE=$(($STATE + 1)) + fi # Compute $XKBLAYOUT and $XKBVARIANT and store their # values in debconf db. - if [ "$unsupported_layout" != yes ]; then + if $adjust_layout; then case "$debconf_layout" in rs) case "$debconf_variant" in @@ -1422,7 +1492,7 @@ ;; jp) case "$debconf_variant" in - 106|common|OADG109A|'') + 106|common|OADG109A|nicola_f_bs|'') XKBLAYOUT=$debconf_layout ;; *) @@ -1433,9 +1503,16 @@ lt) XKBLAYOUT=lt,us ;; - # TODO: make s.t. to not forget to update this - # list. Do not forget to update also the - # nonlatin list in kbdcompiler + me) + case "$debconf_variant" in + basic|latin*) + XKBLAYOUT=$debconf_layout + ;; + *) + XKBLAYOUT=me,me + ;; + esac + ;; af|am|ara|ben|bd|bg|bt|by|et|ge|gh|gr|guj|guru|il|'in'|iq|ir|iku|kan|kh|kz|la|lao|lk|kg|ma|mk|mm|mn|mv|mal|np|ori|pk|ru|scc|sy|syr|tel|th|tj|tam|tib|ua|ug|uz) XKBLAYOUT=us,$debconf_layout ;; @@ -1473,7 +1550,7 @@ db_set keyboard-configuration/layoutcode "$XKBLAYOUT" db_set keyboard-configuration/variantcode "$XKBVARIANT" ;; - 5) + 7) if \ [ "$unsupported_options" = yes -a "$is_not_debian_installer" ] then @@ -1504,11 +1581,13 @@ STATE=$(( $STATE + $STATE - $old_state )) fi ;; - 6) + 8) if [ "$unsupported_options" = yes ]; then db_set keyboard-configuration/optionscode "$XKBOPTIONS" # skip the questions without making Debconf loop STATE=$(( $STATE + $STATE - $old_state )) + elif [ "$XKBMODEL" = SKIP ]; then + STATE=$(( $STATE + $STATE - $old_state )) else caps_allocated=no lalt_allocated=no diff -Nru console-setup-1.222/debian/keyboard-configuration.postinst console-setup-1.222ubuntu1/debian/keyboard-configuration.postinst --- console-setup-1.222/debian/keyboard-configuration.postinst 2023-06-21 21:20:52.000000000 +0200 +++ console-setup-1.222ubuntu1/debian/keyboard-configuration.postinst 2023-06-29 15:02:02.000000000 +0200 @@ -79,21 +79,42 @@ db_set keyboard-configuration/store_defaults_in_debconf_db true fi -if \ - [ -d /lib/debian-installer.d ] && keyboard_present +if [ -d /lib/debian-installer ]; then if [ "$DISPLAY" ] && which setxkbmap >/dev/null; then - setxkbmap -option '' -model "$model" "$layout" "$variant" "$options" + setxkbmap -option '' -model "$model" "$layout" "$variant" "$options" || true + # setting the font corrupts X + # setting up the keyboard breaks wayland + if type setupcon >/dev/null 2>&1; then + # We redirect the output so that postinst does not block when ScrollLock is on + setupcon --save-only >/dev/null 2>/dev/null || true + cat >&2 </dev/null 2>&1; then + setupcon --force --save >/dev/null 2>/dev/null || true + fi ;; esac fi +else + # Setting the keymap breaks plymouth in raw mode, and setting the + # font will currently also break if on vgacon. + # Setting the font also corrupts X and postinst may be running with + # stripped environment thus we can't even detect X easily. + setupcon --save-only >/dev/null 2>/dev/null || true + cat >&2 </dev/null 2>&1; then + update-initramfs -u +fi + +exit 0 diff -Nru console-setup-1.222/debian/keyboard-configuration.templates console-setup-1.222ubuntu1/debian/keyboard-configuration.templates --- console-setup-1.222/debian/keyboard-configuration.templates 2023-06-21 21:20:52.000000000 +0200 +++ console-setup-1.222ubuntu1/debian/keyboard-configuration.templates 2023-06-29 15:02:02.000000000 +0200 @@ -99,7 +99,7 @@ Type: select # :sl1: __Choices: Caps Lock, Right Alt (AltGr), Right Control, Right Shift, Right Logo key, Menu key, Alt+Shift, Control+Shift, Control+Alt, Alt+Caps Lock, Left Control+Left Shift, Left Alt, Left Control, Left Shift, Left Logo key, Scroll Lock key, No toggling -Default: Alt+Shift +Default: No toggling # :sl1: _Description: Method for toggling between national and Latin mode: You will need a way to toggle the keyboard between the national @@ -191,3 +191,23 @@ Type: boolean Default: true Description: for internal use + +Template: console-setup/ask_detect +Type: boolean +Default: false +_Description: Detect keyboard layout? + You can try to have your keyboard layout detected by pressing a series of + keys. If you do not want to do this, you will be able to select your + keyboard layout from a list. + +Template: console-setup/detect +Type: detect-keyboard +Choices: ${FILENAME} +_Description: Detecting your keyboard layout + +Template: console-setup/detected +Type: note +_Description: Keyboard layout detection complete + Based on the keys you pressed, your keyboard layout appears to be + "${LAYOUT}". If this is not correct, you can go back and select your layout + from the full list instead. diff -Nru console-setup-1.222/debian/keyboard_present.sh console-setup-1.222ubuntu1/debian/keyboard_present.sh --- console-setup-1.222/debian/keyboard_present.sh 2023-06-21 21:20:52.000000000 +0200 +++ console-setup-1.222ubuntu1/debian/keyboard_present.sh 2023-06-29 15:02:02.000000000 +0200 @@ -13,6 +13,7 @@ [ -d /sys/bus/usb/devices ] || return 0 for d in /sys/bus/usb/devices/*:*; do + [ -d "$d" ] || continue class=$(cat "$d/bInterfaceClass") # 03 = Human Interface Device subclass=$(cat "$d/bInterfaceSubClass") # 01 = Boot Interface Subclass protocol=$(cat "$d/bInterfaceProtocol") # 01 = Keyboard diff -Nru console-setup-1.222/debian/po/am.po console-setup-1.222ubuntu1/debian/po/am.po --- console-setup-1.222/debian/po/am.po 2023-06-21 21:20:52.000000000 +0200 +++ console-setup-1.222ubuntu1/debian/po/am.po 2023-06-29 15:02:02.000000000 +0200 @@ -1443,3 +1443,42 @@ #: ../keyboard-configuration.templates:16002 msgid "Keymap to use:" msgstr "ጥቅም ላይ የሚውልው የፊደል ገበታ፦" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +#, fuzzy +msgid "Detect keyboard layout?" +msgstr "የፊደል ገበታ አጣጣል፦" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +msgid "" +"You can try to have your keyboard layout detected by pressing a series of " +"keys. If you do not want to do this, you will be able to select your " +"keyboard layout from a list." +msgstr "" + +#. Type: detect-keyboard +#. Description +#: ../keyboard-configuration.templates:23001 +#, fuzzy +msgid "Detecting your keyboard layout" +msgstr "ለፊደል ገበታው ቀዳሚ አጣጣል" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +#, fuzzy +msgid "Keyboard layout detection complete" +msgstr "የፊደል ገበታ አጣጣል፦" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +msgid "" +"Based on the keys you pressed, your keyboard layout appears to be " +"\"${LAYOUT}\". If this is not correct, you can go back and select your " +"layout from the full list instead." +msgstr "" diff -Nru console-setup-1.222/debian/po/ar.po console-setup-1.222ubuntu1/debian/po/ar.po --- console-setup-1.222/debian/po/ar.po 2023-06-21 21:20:52.000000000 +0200 +++ console-setup-1.222ubuntu1/debian/po/ar.po 2023-06-29 15:02:02.000000000 +0200 @@ -1515,3 +1515,42 @@ #: ../keyboard-configuration.templates:16002 msgid "Keymap to use:" msgstr "خارطة المفاتيح المُراد استخدامها:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +#, fuzzy +msgid "Detect keyboard layout?" +msgstr "تخطيط لوحة المفاتيح:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +msgid "" +"You can try to have your keyboard layout detected by pressing a series of " +"keys. If you do not want to do this, you will be able to select your " +"keyboard layout from a list." +msgstr "" + +#. Type: detect-keyboard +#. Description +#: ../keyboard-configuration.templates:23001 +#, fuzzy +msgid "Detecting your keyboard layout" +msgstr "تخطيط لوحة المفاتيح الافتراضي" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +#, fuzzy +msgid "Keyboard layout detection complete" +msgstr "تخطيط لوحة المفاتيح:" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +msgid "" +"Based on the keys you pressed, your keyboard layout appears to be " +"\"${LAYOUT}\". If this is not correct, you can go back and select your " +"layout from the full list instead." +msgstr "" diff -Nru console-setup-1.222/debian/po/ast.po console-setup-1.222ubuntu1/debian/po/ast.po --- console-setup-1.222/debian/po/ast.po 2023-06-21 21:20:52.000000000 +0200 +++ console-setup-1.222ubuntu1/debian/po/ast.po 2023-06-29 15:02:02.000000000 +0200 @@ -1487,3 +1487,42 @@ #: ../keyboard-configuration.templates:16002 msgid "Keymap to use:" msgstr "Keymap a usar:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +#, fuzzy +msgid "Detect keyboard layout?" +msgstr "Distribución de tecláu" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +msgid "" +"You can try to have your keyboard layout detected by pressing a series of " +"keys. If you do not want to do this, you will be able to select your " +"keyboard layout from a list." +msgstr "" + +#. Type: detect-keyboard +#. Description +#: ../keyboard-configuration.templates:23001 +#, fuzzy +msgid "Detecting your keyboard layout" +msgstr "La disposición por defeutu pal tecláu" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +#, fuzzy +msgid "Keyboard layout detection complete" +msgstr "Distribución de tecláu" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +msgid "" +"Based on the keys you pressed, your keyboard layout appears to be " +"\"${LAYOUT}\". If this is not correct, you can go back and select your " +"layout from the full list instead." +msgstr "" diff -Nru console-setup-1.222/debian/po/be.po console-setup-1.222ubuntu1/debian/po/be.po --- console-setup-1.222/debian/po/be.po 2023-06-21 21:20:52.000000000 +0200 +++ console-setup-1.222ubuntu1/debian/po/be.po 2023-06-29 15:02:02.000000000 +0200 @@ -1482,3 +1482,42 @@ #: ../keyboard-configuration.templates:16002 msgid "Keymap to use:" msgstr "Ужываць кодавы набор:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +#, fuzzy +msgid "Detect keyboard layout?" +msgstr "Раскладка клавіятуры:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +msgid "" +"You can try to have your keyboard layout detected by pressing a series of " +"keys. If you do not want to do this, you will be able to select your " +"keyboard layout from a list." +msgstr "" + +#. Type: detect-keyboard +#. Description +#: ../keyboard-configuration.templates:23001 +#, fuzzy +msgid "Detecting your keyboard layout" +msgstr "Перадвызначаная раскладка клавіятуры" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +#, fuzzy +msgid "Keyboard layout detection complete" +msgstr "Раскладка клавіятуры:" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +msgid "" +"Based on the keys you pressed, your keyboard layout appears to be " +"\"${LAYOUT}\". If this is not correct, you can go back and select your " +"layout from the full list instead." +msgstr "" diff -Nru console-setup-1.222/debian/po/bg.po console-setup-1.222ubuntu1/debian/po/bg.po --- console-setup-1.222/debian/po/bg.po 2023-06-21 21:20:52.000000000 +0200 +++ console-setup-1.222ubuntu1/debian/po/bg.po 2023-06-29 15:02:02.000000000 +0200 @@ -1504,3 +1504,42 @@ #: ../keyboard-configuration.templates:16002 msgid "Keymap to use:" msgstr "Клавишна подредба за ползване:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +#, fuzzy +msgid "Detect keyboard layout?" +msgstr "Клавиатурна подредба:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +msgid "" +"You can try to have your keyboard layout detected by pressing a series of " +"keys. If you do not want to do this, you will be able to select your " +"keyboard layout from a list." +msgstr "" + +#. Type: detect-keyboard +#. Description +#: ../keyboard-configuration.templates:23001 +#, fuzzy +msgid "Detecting your keyboard layout" +msgstr "Избиране на клавиатурна подредба" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +#, fuzzy +msgid "Keyboard layout detection complete" +msgstr "Клавиатурна подредба:" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +msgid "" +"Based on the keys you pressed, your keyboard layout appears to be " +"\"${LAYOUT}\". If this is not correct, you can go back and select your " +"layout from the full list instead." +msgstr "" diff -Nru console-setup-1.222/debian/po/bn.po console-setup-1.222ubuntu1/debian/po/bn.po --- console-setup-1.222/debian/po/bn.po 2023-06-21 21:20:52.000000000 +0200 +++ console-setup-1.222ubuntu1/debian/po/bn.po 2023-06-29 15:02:02.000000000 +0200 @@ -1520,3 +1520,42 @@ #: ../keyboard-configuration.templates:16002 msgid "Keymap to use:" msgstr "ব্যবহারের করার জন্য কী-ম্যাপ:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +#, fuzzy +msgid "Detect keyboard layout?" +msgstr "কীবোর্ড লেআউট" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +msgid "" +"You can try to have your keyboard layout detected by pressing a series of " +"keys. If you do not want to do this, you will be able to select your " +"keyboard layout from a list." +msgstr "" + +#. Type: detect-keyboard +#. Description +#: ../keyboard-configuration.templates:23001 +#, fuzzy +msgid "Detecting your keyboard layout" +msgstr "কীবোর্ডের জন্য ডিফল্ট লেআউট" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +#, fuzzy +msgid "Keyboard layout detection complete" +msgstr "কীবোর্ড লেআউট" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +msgid "" +"Based on the keys you pressed, your keyboard layout appears to be " +"\"${LAYOUT}\". If this is not correct, you can go back and select your " +"layout from the full list instead." +msgstr "" diff -Nru console-setup-1.222/debian/po/bo.po console-setup-1.222ubuntu1/debian/po/bo.po --- console-setup-1.222/debian/po/bo.po 2023-06-21 21:20:52.000000000 +0200 +++ console-setup-1.222ubuntu1/debian/po/bo.po 2023-06-29 15:02:02.000000000 +0200 @@ -1439,3 +1439,42 @@ #: ../keyboard-configuration.templates:16002 msgid "Keymap to use:" msgstr "སྤྱོད་དགོས་པའི་མཐེབ་གཞོང་སྒྲིག་བཀོད：" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +#, fuzzy +msgid "Detect keyboard layout?" +msgstr "མཐེབ་གཞོང་གི་བཀོད་པ：" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +msgid "" +"You can try to have your keyboard layout detected by pressing a series of " +"keys. If you do not want to do this, you will be able to select your " +"keyboard layout from a list." +msgstr "" + +#. Type: detect-keyboard +#. Description +#: ../keyboard-configuration.templates:23001 +#, fuzzy +msgid "Detecting your keyboard layout" +msgstr "མཐེབ་གཞོང་བཀོད་པ་དེའི་སྔོན་སྒྲིག" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +#, fuzzy +msgid "Keyboard layout detection complete" +msgstr "མཐེབ་གཞོང་གི་བཀོད་པ：" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +msgid "" +"Based on the keys you pressed, your keyboard layout appears to be " +"\"${LAYOUT}\". If this is not correct, you can go back and select your " +"layout from the full list instead." +msgstr "" diff -Nru console-setup-1.222/debian/po/bs.po console-setup-1.222ubuntu1/debian/po/bs.po --- console-setup-1.222/debian/po/bs.po 2023-06-21 21:20:52.000000000 +0200 +++ console-setup-1.222ubuntu1/debian/po/bs.po 2023-06-29 15:02:02.000000000 +0200 @@ -1498,3 +1498,42 @@ #: ../keyboard-configuration.templates:16002 msgid "Keymap to use:" msgstr "Raspored tipki za upotrebu:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +#, fuzzy +msgid "Detect keyboard layout?" +msgstr "Raspored tastature:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +msgid "" +"You can try to have your keyboard layout detected by pressing a series of " +"keys. If you do not want to do this, you will be able to select your " +"keyboard layout from a list." +msgstr "" + +#. Type: detect-keyboard +#. Description +#: ../keyboard-configuration.templates:23001 +#, fuzzy +msgid "Detecting your keyboard layout" +msgstr "Standardni izbor za raspored tastature" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +#, fuzzy +msgid "Keyboard layout detection complete" +msgstr "Raspored tastature:" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +msgid "" +"Based on the keys you pressed, your keyboard layout appears to be " +"\"${LAYOUT}\". If this is not correct, you can go back and select your " +"layout from the full list instead." +msgstr "" diff -Nru console-setup-1.222/debian/po/ca.po console-setup-1.222ubuntu1/debian/po/ca.po --- console-setup-1.222/debian/po/ca.po 2023-06-21 21:20:52.000000000 +0200 +++ console-setup-1.222ubuntu1/debian/po/ca.po 2023-06-29 15:02:02.000000000 +0200 @@ -1492,3 +1492,42 @@ #: ../keyboard-configuration.templates:16002 msgid "Keymap to use:" msgstr "Mapa de teclat a emprar:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +#, fuzzy +msgid "Detect keyboard layout?" +msgstr "Disposició del teclat:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +msgid "" +"You can try to have your keyboard layout detected by pressing a series of " +"keys. If you do not want to do this, you will be able to select your " +"keyboard layout from a list." +msgstr "" + +#. Type: detect-keyboard +#. Description +#: ../keyboard-configuration.templates:23001 +#, fuzzy +msgid "Detecting your keyboard layout" +msgstr "El predeterminat per a la disposició de teclat" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +#, fuzzy +msgid "Keyboard layout detection complete" +msgstr "Disposició del teclat:" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +msgid "" +"Based on the keys you pressed, your keyboard layout appears to be " +"\"${LAYOUT}\". If this is not correct, you can go back and select your " +"layout from the full list instead." +msgstr "" diff -Nru console-setup-1.222/debian/po/cs.po console-setup-1.222ubuntu1/debian/po/cs.po --- console-setup-1.222/debian/po/cs.po 2023-06-21 21:20:52.000000000 +0200 +++ console-setup-1.222ubuntu1/debian/po/cs.po 2023-06-29 15:02:02.000000000 +0200 @@ -1479,3 +1479,42 @@ #: ../keyboard-configuration.templates:16002 msgid "Keymap to use:" msgstr "Klávesová mapa:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +#, fuzzy +msgid "Detect keyboard layout?" +msgstr "Rozložení klávesnice:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +msgid "" +"You can try to have your keyboard layout detected by pressing a series of " +"keys. If you do not want to do this, you will be able to select your " +"keyboard layout from a list." +msgstr "" + +#. Type: detect-keyboard +#. Description +#: ../keyboard-configuration.templates:23001 +#, fuzzy +msgid "Detecting your keyboard layout" +msgstr "Výchozí pro klávesové rozložení" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +#, fuzzy +msgid "Keyboard layout detection complete" +msgstr "Rozložení klávesnice:" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +msgid "" +"Based on the keys you pressed, your keyboard layout appears to be " +"\"${LAYOUT}\". If this is not correct, you can go back and select your " +"layout from the full list instead." +msgstr "" diff -Nru console-setup-1.222/debian/po/cy.po console-setup-1.222ubuntu1/debian/po/cy.po --- console-setup-1.222/debian/po/cy.po 2023-06-21 21:20:52.000000000 +0200 +++ console-setup-1.222ubuntu1/debian/po/cy.po 2023-06-29 15:02:02.000000000 +0200 @@ -1486,3 +1486,42 @@ #: ../keyboard-configuration.templates:16002 msgid "Keymap to use:" msgstr "Map bysell i'w ddefnyddio:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +#, fuzzy +msgid "Detect keyboard layout?" +msgstr "Cynllun bysellfwrdd:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +msgid "" +"You can try to have your keyboard layout detected by pressing a series of " +"keys. If you do not want to do this, you will be able to select your " +"keyboard layout from a list." +msgstr "" + +#. Type: detect-keyboard +#. Description +#: ../keyboard-configuration.templates:23001 +#, fuzzy +msgid "Detecting your keyboard layout" +msgstr "Y dewis diofyn ar gyfer cynllun y bysellfwrdd" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +#, fuzzy +msgid "Keyboard layout detection complete" +msgstr "Cynllun bysellfwrdd:" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +msgid "" +"Based on the keys you pressed, your keyboard layout appears to be " +"\"${LAYOUT}\". If this is not correct, you can go back and select your " +"layout from the full list instead." +msgstr "" diff -Nru console-setup-1.222/debian/po/da.po console-setup-1.222ubuntu1/debian/po/da.po --- console-setup-1.222/debian/po/da.po 2023-06-21 21:20:52.000000000 +0200 +++ console-setup-1.222ubuntu1/debian/po/da.po 2023-06-29 15:02:02.000000000 +0200 @@ -1541,3 +1541,42 @@ #: ../keyboard-configuration.templates:16002 msgid "Keymap to use:" msgstr "Tastaturudlæg der skal bruges:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +#, fuzzy +msgid "Detect keyboard layout?" +msgstr "Tastaturlayout:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +msgid "" +"You can try to have your keyboard layout detected by pressing a series of " +"keys. If you do not want to do this, you will be able to select your " +"keyboard layout from a list." +msgstr "" + +#. Type: detect-keyboard +#. Description +#: ../keyboard-configuration.templates:23001 +#, fuzzy +msgid "Detecting your keyboard layout" +msgstr "Standard for tastaturlayoutet" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +#, fuzzy +msgid "Keyboard layout detection complete" +msgstr "Tastaturlayout:" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +msgid "" +"Based on the keys you pressed, your keyboard layout appears to be " +"\"${LAYOUT}\". If this is not correct, you can go back and select your " +"layout from the full list instead." +msgstr "" diff -Nru console-setup-1.222/debian/po/de.po console-setup-1.222ubuntu1/debian/po/de.po --- console-setup-1.222/debian/po/de.po 2023-06-21 21:20:52.000000000 +0200 +++ console-setup-1.222ubuntu1/debian/po/de.po 2023-06-29 15:02:02.000000000 +0200 @@ -1521,3 +1521,42 @@ #: ../keyboard-configuration.templates:16002 msgid "Keymap to use:" msgstr "Wählen Sie das Layout der Tastatur aus:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +#, fuzzy +msgid "Detect keyboard layout?" +msgstr "Tastaturbelegung:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +msgid "" +"You can try to have your keyboard layout detected by pressing a series of " +"keys. If you do not want to do this, you will be able to select your " +"keyboard layout from a list." +msgstr "" + +#. Type: detect-keyboard +#. Description +#: ../keyboard-configuration.templates:23001 +#, fuzzy +msgid "Detecting your keyboard layout" +msgstr "Der Standard für die Tastenbelegung" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +#, fuzzy +msgid "Keyboard layout detection complete" +msgstr "Tastaturbelegung:" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +msgid "" +"Based on the keys you pressed, your keyboard layout appears to be " +"\"${LAYOUT}\". If this is not correct, you can go back and select your " +"layout from the full list instead." +msgstr "" diff -Nru console-setup-1.222/debian/po/dz.po console-setup-1.222ubuntu1/debian/po/dz.po --- console-setup-1.222/debian/po/dz.po 2023-06-21 21:20:52.000000000 +0200 +++ console-setup-1.222ubuntu1/debian/po/dz.po 2023-06-29 15:02:02.000000000 +0200 @@ -1523,3 +1523,42 @@ #: ../keyboard-configuration.templates:16002 msgid "Keymap to use:" msgstr "ལག་ལེན་འཐབ་ནིའི་དོན་ལུ་ས་ཁྲ་གཙོ་བོ :" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +#, fuzzy +msgid "Detect keyboard layout?" +msgstr "ལྡེ་སྒྲོམ་སྒྲིག་བཀོད་སེལ་འཐུ་འབད།" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +msgid "" +"You can try to have your keyboard layout detected by pressing a series of " +"keys. If you do not want to do this, you will be able to select your " +"keyboard layout from a list." +msgstr "" + +#. Type: detect-keyboard +#. Description +#: ../keyboard-configuration.templates:23001 +#, fuzzy +msgid "Detecting your keyboard layout" +msgstr "ལྡེ་སྒྲོམ་སྒྲིག་བཀོད་ཀྱི་དོན་ལུ་སྔོན་སྒྲིག་" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +#, fuzzy +msgid "Keyboard layout detection complete" +msgstr "ལྡེ་སྒྲོམ་སྒྲིག་བཀོད་སེལ་འཐུ་འབད།" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +msgid "" +"Based on the keys you pressed, your keyboard layout appears to be " +"\"${LAYOUT}\". If this is not correct, you can go back and select your " +"layout from the full list instead." +msgstr "" diff -Nru console-setup-1.222/debian/po/el.po console-setup-1.222ubuntu1/debian/po/el.po --- console-setup-1.222/debian/po/el.po 2023-06-21 21:20:52.000000000 +0200 +++ console-setup-1.222ubuntu1/debian/po/el.po 2023-06-29 15:02:02.000000000 +0200 @@ -1516,3 +1516,42 @@ #: ../keyboard-configuration.templates:16002 msgid "Keymap to use:" msgstr "Απεικόνιση πληκτρολογίου για χρήση:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +#, fuzzy +msgid "Detect keyboard layout?" +msgstr "Διάταξη πληκτρολογίου:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +msgid "" +"You can try to have your keyboard layout detected by pressing a series of " +"keys. If you do not want to do this, you will be able to select your " +"keyboard layout from a list." +msgstr "" + +#. Type: detect-keyboard +#. Description +#: ../keyboard-configuration.templates:23001 +#, fuzzy +msgid "Detecting your keyboard layout" +msgstr "Η προκαθορισμένη επιλογή για τη διάταξη πληκτρολογίου" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +#, fuzzy +msgid "Keyboard layout detection complete" +msgstr "Διάταξη πληκτρολογίου:" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +msgid "" +"Based on the keys you pressed, your keyboard layout appears to be " +"\"${LAYOUT}\". If this is not correct, you can go back and select your " +"layout from the full list instead." +msgstr "" diff -Nru console-setup-1.222/debian/po/eo.po console-setup-1.222ubuntu1/debian/po/eo.po --- console-setup-1.222/debian/po/eo.po 2023-06-21 21:20:52.000000000 +0200 +++ console-setup-1.222ubuntu1/debian/po/eo.po 2023-06-29 15:02:02.000000000 +0200 @@ -1484,3 +1484,42 @@ #: ../keyboard-configuration.templates:16002 msgid "Keymap to use:" msgstr "Uzota klavmapo :" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +#, fuzzy +msgid "Detect keyboard layout?" +msgstr "Klavar-aranĝo:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +msgid "" +"You can try to have your keyboard layout detected by pressing a series of " +"keys. If you do not want to do this, you will be able to select your " +"keyboard layout from a list." +msgstr "" + +#. Type: detect-keyboard +#. Description +#: ../keyboard-configuration.templates:23001 +#, fuzzy +msgid "Detecting your keyboard layout" +msgstr "La originalo por la klavar-aranĝo" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +#, fuzzy +msgid "Keyboard layout detection complete" +msgstr "Klavar-aranĝo:" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +msgid "" +"Based on the keys you pressed, your keyboard layout appears to be " +"\"${LAYOUT}\". If this is not correct, you can go back and select your " +"layout from the full list instead." +msgstr "" diff -Nru console-setup-1.222/debian/po/es.po console-setup-1.222ubuntu1/debian/po/es.po --- console-setup-1.222/debian/po/es.po 2023-06-21 21:20:52.000000000 +0200 +++ console-setup-1.222ubuntu1/debian/po/es.po 2023-06-29 15:02:02.000000000 +0200 @@ -1535,3 +1535,42 @@ #: ../keyboard-configuration.templates:16002 msgid "Keymap to use:" msgstr "Mapa de teclado a usar:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +#, fuzzy +msgid "Detect keyboard layout?" +msgstr "Distribución de teclado:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +msgid "" +"You can try to have your keyboard layout detected by pressing a series of " +"keys. If you do not want to do this, you will be able to select your " +"keyboard layout from a list." +msgstr "" + +#. Type: detect-keyboard +#. Description +#: ../keyboard-configuration.templates:23001 +#, fuzzy +msgid "Detecting your keyboard layout" +msgstr "Distribución por omisión del teclado" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +#, fuzzy +msgid "Keyboard layout detection complete" +msgstr "Distribución de teclado:" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +msgid "" +"Based on the keys you pressed, your keyboard layout appears to be " +"\"${LAYOUT}\". If this is not correct, you can go back and select your " +"layout from the full list instead." +msgstr "" diff -Nru console-setup-1.222/debian/po/et.po console-setup-1.222ubuntu1/debian/po/et.po --- console-setup-1.222/debian/po/et.po 2023-06-21 21:20:52.000000000 +0200 +++ console-setup-1.222ubuntu1/debian/po/et.po 2023-06-29 15:02:02.000000000 +0200 @@ -1486,3 +1486,42 @@ #: ../keyboard-configuration.templates:16002 msgid "Keymap to use:" msgstr "Kasutatav klahvide asetus:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +#, fuzzy +msgid "Detect keyboard layout?" +msgstr "Klaviatuuripaigutus:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +msgid "" +"You can try to have your keyboard layout detected by pressing a series of " +"keys. If you do not want to do this, you will be able to select your " +"keyboard layout from a list." +msgstr "" + +#. Type: detect-keyboard +#. Description +#: ../keyboard-configuration.templates:23001 +#, fuzzy +msgid "Detecting your keyboard layout" +msgstr "Vaikimisi klaviatuuripaigutus" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +#, fuzzy +msgid "Keyboard layout detection complete" +msgstr "Klaviatuuripaigutus:" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +msgid "" +"Based on the keys you pressed, your keyboard layout appears to be " +"\"${LAYOUT}\". If this is not correct, you can go back and select your " +"layout from the full list instead." +msgstr "" diff -Nru console-setup-1.222/debian/po/eu.po console-setup-1.222ubuntu1/debian/po/eu.po --- console-setup-1.222/debian/po/eu.po 2023-06-21 21:20:52.000000000 +0200 +++ console-setup-1.222ubuntu1/debian/po/eu.po 2023-06-29 15:02:02.000000000 +0200 @@ -1494,3 +1494,42 @@ #: ../keyboard-configuration.templates:16002 msgid "Keymap to use:" msgstr "Erabiliko den teklatu-mapa:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +#, fuzzy +msgid "Detect keyboard layout?" +msgstr "Teklatuaren diseinua:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +msgid "" +"You can try to have your keyboard layout detected by pressing a series of " +"keys. If you do not want to do this, you will be able to select your " +"keyboard layout from a list." +msgstr "" + +#. Type: detect-keyboard +#. Description +#: ../keyboard-configuration.templates:23001 +#, fuzzy +msgid "Detecting your keyboard layout" +msgstr "Teklatuaren diseinu lehenetsia" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +#, fuzzy +msgid "Keyboard layout detection complete" +msgstr "Teklatuaren diseinua:" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +msgid "" +"Based on the keys you pressed, your keyboard layout appears to be " +"\"${LAYOUT}\". If this is not correct, you can go back and select your " +"layout from the full list instead." +msgstr "" diff -Nru console-setup-1.222/debian/po/fa.po console-setup-1.222ubuntu1/debian/po/fa.po --- console-setup-1.222/debian/po/fa.po 2023-06-21 21:20:52.000000000 +0200 +++ console-setup-1.222ubuntu1/debian/po/fa.po 2023-06-29 15:02:02.000000000 +0200 @@ -1486,3 +1486,42 @@ #: ../keyboard-configuration.templates:16002 msgid "Keymap to use:" msgstr "چینش کلید مورد استفاده:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +#, fuzzy +msgid "Detect keyboard layout?" +msgstr "طرح بندی صفحه کلید:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +msgid "" +"You can try to have your keyboard layout detected by pressing a series of " +"keys. If you do not want to do this, you will be able to select your " +"keyboard layout from a list." +msgstr "" + +#. Type: detect-keyboard +#. Description +#: ../keyboard-configuration.templates:23001 +#, fuzzy +msgid "Detecting your keyboard layout" +msgstr "طرح بندی پیش فرض صفحه کلید" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +#, fuzzy +msgid "Keyboard layout detection complete" +msgstr "طرح بندی صفحه کلید:" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +msgid "" +"Based on the keys you pressed, your keyboard layout appears to be " +"\"${LAYOUT}\". If this is not correct, you can go back and select your " +"layout from the full list instead." +msgstr "" diff -Nru console-setup-1.222/debian/po/fi.po console-setup-1.222ubuntu1/debian/po/fi.po --- console-setup-1.222/debian/po/fi.po 2023-06-21 21:20:52.000000000 +0200 +++ console-setup-1.222ubuntu1/debian/po/fi.po 2023-06-29 15:02:02.000000000 +0200 @@ -1524,3 +1524,42 @@ #: ../keyboard-configuration.templates:16002 msgid "Keymap to use:" msgstr "Käytettävä näppäinkartta:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +#, fuzzy +msgid "Detect keyboard layout?" +msgstr "Näppäinasettelu:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +msgid "" +"You can try to have your keyboard layout detected by pressing a series of " +"keys. If you do not want to do this, you will be able to select your " +"keyboard layout from a list." +msgstr "" + +#. Type: detect-keyboard +#. Description +#: ../keyboard-configuration.templates:23001 +#, fuzzy +msgid "Detecting your keyboard layout" +msgstr "Valitse näppäinasettelun oletusarvo" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +#, fuzzy +msgid "Keyboard layout detection complete" +msgstr "Näppäinasettelu:" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +msgid "" +"Based on the keys you pressed, your keyboard layout appears to be " +"\"${LAYOUT}\". If this is not correct, you can go back and select your " +"layout from the full list instead." +msgstr "" diff -Nru console-setup-1.222/debian/po/fr.po console-setup-1.222ubuntu1/debian/po/fr.po --- console-setup-1.222/debian/po/fr.po 2023-06-21 21:20:52.000000000 +0200 +++ console-setup-1.222ubuntu1/debian/po/fr.po 2023-06-29 15:02:02.000000000 +0200 @@ -1514,3 +1514,42 @@ #: ../keyboard-configuration.templates:16002 msgid "Keymap to use:" msgstr "Disposition de clavier à utiliser :" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +#, fuzzy +msgid "Detect keyboard layout?" +msgstr "Disposition du clavier :" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +msgid "" +"You can try to have your keyboard layout detected by pressing a series of " +"keys. If you do not want to do this, you will be able to select your " +"keyboard layout from a list." +msgstr "" + +#. Type: detect-keyboard +#. Description +#: ../keyboard-configuration.templates:23001 +#, fuzzy +msgid "Detecting your keyboard layout" +msgstr "Disposition par défaut pour le clavier" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +#, fuzzy +msgid "Keyboard layout detection complete" +msgstr "Disposition du clavier :" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +msgid "" +"Based on the keys you pressed, your keyboard layout appears to be " +"\"${LAYOUT}\". If this is not correct, you can go back and select your " +"layout from the full list instead." +msgstr "" diff -Nru console-setup-1.222/debian/po/ga.po console-setup-1.222ubuntu1/debian/po/ga.po --- console-setup-1.222/debian/po/ga.po 2023-06-21 21:20:52.000000000 +0200 +++ console-setup-1.222ubuntu1/debian/po/ga.po 2023-06-29 15:02:02.000000000 +0200 @@ -1500,3 +1500,42 @@ #: ../keyboard-configuration.templates:16002 msgid "Keymap to use:" msgstr "Eochairmhapáil le húsáid:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +#, fuzzy +msgid "Detect keyboard layout?" +msgstr "Leagan amach an mhéarchláir:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +msgid "" +"You can try to have your keyboard layout detected by pressing a series of " +"keys. If you do not want to do this, you will be able to select your " +"keyboard layout from a list." +msgstr "" + +#. Type: detect-keyboard +#. Description +#: ../keyboard-configuration.templates:23001 +#, fuzzy +msgid "Detecting your keyboard layout" +msgstr "Leagan amach réamhshocraithe" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +#, fuzzy +msgid "Keyboard layout detection complete" +msgstr "Leagan amach an mhéarchláir:" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +msgid "" +"Based on the keys you pressed, your keyboard layout appears to be " +"\"${LAYOUT}\". If this is not correct, you can go back and select your " +"layout from the full list instead." +msgstr "" diff -Nru console-setup-1.222/debian/po/gl.po console-setup-1.222ubuntu1/debian/po/gl.po --- console-setup-1.222/debian/po/gl.po 2023-06-21 21:20:52.000000000 +0200 +++ console-setup-1.222ubuntu1/debian/po/gl.po 2023-06-29 15:02:02.000000000 +0200 @@ -1487,3 +1487,42 @@ #: ../keyboard-configuration.templates:16002 msgid "Keymap to use:" msgstr "Esquema de teclado a empregar:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +#, fuzzy +msgid "Detect keyboard layout?" +msgstr "Disposición do teclado:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +msgid "" +"You can try to have your keyboard layout detected by pressing a series of " +"keys. If you do not want to do this, you will be able to select your " +"keyboard layout from a list." +msgstr "" + +#. Type: detect-keyboard +#. Description +#: ../keyboard-configuration.templates:23001 +#, fuzzy +msgid "Detecting your keyboard layout" +msgstr "A disposición de teclado predeterminada" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +#, fuzzy +msgid "Keyboard layout detection complete" +msgstr "Disposición do teclado:" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +msgid "" +"Based on the keys you pressed, your keyboard layout appears to be " +"\"${LAYOUT}\". If this is not correct, you can go back and select your " +"layout from the full list instead." +msgstr "" diff -Nru console-setup-1.222/debian/po/gu.po console-setup-1.222ubuntu1/debian/po/gu.po --- console-setup-1.222/debian/po/gu.po 2023-06-21 21:20:52.000000000 +0200 +++ console-setup-1.222ubuntu1/debian/po/gu.po 2023-06-29 15:02:02.000000000 +0200 @@ -1477,3 +1477,42 @@ #: ../keyboard-configuration.templates:16002 msgid "Keymap to use:" msgstr "ઉપયોગ કરવાનો કીમેપ:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +#, fuzzy +msgid "Detect keyboard layout?" +msgstr "કીબોર્ડ દેખાવ:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +msgid "" +"You can try to have your keyboard layout detected by pressing a series of " +"keys. If you do not want to do this, you will be able to select your " +"keyboard layout from a list." +msgstr "" + +#. Type: detect-keyboard +#. Description +#: ../keyboard-configuration.templates:23001 +#, fuzzy +msgid "Detecting your keyboard layout" +msgstr "કીબોર્ડ દેખાવ માટે મૂળભૂત" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +#, fuzzy +msgid "Keyboard layout detection complete" +msgstr "કીબોર્ડ દેખાવ:" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +msgid "" +"Based on the keys you pressed, your keyboard layout appears to be " +"\"${LAYOUT}\". If this is not correct, you can go back and select your " +"layout from the full list instead." +msgstr "" diff -Nru console-setup-1.222/debian/po/he.po console-setup-1.222ubuntu1/debian/po/he.po --- console-setup-1.222/debian/po/he.po 2023-06-21 21:20:52.000000000 +0200 +++ console-setup-1.222ubuntu1/debian/po/he.po 2023-06-29 15:02:02.000000000 +0200 @@ -1509,3 +1509,42 @@ #: ../keyboard-configuration.templates:16002 msgid "Keymap to use:" msgstr "מפת תווים לשימוש:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +#, fuzzy +msgid "Detect keyboard layout?" +msgstr "פריסת מקלדת:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +msgid "" +"You can try to have your keyboard layout detected by pressing a series of " +"keys. If you do not want to do this, you will be able to select your " +"keyboard layout from a list." +msgstr "" + +#. Type: detect-keyboard +#. Description +#: ../keyboard-configuration.templates:23001 +#, fuzzy +msgid "Detecting your keyboard layout" +msgstr "ברירת המחדל עבור פריסת המקלדת" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +#, fuzzy +msgid "Keyboard layout detection complete" +msgstr "פריסת מקלדת:" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +msgid "" +"Based on the keys you pressed, your keyboard layout appears to be " +"\"${LAYOUT}\". If this is not correct, you can go back and select your " +"layout from the full list instead." +msgstr "" diff -Nru console-setup-1.222/debian/po/hi.po console-setup-1.222ubuntu1/debian/po/hi.po --- console-setup-1.222/debian/po/hi.po 2023-06-21 21:20:52.000000000 +0200 +++ console-setup-1.222ubuntu1/debian/po/hi.po 2023-06-29 15:02:02.000000000 +0200 @@ -1514,3 +1514,42 @@ #: ../keyboard-configuration.templates:16002 msgid "Keymap to use:" msgstr "कुंजीपट खाका जिसे इस्तेमाल करना है:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +#, fuzzy +msgid "Detect keyboard layout?" +msgstr "कुंजीपट का अभिन्यास:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +msgid "" +"You can try to have your keyboard layout detected by pressing a series of " +"keys. If you do not want to do this, you will be able to select your " +"keyboard layout from a list." +msgstr "" + +#. Type: detect-keyboard +#. Description +#: ../keyboard-configuration.templates:23001 +#, fuzzy +msgid "Detecting your keyboard layout" +msgstr "कुंजीपटल का डिफॉल्ट अभिन्यास" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +#, fuzzy +msgid "Keyboard layout detection complete" +msgstr "कुंजीपट का अभिन्यास:" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +msgid "" +"Based on the keys you pressed, your keyboard layout appears to be " +"\"${LAYOUT}\". If this is not correct, you can go back and select your " +"layout from the full list instead." +msgstr "" diff -Nru console-setup-1.222/debian/po/hr.po console-setup-1.222ubuntu1/debian/po/hr.po --- console-setup-1.222/debian/po/hr.po 2023-06-21 21:20:52.000000000 +0200 +++ console-setup-1.222ubuntu1/debian/po/hr.po 2023-06-29 15:02:02.000000000 +0200 @@ -1503,3 +1503,42 @@ #: ../keyboard-configuration.templates:16002 msgid "Keymap to use:" msgstr "Raspored tipkovnice:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +#, fuzzy +msgid "Detect keyboard layout?" +msgstr "Raspored tipkovnice:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +msgid "" +"You can try to have your keyboard layout detected by pressing a series of " +"keys. If you do not want to do this, you will be able to select your " +"keyboard layout from a list." +msgstr "" + +#. Type: detect-keyboard +#. Description +#: ../keyboard-configuration.templates:23001 +#, fuzzy +msgid "Detecting your keyboard layout" +msgstr "Izbor zadane tipkovnice" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +#, fuzzy +msgid "Keyboard layout detection complete" +msgstr "Raspored tipkovnice:" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +msgid "" +"Based on the keys you pressed, your keyboard layout appears to be " +"\"${LAYOUT}\". If this is not correct, you can go back and select your " +"layout from the full list instead." +msgstr "" diff -Nru console-setup-1.222/debian/po/hu.po console-setup-1.222ubuntu1/debian/po/hu.po --- console-setup-1.222/debian/po/hu.po 2023-06-21 21:20:52.000000000 +0200 +++ console-setup-1.222ubuntu1/debian/po/hu.po 2023-06-29 15:02:02.000000000 +0200 @@ -1538,3 +1538,45 @@ #: ../keyboard-configuration.templates:16002 msgid "Keymap to use:" msgstr "Használni kívánt billentyűkiosztás:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +#, fuzzy +msgid "Detect keyboard layout?" +msgstr "Billentyűkiosztás:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +msgid "" +"You can try to have your keyboard layout detected by pressing a series of " +"keys. If you do not want to do this, you will be able to select your " +"keyboard layout from a list." +msgstr "" + +# Type: select +# Choices +# :sl2: +#. Type: detect-keyboard +#. Description +#: ../keyboard-configuration.templates:23001 +#, fuzzy +msgid "Detecting your keyboard layout" +msgstr "Alapértelmezés a billentyűzetkiosztáshoz" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +#, fuzzy +msgid "Keyboard layout detection complete" +msgstr "Billentyűkiosztás:" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +msgid "" +"Based on the keys you pressed, your keyboard layout appears to be " +"\"${LAYOUT}\". If this is not correct, you can go back and select your " +"layout from the full list instead." +msgstr "" diff -Nru console-setup-1.222/debian/po/hy.po console-setup-1.222ubuntu1/debian/po/hy.po --- console-setup-1.222/debian/po/hy.po 2023-06-21 21:20:52.000000000 +0200 +++ console-setup-1.222ubuntu1/debian/po/hy.po 2023-06-29 15:02:02.000000000 +0200 @@ -1416,3 +1416,39 @@ #: ../keyboard-configuration.templates:16002 msgid "Keymap to use:" msgstr "" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +msgid "Detect keyboard layout?" +msgstr "" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +msgid "" +"You can try to have your keyboard layout detected by pressing a series of " +"keys. If you do not want to do this, you will be able to select your " +"keyboard layout from a list." +msgstr "" + +#. Type: detect-keyboard +#. Description +#: ../keyboard-configuration.templates:23001 +msgid "Detecting your keyboard layout" +msgstr "" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +msgid "Keyboard layout detection complete" +msgstr "" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +msgid "" +"Based on the keys you pressed, your keyboard layout appears to be " +"\"${LAYOUT}\". If this is not correct, you can go back and select your " +"layout from the full list instead." +msgstr "" diff -Nru console-setup-1.222/debian/po/id.po console-setup-1.222ubuntu1/debian/po/id.po --- console-setup-1.222/debian/po/id.po 2023-06-21 21:20:52.000000000 +0200 +++ console-setup-1.222ubuntu1/debian/po/id.po 2023-06-29 15:02:02.000000000 +0200 @@ -1497,3 +1497,42 @@ #: ../keyboard-configuration.templates:16002 msgid "Keymap to use:" msgstr "Peta tombol yang dipakai:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +#, fuzzy +msgid "Detect keyboard layout?" +msgstr "Pola keyboard:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +msgid "" +"You can try to have your keyboard layout detected by pressing a series of " +"keys. If you do not want to do this, you will be able to select your " +"keyboard layout from a list." +msgstr "" + +#. Type: detect-keyboard +#. Description +#: ../keyboard-configuration.templates:23001 +#, fuzzy +msgid "Detecting your keyboard layout" +msgstr "Pola keyboard standar" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +#, fuzzy +msgid "Keyboard layout detection complete" +msgstr "Pola keyboard:" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +msgid "" +"Based on the keys you pressed, your keyboard layout appears to be " +"\"${LAYOUT}\". If this is not correct, you can go back and select your " +"layout from the full list instead." +msgstr "" diff -Nru console-setup-1.222/debian/po/is.po console-setup-1.222ubuntu1/debian/po/is.po --- console-setup-1.222/debian/po/is.po 2023-06-21 21:20:52.000000000 +0200 +++ console-setup-1.222ubuntu1/debian/po/is.po 2023-06-29 15:02:02.000000000 +0200 @@ -1494,3 +1494,42 @@ #: ../keyboard-configuration.templates:16002 msgid "Keymap to use:" msgstr "Lyklaborðsvörpun sem á að nota:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +#, fuzzy +msgid "Detect keyboard layout?" +msgstr "Skipulag lyklaborðs:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +msgid "" +"You can try to have your keyboard layout detected by pressing a series of " +"keys. If you do not want to do this, you will be able to select your " +"keyboard layout from a list." +msgstr "" + +#. Type: detect-keyboard +#. Description +#: ../keyboard-configuration.templates:23001 +#, fuzzy +msgid "Detecting your keyboard layout" +msgstr "Sjálfgefið í lyklaborðsuppsetningu" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +#, fuzzy +msgid "Keyboard layout detection complete" +msgstr "Skipulag lyklaborðs:" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +msgid "" +"Based on the keys you pressed, your keyboard layout appears to be " +"\"${LAYOUT}\". If this is not correct, you can go back and select your " +"layout from the full list instead." +msgstr "" diff -Nru console-setup-1.222/debian/po/it.po console-setup-1.222ubuntu1/debian/po/it.po --- console-setup-1.222/debian/po/it.po 2023-06-21 21:20:52.000000000 +0200 +++ console-setup-1.222ubuntu1/debian/po/it.po 2023-06-29 15:02:02.000000000 +0200 @@ -1512,3 +1512,42 @@ #: ../keyboard-configuration.templates:16002 msgid "Keymap to use:" msgstr "Mappa della tastiera da usare:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +#, fuzzy +msgid "Detect keyboard layout?" +msgstr "Disposizione della tastiera:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +msgid "" +"You can try to have your keyboard layout detected by pressing a series of " +"keys. If you do not want to do this, you will be able to select your " +"keyboard layout from a list." +msgstr "" + +#. Type: detect-keyboard +#. Description +#: ../keyboard-configuration.templates:23001 +#, fuzzy +msgid "Detecting your keyboard layout" +msgstr "La disposizione predefinita della tastiera" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +#, fuzzy +msgid "Keyboard layout detection complete" +msgstr "Disposizione della tastiera:" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +msgid "" +"Based on the keys you pressed, your keyboard layout appears to be " +"\"${LAYOUT}\". If this is not correct, you can go back and select your " +"layout from the full list instead." +msgstr "" diff -Nru console-setup-1.222/debian/po/ja.po console-setup-1.222ubuntu1/debian/po/ja.po --- console-setup-1.222/debian/po/ja.po 2023-06-21 21:20:52.000000000 +0200 +++ console-setup-1.222ubuntu1/debian/po/ja.po 2023-06-29 15:02:02.000000000 +0200 @@ -1528,3 +1528,42 @@ #: ../keyboard-configuration.templates:16002 msgid "Keymap to use:" msgstr "利用するキーマップ:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +#, fuzzy +msgid "Detect keyboard layout?" +msgstr "キーボードのレイアウト:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +msgid "" +"You can try to have your keyboard layout detected by pressing a series of " +"keys. If you do not want to do this, you will be able to select your " +"keyboard layout from a list." +msgstr "" + +#. Type: detect-keyboard +#. Description +#: ../keyboard-configuration.templates:23001 +#, fuzzy +msgid "Detecting your keyboard layout" +msgstr "キーボード配置のデフォルト" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +#, fuzzy +msgid "Keyboard layout detection complete" +msgstr "キーボードのレイアウト:" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +msgid "" +"Based on the keys you pressed, your keyboard layout appears to be " +"\"${LAYOUT}\". If this is not correct, you can go back and select your " +"layout from the full list instead." +msgstr "" diff -Nru console-setup-1.222/debian/po/kab.po console-setup-1.222ubuntu1/debian/po/kab.po --- console-setup-1.222/debian/po/kab.po 2023-06-21 21:20:52.000000000 +0200 +++ console-setup-1.222ubuntu1/debian/po/kab.po 2023-06-29 15:02:02.000000000 +0200 @@ -1477,3 +1477,42 @@ #: ../keyboard-configuration.templates:16002 msgid "Keymap to use:" msgstr "Takarḍa n tsura i useqdec:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +#, fuzzy +msgid "Detect keyboard layout?" +msgstr "Taneɣruft n unasiw:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +msgid "" +"You can try to have your keyboard layout detected by pressing a series of " +"keys. If you do not want to do this, you will be able to select your " +"keyboard layout from a list." +msgstr "" + +#. Type: detect-keyboard +#. Description +#: ../keyboard-configuration.templates:23001 +#, fuzzy +msgid "Detecting your keyboard layout" +msgstr "Azal amezwer i tneɣruft n unasiw" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +#, fuzzy +msgid "Keyboard layout detection complete" +msgstr "Taneɣruft n unasiw:" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +msgid "" +"Based on the keys you pressed, your keyboard layout appears to be " +"\"${LAYOUT}\". If this is not correct, you can go back and select your " +"layout from the full list instead." +msgstr "" diff -Nru console-setup-1.222/debian/po/ka.po console-setup-1.222ubuntu1/debian/po/ka.po --- console-setup-1.222/debian/po/ka.po 2023-06-21 21:20:52.000000000 +0200 +++ console-setup-1.222ubuntu1/debian/po/ka.po 2023-06-29 15:02:02.000000000 +0200 @@ -1465,3 +1465,42 @@ #: ../keyboard-configuration.templates:16002 msgid "Keymap to use:" msgstr "სასურველი განლაგება:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +#, fuzzy +msgid "Detect keyboard layout?" +msgstr "კლავიატურის განლაგების ამორჩევა" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +msgid "" +"You can try to have your keyboard layout detected by pressing a series of " +"keys. If you do not want to do this, you will be able to select your " +"keyboard layout from a list." +msgstr "" + +#. Type: detect-keyboard +#. Description +#: ../keyboard-configuration.templates:23001 +#, fuzzy +msgid "Detecting your keyboard layout" +msgstr "კლავიატურის განლაგების ამორჩევა" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +#, fuzzy +msgid "Keyboard layout detection complete" +msgstr "კლავიატურის განლაგების ამორჩევა" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +msgid "" +"Based on the keys you pressed, your keyboard layout appears to be " +"\"${LAYOUT}\". If this is not correct, you can go back and select your " +"layout from the full list instead." +msgstr "" diff -Nru console-setup-1.222/debian/po/kk.po console-setup-1.222ubuntu1/debian/po/kk.po --- console-setup-1.222/debian/po/kk.po 2023-06-21 21:20:52.000000000 +0200 +++ console-setup-1.222ubuntu1/debian/po/kk.po 2023-06-29 15:02:02.000000000 +0200 @@ -1484,3 +1484,42 @@ #: ../keyboard-configuration.templates:16002 msgid "Keymap to use:" msgstr "Қолданылатын пернетақта жаймасы:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +#, fuzzy +msgid "Detect keyboard layout?" +msgstr "Пернетақта жаймасы:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +msgid "" +"You can try to have your keyboard layout detected by pressing a series of " +"keys. If you do not want to do this, you will be able to select your " +"keyboard layout from a list." +msgstr "" + +#. Type: detect-keyboard +#. Description +#: ../keyboard-configuration.templates:23001 +#, fuzzy +msgid "Detecting your keyboard layout" +msgstr "Пернетақта жаймасы үшін бастапқы" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +#, fuzzy +msgid "Keyboard layout detection complete" +msgstr "Пернетақта жаймасы:" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +msgid "" +"Based on the keys you pressed, your keyboard layout appears to be " +"\"${LAYOUT}\". If this is not correct, you can go back and select your " +"layout from the full list instead." +msgstr "" diff -Nru console-setup-1.222/debian/po/km.po console-setup-1.222ubuntu1/debian/po/km.po --- console-setup-1.222/debian/po/km.po 2023-06-21 21:20:52.000000000 +0200 +++ console-setup-1.222ubuntu1/debian/po/km.po 2023-06-29 15:02:02.000000000 +0200 @@ -1465,3 +1465,42 @@ #: ../keyboard-configuration.templates:16002 msgid "Keymap to use:" msgstr "ផែនទី​គ្រាប់ចុច​ត្រូវ​ប្រើ ៖" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +#, fuzzy +msgid "Detect keyboard layout?" +msgstr "​ប្លង់​ក្ដារចុច ៖" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +msgid "" +"You can try to have your keyboard layout detected by pressing a series of " +"keys. If you do not want to do this, you will be able to select your " +"keyboard layout from a list." +msgstr "" + +#. Type: detect-keyboard +#. Description +#: ../keyboard-configuration.templates:23001 +#, fuzzy +msgid "Detecting your keyboard layout" +msgstr "លំនាំដើម​សម្រាប់​ប្លង់​ក្ដារចុច" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +#, fuzzy +msgid "Keyboard layout detection complete" +msgstr "​ប្លង់​ក្ដារចុច ៖" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +msgid "" +"Based on the keys you pressed, your keyboard layout appears to be " +"\"${LAYOUT}\". If this is not correct, you can go back and select your " +"layout from the full list instead." +msgstr "" diff -Nru console-setup-1.222/debian/po/kn.po console-setup-1.222ubuntu1/debian/po/kn.po --- console-setup-1.222/debian/po/kn.po 2023-06-21 21:20:52.000000000 +0200 +++ console-setup-1.222ubuntu1/debian/po/kn.po 2023-06-29 15:02:02.000000000 +0200 @@ -1481,3 +1481,42 @@ #: ../keyboard-configuration.templates:16002 msgid "Keymap to use:" msgstr "ಉಪಯೇಗಿಸುವ ಕೀಲಿ ಗಾತ್ರ::" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +#, fuzzy +msgid "Detect keyboard layout?" +msgstr "ಕೀಲಿಮಣೆಯ ವಿನ್ಯಾಸವನ್ನು ಸೂಚಿಸು" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +msgid "" +"You can try to have your keyboard layout detected by pressing a series of " +"keys. If you do not want to do this, you will be able to select your " +"keyboard layout from a list." +msgstr "" + +#. Type: detect-keyboard +#. Description +#: ../keyboard-configuration.templates:23001 +#, fuzzy +msgid "Detecting your keyboard layout" +msgstr "ಅಕ್ಷರಫಲಕದ ಪೂರ್ವನಿರ್ಧಾರಿತ ವಿನ್ಯಾಸ" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +#, fuzzy +msgid "Keyboard layout detection complete" +msgstr "ಕೀಲಿಮಣೆಯ ವಿನ್ಯಾಸವನ್ನು ಸೂಚಿಸು" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +msgid "" +"Based on the keys you pressed, your keyboard layout appears to be " +"\"${LAYOUT}\". If this is not correct, you can go back and select your " +"layout from the full list instead." +msgstr "" diff -Nru console-setup-1.222/debian/po/ko.po console-setup-1.222ubuntu1/debian/po/ko.po --- console-setup-1.222/debian/po/ko.po 2023-06-21 21:20:52.000000000 +0200 +++ console-setup-1.222ubuntu1/debian/po/ko.po 2023-06-29 15:02:02.000000000 +0200 @@ -1474,3 +1474,42 @@ #: ../keyboard-configuration.templates:16002 msgid "Keymap to use:" msgstr "사용할 키맵:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +#, fuzzy +msgid "Detect keyboard layout?" +msgstr "키보드 배치:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +msgid "" +"You can try to have your keyboard layout detected by pressing a series of " +"keys. If you do not want to do this, you will be able to select your " +"keyboard layout from a list." +msgstr "" + +#. Type: detect-keyboard +#. Description +#: ../keyboard-configuration.templates:23001 +#, fuzzy +msgid "Detecting your keyboard layout" +msgstr "기본 키보드 배치" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +#, fuzzy +msgid "Keyboard layout detection complete" +msgstr "키보드 배치:" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +msgid "" +"Based on the keys you pressed, your keyboard layout appears to be " +"\"${LAYOUT}\". If this is not correct, you can go back and select your " +"layout from the full list instead." +msgstr "" diff -Nru console-setup-1.222/debian/po/ku.po console-setup-1.222ubuntu1/debian/po/ku.po --- console-setup-1.222/debian/po/ku.po 2023-06-21 21:20:52.000000000 +0200 +++ console-setup-1.222ubuntu1/debian/po/ku.po 2023-06-29 15:02:02.000000000 +0200 @@ -1485,3 +1485,42 @@ #: ../keyboard-configuration.templates:16002 msgid "Keymap to use:" msgstr "Plana bişkojan a dê were bikaranîn:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +#, fuzzy +msgid "Detect keyboard layout?" +msgstr "Rengê klavyeyê" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +msgid "" +"You can try to have your keyboard layout detected by pressing a series of " +"keys. If you do not want to do this, you will be able to select your " +"keyboard layout from a list." +msgstr "" + +#. Type: detect-keyboard +#. Description +#: ../keyboard-configuration.templates:23001 +#, fuzzy +msgid "Detecting your keyboard layout" +msgstr "Standarda cureyê klavyeyê" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +#, fuzzy +msgid "Keyboard layout detection complete" +msgstr "Rengê klavyeyê" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +msgid "" +"Based on the keys you pressed, your keyboard layout appears to be " +"\"${LAYOUT}\". If this is not correct, you can go back and select your " +"layout from the full list instead." +msgstr "" diff -Nru console-setup-1.222/debian/po/lo.po console-setup-1.222ubuntu1/debian/po/lo.po --- console-setup-1.222/debian/po/lo.po 2023-06-21 21:20:52.000000000 +0200 +++ console-setup-1.222ubuntu1/debian/po/lo.po 2023-06-29 15:02:02.000000000 +0200 @@ -1444,3 +1444,42 @@ #: ../keyboard-configuration.templates:16002 msgid "Keymap to use:" msgstr "ຜັງແປ້ນພິມທີ່ໃຊ້:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +#, fuzzy +msgid "Detect keyboard layout?" +msgstr "ໂຄງຮ່າງແປ້ນພິມ" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +msgid "" +"You can try to have your keyboard layout detected by pressing a series of " +"keys. If you do not want to do this, you will be able to select your " +"keyboard layout from a list." +msgstr "" + +#. Type: detect-keyboard +#. Description +#: ../keyboard-configuration.templates:23001 +#, fuzzy +msgid "Detecting your keyboard layout" +msgstr "ຄ່າເລີ່ມຕົ້ນຂອງຜັງແປ້ນພິມ" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +#, fuzzy +msgid "Keyboard layout detection complete" +msgstr "ໂຄງຮ່າງແປ້ນພິມ" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +msgid "" +"Based on the keys you pressed, your keyboard layout appears to be " +"\"${LAYOUT}\". If this is not correct, you can go back and select your " +"layout from the full list instead." +msgstr "" diff -Nru console-setup-1.222/debian/po/lt.po console-setup-1.222ubuntu1/debian/po/lt.po --- console-setup-1.222/debian/po/lt.po 2023-06-21 21:20:52.000000000 +0200 +++ console-setup-1.222ubuntu1/debian/po/lt.po 2023-06-29 15:02:02.000000000 +0200 @@ -1503,3 +1503,42 @@ #: ../keyboard-configuration.templates:16002 msgid "Keymap to use:" msgstr "Naudotinas klavišų išdėstymas:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +#, fuzzy +msgid "Detect keyboard layout?" +msgstr "Klaviatūros išdėstymas:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +msgid "" +"You can try to have your keyboard layout detected by pressing a series of " +"keys. If you do not want to do this, you will be able to select your " +"keyboard layout from a list." +msgstr "" + +#. Type: detect-keyboard +#. Description +#: ../keyboard-configuration.templates:23001 +#, fuzzy +msgid "Detecting your keyboard layout" +msgstr "Numatytasis klaviatūros išdėstyme" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +#, fuzzy +msgid "Keyboard layout detection complete" +msgstr "Klaviatūros išdėstymas:" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +msgid "" +"Based on the keys you pressed, your keyboard layout appears to be " +"\"${LAYOUT}\". If this is not correct, you can go back and select your " +"layout from the full list instead." +msgstr "" diff -Nru console-setup-1.222/debian/po/lv.po console-setup-1.222ubuntu1/debian/po/lv.po --- console-setup-1.222/debian/po/lv.po 2023-06-21 21:20:52.000000000 +0200 +++ console-setup-1.222ubuntu1/debian/po/lv.po 2023-06-29 15:02:02.000000000 +0200 @@ -1493,3 +1493,42 @@ #: ../keyboard-configuration.templates:16002 msgid "Keymap to use:" msgstr "Izklājums:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +#, fuzzy +msgid "Detect keyboard layout?" +msgstr "Tastatūras izkārtojums:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +msgid "" +"You can try to have your keyboard layout detected by pressing a series of " +"keys. If you do not want to do this, you will be able to select your " +"keyboard layout from a list." +msgstr "" + +#. Type: detect-keyboard +#. Description +#: ../keyboard-configuration.templates:23001 +#, fuzzy +msgid "Detecting your keyboard layout" +msgstr "Tastatūras izklājuma noklusējuma vērtība" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +#, fuzzy +msgid "Keyboard layout detection complete" +msgstr "Tastatūras izkārtojums:" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +msgid "" +"Based on the keys you pressed, your keyboard layout appears to be " +"\"${LAYOUT}\". If this is not correct, you can go back and select your " +"layout from the full list instead." +msgstr "" diff -Nru console-setup-1.222/debian/po/mk.po console-setup-1.222ubuntu1/debian/po/mk.po --- console-setup-1.222/debian/po/mk.po 2023-06-21 21:20:52.000000000 +0200 +++ console-setup-1.222ubuntu1/debian/po/mk.po 2023-06-29 15:02:02.000000000 +0200 @@ -1497,3 +1497,42 @@ #: ../keyboard-configuration.templates:16002 msgid "Keymap to use:" msgstr "Распоред на тастатура кој ќе се користи:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +#, fuzzy +msgid "Detect keyboard layout?" +msgstr "Распоред на тастатура:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +msgid "" +"You can try to have your keyboard layout detected by pressing a series of " +"keys. If you do not want to do this, you will be able to select your " +"keyboard layout from a list." +msgstr "" + +#. Type: detect-keyboard +#. Description +#: ../keyboard-configuration.templates:23001 +#, fuzzy +msgid "Detecting your keyboard layout" +msgstr "Основен избор за распоредот на тастатурата" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +#, fuzzy +msgid "Keyboard layout detection complete" +msgstr "Распоред на тастатура:" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +msgid "" +"Based on the keys you pressed, your keyboard layout appears to be " +"\"${LAYOUT}\". If this is not correct, you can go back and select your " +"layout from the full list instead." +msgstr "" diff -Nru console-setup-1.222/debian/po/ml.po console-setup-1.222ubuntu1/debian/po/ml.po --- console-setup-1.222/debian/po/ml.po 2023-06-21 21:20:52.000000000 +0200 +++ console-setup-1.222ubuntu1/debian/po/ml.po 2023-06-29 15:02:02.000000000 +0200 @@ -1511,3 +1511,42 @@ #: ../keyboard-configuration.templates:16002 msgid "Keymap to use:" msgstr "ഉപയോഗിയ്ക്കേണ്ട കീമാപ്:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +#, fuzzy +msgid "Detect keyboard layout?" +msgstr "കീബോര്‍ഡ് വിന്യാസം:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +msgid "" +"You can try to have your keyboard layout detected by pressing a series of " +"keys. If you do not want to do this, you will be able to select your " +"keyboard layout from a list." +msgstr "" + +#. Type: detect-keyboard +#. Description +#: ../keyboard-configuration.templates:23001 +#, fuzzy +msgid "Detecting your keyboard layout" +msgstr "ഒരു കീബോര്‍ഡ് വിന്യാസത്തിന്റെ സഹജവില" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +#, fuzzy +msgid "Keyboard layout detection complete" +msgstr "കീബോര്‍ഡ് വിന്യാസം:" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +msgid "" +"Based on the keys you pressed, your keyboard layout appears to be " +"\"${LAYOUT}\". If this is not correct, you can go back and select your " +"layout from the full list instead." +msgstr "" diff -Nru console-setup-1.222/debian/po/mr.po console-setup-1.222ubuntu1/debian/po/mr.po --- console-setup-1.222/debian/po/mr.po 2023-06-21 21:20:52.000000000 +0200 +++ console-setup-1.222ubuntu1/debian/po/mr.po 2023-06-29 15:02:02.000000000 +0200 @@ -1471,3 +1471,42 @@ #: ../keyboard-configuration.templates:16002 msgid "Keymap to use:" msgstr "वापरायचा कीमॅप:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +#, fuzzy +msgid "Detect keyboard layout?" +msgstr "कळफलकाचा आरखडा:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +msgid "" +"You can try to have your keyboard layout detected by pressing a series of " +"keys. If you do not want to do this, you will be able to select your " +"keyboard layout from a list." +msgstr "" + +#. Type: detect-keyboard +#. Description +#: ../keyboard-configuration.templates:23001 +#, fuzzy +msgid "Detecting your keyboard layout" +msgstr "कळफलकाचा मूलनिर्धारित आरखडा" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +#, fuzzy +msgid "Keyboard layout detection complete" +msgstr "कळफलकाचा आरखडा:" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +msgid "" +"Based on the keys you pressed, your keyboard layout appears to be " +"\"${LAYOUT}\". If this is not correct, you can go back and select your " +"layout from the full list instead." +msgstr "" diff -Nru console-setup-1.222/debian/po/nb.po console-setup-1.222ubuntu1/debian/po/nb.po --- console-setup-1.222/debian/po/nb.po 2023-06-21 21:20:52.000000000 +0200 +++ console-setup-1.222ubuntu1/debian/po/nb.po 2023-06-29 15:02:02.000000000 +0200 @@ -1493,3 +1493,42 @@ #: ../keyboard-configuration.templates:16002 msgid "Keymap to use:" msgstr "Tasteoppsett som skal brukes:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +#, fuzzy +msgid "Detect keyboard layout?" +msgstr "Tastaturutforming:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +msgid "" +"You can try to have your keyboard layout detected by pressing a series of " +"keys. If you do not want to do this, you will be able to select your " +"keyboard layout from a list." +msgstr "" + +#. Type: detect-keyboard +#. Description +#: ../keyboard-configuration.templates:23001 +#, fuzzy +msgid "Detecting your keyboard layout" +msgstr "Standarden for tastaturutformingen" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +#, fuzzy +msgid "Keyboard layout detection complete" +msgstr "Tastaturutforming:" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +msgid "" +"Based on the keys you pressed, your keyboard layout appears to be " +"\"${LAYOUT}\". If this is not correct, you can go back and select your " +"layout from the full list instead." +msgstr "" diff -Nru console-setup-1.222/debian/po/ne.po console-setup-1.222ubuntu1/debian/po/ne.po --- console-setup-1.222/debian/po/ne.po 2023-06-21 21:20:52.000000000 +0200 +++ console-setup-1.222ubuntu1/debian/po/ne.po 2023-06-29 15:02:02.000000000 +0200 @@ -1467,3 +1467,42 @@ #: ../keyboard-configuration.templates:16002 msgid "Keymap to use:" msgstr "प्रयोग गर्नका लागि कुञ्जी मानचित्र:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +#, fuzzy +msgid "Detect keyboard layout?" +msgstr "एउटा कुञ्जीपाटी सजावट चयन गर्नुहोस् " + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +msgid "" +"You can try to have your keyboard layout detected by pressing a series of " +"keys. If you do not want to do this, you will be able to select your " +"keyboard layout from a list." +msgstr "" + +#. Type: detect-keyboard +#. Description +#: ../keyboard-configuration.templates:23001 +#, fuzzy +msgid "Detecting your keyboard layout" +msgstr "एउटा कुञ्जीपाटी सजावट चयन गर्नुहोस् " + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +#, fuzzy +msgid "Keyboard layout detection complete" +msgstr "एउटा कुञ्जीपाटी सजावट चयन गर्नुहोस् " + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +msgid "" +"Based on the keys you pressed, your keyboard layout appears to be " +"\"${LAYOUT}\". If this is not correct, you can go back and select your " +"layout from the full list instead." +msgstr "" diff -Nru console-setup-1.222/debian/po/nl.po console-setup-1.222ubuntu1/debian/po/nl.po --- console-setup-1.222/debian/po/nl.po 2023-06-21 21:20:52.000000000 +0200 +++ console-setup-1.222ubuntu1/debian/po/nl.po 2023-06-29 15:02:02.000000000 +0200 @@ -1501,3 +1501,42 @@ #: ../keyboard-configuration.templates:16002 msgid "Keymap to use:" msgstr "Te gebruiken toetsenbordindeling:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +#, fuzzy +msgid "Detect keyboard layout?" +msgstr "Toetsenbordindeling:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +msgid "" +"You can try to have your keyboard layout detected by pressing a series of " +"keys. If you do not want to do this, you will be able to select your " +"keyboard layout from a list." +msgstr "" + +#. Type: detect-keyboard +#. Description +#: ../keyboard-configuration.templates:23001 +#, fuzzy +msgid "Detecting your keyboard layout" +msgstr "De standaard voor de toetsenbordindeling" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +#, fuzzy +msgid "Keyboard layout detection complete" +msgstr "Toetsenbordindeling:" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +msgid "" +"Based on the keys you pressed, your keyboard layout appears to be " +"\"${LAYOUT}\". If this is not correct, you can go back and select your " +"layout from the full list instead." +msgstr "" diff -Nru console-setup-1.222/debian/po/nn.po console-setup-1.222ubuntu1/debian/po/nn.po --- console-setup-1.222/debian/po/nn.po 2023-06-21 21:20:52.000000000 +0200 +++ console-setup-1.222ubuntu1/debian/po/nn.po 2023-06-29 15:02:02.000000000 +0200 @@ -1491,3 +1491,42 @@ #: ../keyboard-configuration.templates:16002 msgid "Keymap to use:" msgstr "Tasteoppsett som skal brukast:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +#, fuzzy +msgid "Detect keyboard layout?" +msgstr "Vel eit tastaturoppsett" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +msgid "" +"You can try to have your keyboard layout detected by pressing a series of " +"keys. If you do not want to do this, you will be able to select your " +"keyboard layout from a list." +msgstr "" + +#. Type: detect-keyboard +#. Description +#: ../keyboard-configuration.templates:23001 +#, fuzzy +msgid "Detecting your keyboard layout" +msgstr "Vel eit tastaturoppsett" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +#, fuzzy +msgid "Keyboard layout detection complete" +msgstr "Vel eit tastaturoppsett" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +msgid "" +"Based on the keys you pressed, your keyboard layout appears to be " +"\"${LAYOUT}\". If this is not correct, you can go back and select your " +"layout from the full list instead." +msgstr "" diff -Nru console-setup-1.222/debian/po/oc.po console-setup-1.222ubuntu1/debian/po/oc.po --- console-setup-1.222/debian/po/oc.po 2023-06-21 21:20:52.000000000 +0200 +++ console-setup-1.222ubuntu1/debian/po/oc.po 2023-06-29 15:02:02.000000000 +0200 @@ -1489,3 +1489,42 @@ #: ../keyboard-configuration.templates:16002 msgid "Keymap to use:" msgstr "Carta de clavièr d'utilizar :" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +#, fuzzy +msgid "Detect keyboard layout?" +msgstr "Disposicion del clavièr :" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +msgid "" +"You can try to have your keyboard layout detected by pressing a series of " +"keys. If you do not want to do this, you will be able to select your " +"keyboard layout from a list." +msgstr "" + +#. Type: detect-keyboard +#. Description +#: ../keyboard-configuration.templates:23001 +#, fuzzy +msgid "Detecting your keyboard layout" +msgstr "Disposicion per defaut pel clavièr" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +#, fuzzy +msgid "Keyboard layout detection complete" +msgstr "Disposicion del clavièr :" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +msgid "" +"Based on the keys you pressed, your keyboard layout appears to be " +"\"${LAYOUT}\". If this is not correct, you can go back and select your " +"layout from the full list instead." +msgstr "" diff -Nru console-setup-1.222/debian/po/pa.po console-setup-1.222ubuntu1/debian/po/pa.po --- console-setup-1.222/debian/po/pa.po 2023-06-21 21:20:52.000000000 +0200 +++ console-setup-1.222ubuntu1/debian/po/pa.po 2023-06-29 15:02:02.000000000 +0200 @@ -1465,3 +1465,42 @@ #: ../keyboard-configuration.templates:16002 msgid "Keymap to use:" msgstr "ਵਰਤਣ ਲਈ ਕੀਮੈਪ:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +#, fuzzy +msgid "Detect keyboard layout?" +msgstr "ਆਪਣਾ ਕੀ-ਬੋਰਡ ਲੇਆਉਟ ਚੁਣੋ" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +msgid "" +"You can try to have your keyboard layout detected by pressing a series of " +"keys. If you do not want to do this, you will be able to select your " +"keyboard layout from a list." +msgstr "" + +#. Type: detect-keyboard +#. Description +#: ../keyboard-configuration.templates:23001 +#, fuzzy +msgid "Detecting your keyboard layout" +msgstr "ਆਪਣਾ ਕੀ-ਬੋਰਡ ਲੇਆਉਟ ਚੁਣੋ" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +#, fuzzy +msgid "Keyboard layout detection complete" +msgstr "ਆਪਣਾ ਕੀ-ਬੋਰਡ ਲੇਆਉਟ ਚੁਣੋ" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +msgid "" +"Based on the keys you pressed, your keyboard layout appears to be " +"\"${LAYOUT}\". If this is not correct, you can go back and select your " +"layout from the full list instead." +msgstr "" diff -Nru console-setup-1.222/debian/po/pl.po console-setup-1.222ubuntu1/debian/po/pl.po --- console-setup-1.222/debian/po/pl.po 2023-06-21 21:20:52.000000000 +0200 +++ console-setup-1.222ubuntu1/debian/po/pl.po 2023-06-29 15:02:02.000000000 +0200 @@ -1504,3 +1504,42 @@ #: ../keyboard-configuration.templates:16002 msgid "Keymap to use:" msgstr "Układ klawiatury:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +#, fuzzy +msgid "Detect keyboard layout?" +msgstr "Układ klawiatury:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +msgid "" +"You can try to have your keyboard layout detected by pressing a series of " +"keys. If you do not want to do this, you will be able to select your " +"keyboard layout from a list." +msgstr "" + +#. Type: detect-keyboard +#. Description +#: ../keyboard-configuration.templates:23001 +#, fuzzy +msgid "Detecting your keyboard layout" +msgstr "Domyślne ustawienie dla danego układu klawiatury" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +#, fuzzy +msgid "Keyboard layout detection complete" +msgstr "Układ klawiatury:" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +msgid "" +"Based on the keys you pressed, your keyboard layout appears to be " +"\"${LAYOUT}\". If this is not correct, you can go back and select your " +"layout from the full list instead." +msgstr "" diff -Nru console-setup-1.222/debian/po/pt_BR.po console-setup-1.222ubuntu1/debian/po/pt_BR.po --- console-setup-1.222/debian/po/pt_BR.po 2023-06-21 21:20:52.000000000 +0200 +++ console-setup-1.222ubuntu1/debian/po/pt_BR.po 2023-06-29 15:02:02.000000000 +0200 @@ -1489,3 +1489,42 @@ #: ../keyboard-configuration.templates:16002 msgid "Keymap to use:" msgstr "Mapa de teclado a ser usado:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +#, fuzzy +msgid "Detect keyboard layout?" +msgstr "Layout do teclado:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +msgid "" +"You can try to have your keyboard layout detected by pressing a series of " +"keys. If you do not want to do this, you will be able to select your " +"keyboard layout from a list." +msgstr "" + +#. Type: detect-keyboard +#. Description +#: ../keyboard-configuration.templates:23001 +#, fuzzy +msgid "Detecting your keyboard layout" +msgstr "O padrão para o layout de teclado" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +#, fuzzy +msgid "Keyboard layout detection complete" +msgstr "Layout do teclado:" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +msgid "" +"Based on the keys you pressed, your keyboard layout appears to be " +"\"${LAYOUT}\". If this is not correct, you can go back and select your " +"layout from the full list instead." +msgstr "" diff -Nru console-setup-1.222/debian/po/pt.po console-setup-1.222ubuntu1/debian/po/pt.po --- console-setup-1.222/debian/po/pt.po 2023-06-21 21:20:52.000000000 +0200 +++ console-setup-1.222ubuntu1/debian/po/pt.po 2023-06-29 15:02:02.000000000 +0200 @@ -1487,3 +1487,42 @@ #: ../keyboard-configuration.templates:16002 msgid "Keymap to use:" msgstr "Mapa de teclado a utilizar:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +#, fuzzy +msgid "Detect keyboard layout?" +msgstr "Disposição do teclado:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +msgid "" +"You can try to have your keyboard layout detected by pressing a series of " +"keys. If you do not want to do this, you will be able to select your " +"keyboard layout from a list." +msgstr "" + +#. Type: detect-keyboard +#. Description +#: ../keyboard-configuration.templates:23001 +#, fuzzy +msgid "Detecting your keyboard layout" +msgstr "O predefinido para a disposição do teclado" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +#, fuzzy +msgid "Keyboard layout detection complete" +msgstr "Disposição do teclado:" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +msgid "" +"Based on the keys you pressed, your keyboard layout appears to be " +"\"${LAYOUT}\". If this is not correct, you can go back and select your " +"layout from the full list instead." +msgstr "" diff -Nru console-setup-1.222/debian/po/ro.po console-setup-1.222ubuntu1/debian/po/ro.po --- console-setup-1.222/debian/po/ro.po 2023-06-21 21:20:52.000000000 +0200 +++ console-setup-1.222ubuntu1/debian/po/ro.po 2023-06-29 15:02:02.000000000 +0200 @@ -1506,3 +1506,42 @@ #: ../keyboard-configuration.templates:16002 msgid "Keymap to use:" msgstr "Configurația de taste utilizată:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +#, fuzzy +msgid "Detect keyboard layout?" +msgstr "Aranjamentul de tastatură:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +msgid "" +"You can try to have your keyboard layout detected by pressing a series of " +"keys. If you do not want to do this, you will be able to select your " +"keyboard layout from a list." +msgstr "" + +#. Type: detect-keyboard +#. Description +#: ../keyboard-configuration.templates:23001 +#, fuzzy +msgid "Detecting your keyboard layout" +msgstr "Valoarea implicită a aranjamentului de tastatură" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +#, fuzzy +msgid "Keyboard layout detection complete" +msgstr "Aranjamentul de tastatură:" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +msgid "" +"Based on the keys you pressed, your keyboard layout appears to be " +"\"${LAYOUT}\". If this is not correct, you can go back and select your " +"layout from the full list instead." +msgstr "" diff -Nru console-setup-1.222/debian/po/ru.po console-setup-1.222ubuntu1/debian/po/ru.po --- console-setup-1.222/debian/po/ru.po 2023-06-21 21:20:52.000000000 +0200 +++ console-setup-1.222ubuntu1/debian/po/ru.po 2023-06-29 15:02:02.000000000 +0200 @@ -1498,3 +1498,42 @@ #: ../keyboard-configuration.templates:16002 msgid "Keymap to use:" msgstr "Выберите клавиатурную раскладку:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +#, fuzzy +msgid "Detect keyboard layout?" +msgstr "Раскладка клавиатуры:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +msgid "" +"You can try to have your keyboard layout detected by pressing a series of " +"keys. If you do not want to do this, you will be able to select your " +"keyboard layout from a list." +msgstr "" + +#. Type: detect-keyboard +#. Description +#: ../keyboard-configuration.templates:23001 +#, fuzzy +msgid "Detecting your keyboard layout" +msgstr "Раскладка клавиатуры по умолчанию" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +#, fuzzy +msgid "Keyboard layout detection complete" +msgstr "Раскладка клавиатуры:" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +msgid "" +"Based on the keys you pressed, your keyboard layout appears to be " +"\"${LAYOUT}\". If this is not correct, you can go back and select your " +"layout from the full list instead." +msgstr "" diff -Nru console-setup-1.222/debian/po/se.po console-setup-1.222ubuntu1/debian/po/se.po --- console-setup-1.222/debian/po/se.po 2023-06-21 21:20:52.000000000 +0200 +++ console-setup-1.222ubuntu1/debian/po/se.po 2023-06-29 15:02:02.000000000 +0200 @@ -1452,3 +1452,42 @@ #, fuzzy msgid "Keymap to use:" msgstr "Nammabálvváid čujuhusat:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +#, fuzzy +msgid "Detect keyboard layout?" +msgstr "Vállje boallobeavdehápmi" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +msgid "" +"You can try to have your keyboard layout detected by pressing a series of " +"keys. If you do not want to do this, you will be able to select your " +"keyboard layout from a list." +msgstr "" + +#. Type: detect-keyboard +#. Description +#: ../keyboard-configuration.templates:23001 +#, fuzzy +msgid "Detecting your keyboard layout" +msgstr "Vállje boallobeavdehápmi" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +#, fuzzy +msgid "Keyboard layout detection complete" +msgstr "Vállje boallobeavdehápmi" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +msgid "" +"Based on the keys you pressed, your keyboard layout appears to be " +"\"${LAYOUT}\". If this is not correct, you can go back and select your " +"layout from the full list instead." +msgstr "" diff -Nru console-setup-1.222/debian/po/si.po console-setup-1.222ubuntu1/debian/po/si.po --- console-setup-1.222/debian/po/si.po 2023-06-21 21:20:52.000000000 +0200 +++ console-setup-1.222ubuntu1/debian/po/si.po 2023-06-29 15:02:02.000000000 +0200 @@ -1468,3 +1468,42 @@ #: ../keyboard-configuration.templates:16002 msgid "Keymap to use:" msgstr "භාවිත යතුරු සැකැස්ම:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +#, fuzzy +msgid "Detect keyboard layout?" +msgstr "යතුරුපුවරු ආකෘතිය:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +msgid "" +"You can try to have your keyboard layout detected by pressing a series of " +"keys. If you do not want to do this, you will be able to select your " +"keyboard layout from a list." +msgstr "" + +#. Type: detect-keyboard +#. Description +#: ../keyboard-configuration.templates:23001 +#, fuzzy +msgid "Detecting your keyboard layout" +msgstr "යතුරුපුවරු ආකෘතිය සඳහා සම්මතය" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +#, fuzzy +msgid "Keyboard layout detection complete" +msgstr "යතුරුපුවරු ආකෘතිය:" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +msgid "" +"Based on the keys you pressed, your keyboard layout appears to be " +"\"${LAYOUT}\". If this is not correct, you can go back and select your " +"layout from the full list instead." +msgstr "" diff -Nru console-setup-1.222/debian/po/sk.po console-setup-1.222ubuntu1/debian/po/sk.po --- console-setup-1.222/debian/po/sk.po 2023-06-21 21:20:52.000000000 +0200 +++ console-setup-1.222ubuntu1/debian/po/sk.po 2023-06-29 15:02:02.000000000 +0200 @@ -1491,3 +1491,42 @@ #: ../keyboard-configuration.templates:16002 msgid "Keymap to use:" msgstr "Klávesová mapa:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +#, fuzzy +msgid "Detect keyboard layout?" +msgstr "Rozloženie klávesnice:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +msgid "" +"You can try to have your keyboard layout detected by pressing a series of " +"keys. If you do not want to do this, you will be able to select your " +"keyboard layout from a list." +msgstr "" + +#. Type: detect-keyboard +#. Description +#: ../keyboard-configuration.templates:23001 +#, fuzzy +msgid "Detecting your keyboard layout" +msgstr "Predvolené rozloženie klávesnice" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +#, fuzzy +msgid "Keyboard layout detection complete" +msgstr "Rozloženie klávesnice:" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +msgid "" +"Based on the keys you pressed, your keyboard layout appears to be " +"\"${LAYOUT}\". If this is not correct, you can go back and select your " +"layout from the full list instead." +msgstr "" diff -Nru console-setup-1.222/debian/po/sl.po console-setup-1.222ubuntu1/debian/po/sl.po --- console-setup-1.222/debian/po/sl.po 2023-06-21 21:20:52.000000000 +0200 +++ console-setup-1.222ubuntu1/debian/po/sl.po 2023-06-29 15:02:02.000000000 +0200 @@ -1507,3 +1507,42 @@ #: ../keyboard-configuration.templates:16002 msgid "Keymap to use:" msgstr "Postavitev tipkovnice, ki jo želite uporabljati:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +#, fuzzy +msgid "Detect keyboard layout?" +msgstr "Postavitev tipkovnice:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +msgid "" +"You can try to have your keyboard layout detected by pressing a series of " +"keys. If you do not want to do this, you will be able to select your " +"keyboard layout from a list." +msgstr "" + +#. Type: detect-keyboard +#. Description +#: ../keyboard-configuration.templates:23001 +#, fuzzy +msgid "Detecting your keyboard layout" +msgstr "Privzeta postavitev tipkovnice" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +#, fuzzy +msgid "Keyboard layout detection complete" +msgstr "Postavitev tipkovnice:" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +msgid "" +"Based on the keys you pressed, your keyboard layout appears to be " +"\"${LAYOUT}\". If this is not correct, you can go back and select your " +"layout from the full list instead." +msgstr "" diff -Nru console-setup-1.222/debian/po/sq.po console-setup-1.222ubuntu1/debian/po/sq.po --- console-setup-1.222/debian/po/sq.po 2023-06-21 21:20:52.000000000 +0200 +++ console-setup-1.222ubuntu1/debian/po/sq.po 2023-06-29 15:02:02.000000000 +0200 @@ -1494,3 +1494,42 @@ #: ../keyboard-configuration.templates:16002 msgid "Keymap to use:" msgstr "Lloji i tastierës për tu përdorur:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +#, fuzzy +msgid "Detect keyboard layout?" +msgstr "Zgjidh një tastierë" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +msgid "" +"You can try to have your keyboard layout detected by pressing a series of " +"keys. If you do not want to do this, you will be able to select your " +"keyboard layout from a list." +msgstr "" + +#. Type: detect-keyboard +#. Description +#: ../keyboard-configuration.templates:23001 +#, fuzzy +msgid "Detecting your keyboard layout" +msgstr "Zgjidh një tastierë" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +#, fuzzy +msgid "Keyboard layout detection complete" +msgstr "Zgjidh një tastierë" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +msgid "" +"Based on the keys you pressed, your keyboard layout appears to be " +"\"${LAYOUT}\". If this is not correct, you can go back and select your " +"layout from the full list instead." +msgstr "" diff -Nru console-setup-1.222/debian/po/sr@latin.po console-setup-1.222ubuntu1/debian/po/sr@latin.po --- console-setup-1.222/debian/po/sr@latin.po 2023-06-21 21:20:52.000000000 +0200 +++ console-setup-1.222ubuntu1/debian/po/sr@latin.po 2023-06-29 15:02:02.000000000 +0200 @@ -1498,6 +1498,45 @@ msgid "Keymap to use:" msgstr "" +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +#, fuzzy +msgid "Detect keyboard layout?" +msgstr "Raspored tastature:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +msgid "" +"You can try to have your keyboard layout detected by pressing a series of " +"keys. If you do not want to do this, you will be able to select your " +"keyboard layout from a list." +msgstr "" + +#. Type: detect-keyboard +#. Description +#: ../keyboard-configuration.templates:23001 +#, fuzzy +msgid "Detecting your keyboard layout" +msgstr "Podrazumevani raspored tastature" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +#, fuzzy +msgid "Keyboard layout detection complete" +msgstr "Raspored tastature:" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +msgid "" +"Based on the keys you pressed, your keyboard layout appears to be " +"\"${LAYOUT}\". If this is not correct, you can go back and select your " +"layout from the full list instead." +msgstr "" + #, fuzzy #~| msgid "" #~| "Please select the size of the font for the Linux console. For reference, " diff -Nru console-setup-1.222/debian/po/sr.po console-setup-1.222ubuntu1/debian/po/sr.po --- console-setup-1.222/debian/po/sr.po 2023-06-21 21:20:52.000000000 +0200 +++ console-setup-1.222ubuntu1/debian/po/sr.po 2023-06-29 15:02:02.000000000 +0200 @@ -1482,3 +1482,42 @@ #: ../keyboard-configuration.templates:16002 msgid "Keymap to use:" msgstr "Распоред тастатуре за употребу:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +#, fuzzy +msgid "Detect keyboard layout?" +msgstr "Распоред тастатуре:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +msgid "" +"You can try to have your keyboard layout detected by pressing a series of " +"keys. If you do not want to do this, you will be able to select your " +"keyboard layout from a list." +msgstr "" + +#. Type: detect-keyboard +#. Description +#: ../keyboard-configuration.templates:23001 +#, fuzzy +msgid "Detecting your keyboard layout" +msgstr "Подразумевани распоред тастатуре" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +#, fuzzy +msgid "Keyboard layout detection complete" +msgstr "Распоред тастатуре:" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +msgid "" +"Based on the keys you pressed, your keyboard layout appears to be " +"\"${LAYOUT}\". If this is not correct, you can go back and select your " +"layout from the full list instead." +msgstr "" diff -Nru console-setup-1.222/debian/po/sv.po console-setup-1.222ubuntu1/debian/po/sv.po --- console-setup-1.222/debian/po/sv.po 2023-06-21 21:20:52.000000000 +0200 +++ console-setup-1.222ubuntu1/debian/po/sv.po 2023-06-29 15:02:02.000000000 +0200 @@ -1498,3 +1498,42 @@ #: ../keyboard-configuration.templates:16002 msgid "Keymap to use:" msgstr "Tangentuppsättning som ska användas:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +#, fuzzy +msgid "Detect keyboard layout?" +msgstr "Tangentbordslayout:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +msgid "" +"You can try to have your keyboard layout detected by pressing a series of " +"keys. If you do not want to do this, you will be able to select your " +"keyboard layout from a list." +msgstr "" + +#. Type: detect-keyboard +#. Description +#: ../keyboard-configuration.templates:23001 +#, fuzzy +msgid "Detecting your keyboard layout" +msgstr "Standardvärdet för tangentbordslayouten" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +#, fuzzy +msgid "Keyboard layout detection complete" +msgstr "Tangentbordslayout:" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +msgid "" +"Based on the keys you pressed, your keyboard layout appears to be " +"\"${LAYOUT}\". If this is not correct, you can go back and select your " +"layout from the full list instead." +msgstr "" diff -Nru console-setup-1.222/debian/po/ta.po console-setup-1.222ubuntu1/debian/po/ta.po --- console-setup-1.222/debian/po/ta.po 2023-06-21 21:20:52.000000000 +0200 +++ console-setup-1.222ubuntu1/debian/po/ta.po 2023-06-29 15:02:02.000000000 +0200 @@ -1517,3 +1517,42 @@ #: ../keyboard-configuration.templates:16002 msgid "Keymap to use:" msgstr "பயன் படுத்த விசைப்பலகை அமைப்பு:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +#, fuzzy +msgid "Detect keyboard layout?" +msgstr "விசைப்பலகை இடஅமைவு:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +msgid "" +"You can try to have your keyboard layout detected by pressing a series of " +"keys. If you do not want to do this, you will be able to select your " +"keyboard layout from a list." +msgstr "" + +#. Type: detect-keyboard +#. Description +#: ../keyboard-configuration.templates:23001 +#, fuzzy +msgid "Detecting your keyboard layout" +msgstr "முன்னிருப்பு விசைப்பலகை இடஅமைவு " + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +#, fuzzy +msgid "Keyboard layout detection complete" +msgstr "விசைப்பலகை இடஅமைவு:" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +msgid "" +"Based on the keys you pressed, your keyboard layout appears to be " +"\"${LAYOUT}\". If this is not correct, you can go back and select your " +"layout from the full list instead." +msgstr "" diff -Nru console-setup-1.222/debian/po/templates.pot console-setup-1.222ubuntu1/debian/po/templates.pot --- console-setup-1.222/debian/po/templates.pot 2023-06-21 21:34:22.000000000 +0200 +++ console-setup-1.222ubuntu1/debian/po/templates.pot 2023-06-29 15:02:36.000000000 +0200 @@ -1409,3 +1409,39 @@ #: ../keyboard-configuration.templates:16002 msgid "Keymap to use:" msgstr "" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +msgid "Detect keyboard layout?" +msgstr "" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +msgid "" +"You can try to have your keyboard layout detected by pressing a series of " +"keys. If you do not want to do this, you will be able to select your " +"keyboard layout from a list." +msgstr "" + +#. Type: detect-keyboard +#. Description +#: ../keyboard-configuration.templates:23001 +msgid "Detecting your keyboard layout" +msgstr "" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +msgid "Keyboard layout detection complete" +msgstr "" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +msgid "" +"Based on the keys you pressed, your keyboard layout appears to be " +"\"${LAYOUT}\". If this is not correct, you can go back and select your " +"layout from the full list instead." +msgstr "" diff -Nru console-setup-1.222/debian/po/te.po console-setup-1.222ubuntu1/debian/po/te.po --- console-setup-1.222/debian/po/te.po 2023-06-21 21:20:52.000000000 +0200 +++ console-setup-1.222ubuntu1/debian/po/te.po 2023-06-29 15:02:02.000000000 +0200 @@ -1462,3 +1462,42 @@ #: ../keyboard-configuration.templates:16002 msgid "Keymap to use:" msgstr "ఉపయోగించాల్సిన కీమ్యాప్:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +#, fuzzy +msgid "Detect keyboard layout?" +msgstr "కీబోర్డు లేఔటు:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +msgid "" +"You can try to have your keyboard layout detected by pressing a series of " +"keys. If you do not want to do this, you will be able to select your " +"keyboard layout from a list." +msgstr "" + +#. Type: detect-keyboard +#. Description +#: ../keyboard-configuration.templates:23001 +#, fuzzy +msgid "Detecting your keyboard layout" +msgstr "ఒక కీబోర్డు లేఔటు ఎంచుకోకపోతే తీసుకొనేది" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +#, fuzzy +msgid "Keyboard layout detection complete" +msgstr "కీబోర్డు లేఔటు:" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +msgid "" +"Based on the keys you pressed, your keyboard layout appears to be " +"\"${LAYOUT}\". If this is not correct, you can go back and select your " +"layout from the full list instead." +msgstr "" diff -Nru console-setup-1.222/debian/po/tg.po console-setup-1.222ubuntu1/debian/po/tg.po --- console-setup-1.222/debian/po/tg.po 2023-06-21 21:20:52.000000000 +0200 +++ console-setup-1.222ubuntu1/debian/po/tg.po 2023-06-29 15:02:02.000000000 +0200 @@ -1492,3 +1492,42 @@ #: ../keyboard-configuration.templates:16002 msgid "Keymap to use:" msgstr "Тарҳбандии ҳарфкалид барои истифода:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +#, fuzzy +msgid "Detect keyboard layout?" +msgstr "Тарҳбандии клавиатура:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +msgid "" +"You can try to have your keyboard layout detected by pressing a series of " +"keys. If you do not want to do this, you will be able to select your " +"keyboard layout from a list." +msgstr "" + +#. Type: detect-keyboard +#. Description +#: ../keyboard-configuration.templates:23001 +#, fuzzy +msgid "Detecting your keyboard layout" +msgstr "Тарҳбандии пешфарз барои клавиатура" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +#, fuzzy +msgid "Keyboard layout detection complete" +msgstr "Тарҳбандии клавиатура:" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +msgid "" +"Based on the keys you pressed, your keyboard layout appears to be " +"\"${LAYOUT}\". If this is not correct, you can go back and select your " +"layout from the full list instead." +msgstr "" diff -Nru console-setup-1.222/debian/po/th.po console-setup-1.222ubuntu1/debian/po/th.po --- console-setup-1.222/debian/po/th.po 2023-06-21 21:20:52.000000000 +0200 +++ console-setup-1.222ubuntu1/debian/po/th.po 2023-06-29 15:02:02.000000000 +0200 @@ -1464,3 +1464,42 @@ #: ../keyboard-configuration.templates:16002 msgid "Keymap to use:" msgstr "ผังแป้นพิมพ์ที่จะใช้:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +#, fuzzy +msgid "Detect keyboard layout?" +msgstr "ผังแป้นพิมพ์แบบย่อย:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +msgid "" +"You can try to have your keyboard layout detected by pressing a series of " +"keys. If you do not want to do this, you will be able to select your " +"keyboard layout from a list." +msgstr "" + +#. Type: detect-keyboard +#. Description +#: ../keyboard-configuration.templates:23001 +#, fuzzy +msgid "Detecting your keyboard layout" +msgstr "ค่าปริยายของผังแป้นพิมพ์" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +#, fuzzy +msgid "Keyboard layout detection complete" +msgstr "ผังแป้นพิมพ์แบบย่อย:" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +msgid "" +"Based on the keys you pressed, your keyboard layout appears to be " +"\"${LAYOUT}\". If this is not correct, you can go back and select your " +"layout from the full list instead." +msgstr "" diff -Nru console-setup-1.222/debian/po/tl.po console-setup-1.222ubuntu1/debian/po/tl.po --- console-setup-1.222/debian/po/tl.po 2023-06-21 21:20:52.000000000 +0200 +++ console-setup-1.222ubuntu1/debian/po/tl.po 2023-06-29 15:02:02.000000000 +0200 @@ -1499,3 +1499,42 @@ #: ../keyboard-configuration.templates:16002 msgid "Keymap to use:" msgstr "Anyo ng tiklado na gamitin:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +#, fuzzy +msgid "Detect keyboard layout?" +msgstr "Pumili ng tamang pagkakalatag ng tiklado" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +msgid "" +"You can try to have your keyboard layout detected by pressing a series of " +"keys. If you do not want to do this, you will be able to select your " +"keyboard layout from a list." +msgstr "" + +#. Type: detect-keyboard +#. Description +#: ../keyboard-configuration.templates:23001 +#, fuzzy +msgid "Detecting your keyboard layout" +msgstr "Pumili ng tamang pagkakalatag ng tiklado" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +#, fuzzy +msgid "Keyboard layout detection complete" +msgstr "Pumili ng tamang pagkakalatag ng tiklado" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +msgid "" +"Based on the keys you pressed, your keyboard layout appears to be " +"\"${LAYOUT}\". If this is not correct, you can go back and select your " +"layout from the full list instead." +msgstr "" diff -Nru console-setup-1.222/debian/po/tr.po console-setup-1.222ubuntu1/debian/po/tr.po --- console-setup-1.222/debian/po/tr.po 2023-06-21 21:20:52.000000000 +0200 +++ console-setup-1.222ubuntu1/debian/po/tr.po 2023-06-29 15:02:02.000000000 +0200 @@ -1540,3 +1540,42 @@ #: ../keyboard-configuration.templates:16002 msgid "Keymap to use:" msgstr "Kullanılacak klavye düzeni:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +#, fuzzy +msgid "Detect keyboard layout?" +msgstr "Klavye düzeni:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +msgid "" +"You can try to have your keyboard layout detected by pressing a series of " +"keys. If you do not want to do this, you will be able to select your " +"keyboard layout from a list." +msgstr "" + +#. Type: detect-keyboard +#. Description +#: ../keyboard-configuration.templates:23001 +#, fuzzy +msgid "Detecting your keyboard layout" +msgstr "Öntanımlı klavye düzeni" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +#, fuzzy +msgid "Keyboard layout detection complete" +msgstr "Klavye düzeni:" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +msgid "" +"Based on the keys you pressed, your keyboard layout appears to be " +"\"${LAYOUT}\". If this is not correct, you can go back and select your " +"layout from the full list instead." +msgstr "" diff -Nru console-setup-1.222/debian/po/ug.po console-setup-1.222ubuntu1/debian/po/ug.po --- console-setup-1.222/debian/po/ug.po 2023-06-21 21:20:52.000000000 +0200 +++ console-setup-1.222ubuntu1/debian/po/ug.po 2023-06-29 15:02:02.000000000 +0200 @@ -1495,3 +1495,42 @@ #: ../keyboard-configuration.templates:16002 msgid "Keymap to use:" msgstr "ئىشلىتىدىغان ھەرپتاختا خەرىتىسى:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +#, fuzzy +msgid "Detect keyboard layout?" +msgstr "ھەرپتاختا جايلاشتۇرۇلۇشى:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +msgid "" +"You can try to have your keyboard layout detected by pressing a series of " +"keys. If you do not want to do this, you will be able to select your " +"keyboard layout from a list." +msgstr "" + +#. Type: detect-keyboard +#. Description +#: ../keyboard-configuration.templates:23001 +#, fuzzy +msgid "Detecting your keyboard layout" +msgstr "ھەرپتاختا جايلاشتۇرۇشنىڭ كۆڭۈلدىكى قىممىتى" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +#, fuzzy +msgid "Keyboard layout detection complete" +msgstr "ھەرپتاختا جايلاشتۇرۇلۇشى:" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +msgid "" +"Based on the keys you pressed, your keyboard layout appears to be " +"\"${LAYOUT}\". If this is not correct, you can go back and select your " +"layout from the full list instead." +msgstr "" diff -Nru console-setup-1.222/debian/po/uk.po console-setup-1.222ubuntu1/debian/po/uk.po --- console-setup-1.222/debian/po/uk.po 2023-06-21 21:20:52.000000000 +0200 +++ console-setup-1.222ubuntu1/debian/po/uk.po 2023-06-29 15:02:02.000000000 +0200 @@ -1496,3 +1496,42 @@ #: ../keyboard-configuration.templates:16002 msgid "Keymap to use:" msgstr "Розкладка клавіатури:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +#, fuzzy +msgid "Detect keyboard layout?" +msgstr "Розкладка клавіатури:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +msgid "" +"You can try to have your keyboard layout detected by pressing a series of " +"keys. If you do not want to do this, you will be able to select your " +"keyboard layout from a list." +msgstr "" + +#. Type: detect-keyboard +#. Description +#: ../keyboard-configuration.templates:23001 +#, fuzzy +msgid "Detecting your keyboard layout" +msgstr "Звична для даної розкладки клавіатури" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +#, fuzzy +msgid "Keyboard layout detection complete" +msgstr "Розкладка клавіатури:" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +msgid "" +"Based on the keys you pressed, your keyboard layout appears to be " +"\"${LAYOUT}\". If this is not correct, you can go back and select your " +"layout from the full list instead." +msgstr "" diff -Nru console-setup-1.222/debian/po/vi.po console-setup-1.222ubuntu1/debian/po/vi.po --- console-setup-1.222/debian/po/vi.po 2023-06-21 21:20:52.000000000 +0200 +++ console-setup-1.222ubuntu1/debian/po/vi.po 2023-06-29 15:02:02.000000000 +0200 @@ -1477,3 +1477,42 @@ #: ../keyboard-configuration.templates:16002 msgid "Keymap to use:" msgstr "Bàn phím cần dùng:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +#, fuzzy +msgid "Detect keyboard layout?" +msgstr "Bố trí bàn phím:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +msgid "" +"You can try to have your keyboard layout detected by pressing a series of " +"keys. If you do not want to do this, you will be able to select your " +"keyboard layout from a list." +msgstr "" + +#. Type: detect-keyboard +#. Description +#: ../keyboard-configuration.templates:23001 +#, fuzzy +msgid "Detecting your keyboard layout" +msgstr "Giá trị mặc định cho bố trí bàn phím" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +#, fuzzy +msgid "Keyboard layout detection complete" +msgstr "Bố trí bàn phím:" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +msgid "" +"Based on the keys you pressed, your keyboard layout appears to be " +"\"${LAYOUT}\". If this is not correct, you can go back and select your " +"layout from the full list instead." +msgstr "" diff -Nru console-setup-1.222/debian/po/zh_CN.po console-setup-1.222ubuntu1/debian/po/zh_CN.po --- console-setup-1.222/debian/po/zh_CN.po 2023-06-21 21:20:52.000000000 +0200 +++ console-setup-1.222ubuntu1/debian/po/zh_CN.po 2023-06-29 15:02:02.000000000 +0200 @@ -1474,3 +1474,42 @@ #: ../keyboard-configuration.templates:16002 msgid "Keymap to use:" msgstr "请选择键盘映射：" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +#, fuzzy +msgid "Detect keyboard layout?" +msgstr "键盘布局：" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +msgid "" +"You can try to have your keyboard layout detected by pressing a series of " +"keys. If you do not want to do this, you will be able to select your " +"keyboard layout from a list." +msgstr "" + +#. Type: detect-keyboard +#. Description +#: ../keyboard-configuration.templates:23001 +#, fuzzy +msgid "Detecting your keyboard layout" +msgstr "键盘布局默认值" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +#, fuzzy +msgid "Keyboard layout detection complete" +msgstr "键盘布局：" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +msgid "" +"Based on the keys you pressed, your keyboard layout appears to be " +"\"${LAYOUT}\". If this is not correct, you can go back and select your " +"layout from the full list instead." +msgstr "" diff -Nru console-setup-1.222/debian/po/zh_TW.po console-setup-1.222ubuntu1/debian/po/zh_TW.po --- console-setup-1.222/debian/po/zh_TW.po 2023-06-21 21:20:52.000000000 +0200 +++ console-setup-1.222ubuntu1/debian/po/zh_TW.po 2023-06-29 15:02:02.000000000 +0200 @@ -1509,3 +1509,42 @@ #: ../keyboard-configuration.templates:16002 msgid "Keymap to use:" msgstr "要使用的鍵盤對應:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +#, fuzzy +msgid "Detect keyboard layout?" +msgstr "鍵盤排列方式:" + +#. Type: boolean +#. Description +#: ../keyboard-configuration.templates:22001 +msgid "" +"You can try to have your keyboard layout detected by pressing a series of " +"keys. If you do not want to do this, you will be able to select your " +"keyboard layout from a list." +msgstr "" + +#. Type: detect-keyboard +#. Description +#: ../keyboard-configuration.templates:23001 +#, fuzzy +msgid "Detecting your keyboard layout" +msgstr "鍵盤排列方式的預設值" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +#, fuzzy +msgid "Keyboard layout detection complete" +msgstr "鍵盤排列方式:" + +#. Type: note +#. Description +#: ../keyboard-configuration.templates:24001 +msgid "" +"Based on the keys you pressed, your keyboard layout appears to be " +"\"${LAYOUT}\". If this is not correct, you can go back and select your " +"layout from the full list instead." +msgstr "" diff -Nru console-setup-1.222/debian/preprocessor console-setup-1.222ubuntu1/debian/preprocessor --- console-setup-1.222/debian/preprocessor 2023-06-21 21:20:52.000000000 +0200 +++ console-setup-1.222ubuntu1/debian/preprocessor 2023-06-29 15:02:02.000000000 +0200 @@ -64,12 +64,6 @@ print; }' "$file" >$tmp && cat $tmp >"$file" -if [ "$udeb" ]; then - # the following cryptic command is equivalent to sed "s/\(.*\*\)[^*]*/\1K/" - rmkbdnames=' | sed \"s/\\(.*\\*\\)[^*]*/\\1K/\" ' -else - rmkbdnames='' -fi if [ "$mini" ]; then awk ' /## *KBDNAMES *##/ { diff -Nru console-setup-1.222/debian/rules console-setup-1.222ubuntu1/debian/rules --- console-setup-1.222/debian/rules 2023-06-21 21:20:52.000000000 +0200 +++ console-setup-1.222ubuntu1/debian/rules 2023-06-29 15:02:02.000000000 +0200 @@ -7,6 +7,10 @@ MAKEFLAGS += -j$(NUMJOBS) endif +ifeq (,$(filter noudeb, $(DEB_BUILD_PROFILES))) + with_udeb = yes +endif + xkbdir := /usr/share/X11/xkb xkb_data_version = $(shell dpkg-query -W -f '$${source:Version}' xkb-data | cut -d - -f 1) @@ -55,40 +59,7 @@ && ./kbdnames-maker ./KeyboardNames.pl \ | grep -v '^C[*]' | grep -v '[*]model[*]' | sort | gzip -9n ) >$@ -models := amiga ataritt pc105 sun4 sun5 - -di-gzipped-ekmaps := $(addprefix $./, $(addsuffix .ekmap.gz, $(models))) - -di-gzipped-ekbds := $./pc105.ekbd.gz - -# di-kbdnames = us al ara es(ast) bd by in(ben) be ba br gb bg bg(phonetic)... -di-kbdnames := $(shell grep -A 2 keyboard-configuration/xkb-keymap debian/console-setup-udeb.templates | tail -n 1 | cut -d ' ' -f 2- | tr -d , | tr ' ' '\n' | grep -v skip-config) - -$./%.ekmap : model = $(notdir $(@:%.ekmap=%)) -$./%.ekmap : - (cd Keyboard \ - && ./kbdcompiler $(model) ./KeyboardNames.pl $(xkbdir) \ - "$(di-kbdnames)") >$@ - -$./%.ekbd : model = $(notdir $(@:%.ekbd=%)) -$./%.ekbd : - (cd Keyboard \ - && ./kbdcompiler freebsd-$(model) ./KeyboardNames.pl $(xkbdir) \ - "$(di-kbdnames)") >$@ - -# The following rules ensure that kbdcompiler is not run -# simultaneously for normal and udeb kmaps -$(foreach i,$(gzipped-ekmaps:%.gz=%) $(gzipped-ekbds:%.gz=%),\ - $(eval $i: $(maindir)/$(notdir $i))) - -# A hack so that KeyboardNames.pl is recomputed using the files in -# /usr/share/X11/xkb instead of the files shipped with console-setup -$(gzipped-ekmaps:%.gz=%) $(gzipped-ekbds:%.gz=%) $(di-gzipped-ekmaps:%.gz=%) $(di-gzipped-ekbds:%.gz=%) : $./Keyboard/KeyboardNames.pl -$./Keyboard/KeyboardNames.pl : building_debian -building_debian : - touch building_debian - -build: debian/kbdnames.gz $(di-gzipped-ekmaps) $(di-gzipped-ekbds) +build: debian/kbdnames.gz clean : maintainer-clean dh_testdir @@ -98,9 +69,10 @@ -rm -f debian/kbdnames.gz -rm -f debian/*~ dh_clean + ln -sf debian/copyright COPYRIGHT .PHONY : deb-udeb-install -deb-udeb-install: deb-install-linux deb-install-freebsd deb-install-main deb-install-bdf2psf udeb-install-linux udeb-install-freebsd udeb-install +deb-udeb-install: deb-install-linux deb-install-main deb-install-bdf2psf $(if $(with_udeb),udeb-install-linux udeb-install) .PHONY : deb-install-linux deb-install-linux: build @@ -119,14 +91,20 @@ --name keyboard-setup dh_systemd_enable -p console-setup-linux \ --name console-setup + dh_systemd_enable -p console-setup-linux \ + --name setvtrgb dh_installinit -p console-setup-linux \ --no-start --name keyboard-setup.sh dh_installinit -p console-setup-linux \ --no-start --name console-setup.sh + dh_installinit -p console-setup-linux \ + --no-start --name setvtrgb dh_systemd_start -p console-setup-linux \ --no-start --name keyboard-setup dh_systemd_start -p console-setup-linux \ --no-start --name console-setup + dh_systemd_start -p console-setup-linux \ + --no-start --name setvtrgb sed -i 's/RUNLEVEL/2 3 4 5/' \ debian/console-setup-linux/etc/init.d/console-setup.sh @@ -167,6 +145,12 @@ prefix=debian/console-setup/usr install-common $(MAKE) etcdir=debian/console-setup/etc \ prefix=debian/console-setup/usr install-ckbcomp + dh_install -pconsole-setup Keyboard/pc105.tree \ + usr/share/console-setup +ifneq (,$(filter console-setup-linux, $(shell dh_listpackages))) + install -m 644 debian/vtrgb debian/console-setup-linux/etc/console-setup/ + install -m 644 debian/vtrgb.vga debian/console-setup-linux/etc/console-setup/ +endif $(MAKE) etcdir=debian/console-setup-mini/etc \ prefix=debian/console-setup-mini/usr install-common $(MAKE) etcdir=debian/console-setup-mini/etc \ @@ -194,6 +178,20 @@ usr/share/console-setup/ dh_link -pkeyboard-configuration usr/share/X11/xkb/rules/xorg.lst \ usr/share/doc/keyboard-configuration/xorg.lst + install -d debian/keyboard-configuration/usr/share/initramfs-tools/hooks \ + debian/keyboard-configuration/usr/share/initramfs-tools/scripts/init-top \ + debian/keyboard-configuration/usr/share/initramfs-tools/scripts/panic + install -m755 debian/console-setup.initramfs-hook \ + debian/keyboard-configuration/usr/share/initramfs-tools/hooks/console_setup + install -m755 debian/console-setup.initramfs-top \ + debian/keyboard-configuration/usr/share/initramfs-tools/scripts/init-top/console_setup + sed -e "/^OPTION=/d" \ + < debian/console-setup.initramfs-top \ + > debian/keyboard-configuration/usr/share/initramfs-tools/scripts/panic/console_setup + chmod 755 debian/keyboard-configuration/usr/share/initramfs-tools/scripts/panic/console_setup + install -d debian/keyboard-configuration/usr/share/apport/package-hooks + install -m644 debian/console-setup.apport \ + debian/keyboard-configuration/usr/share/apport/package-hooks/source_console-setup.py .PHONY : deb-install-bdf2psf deb-install-bdf2psf: build @@ -278,20 +276,24 @@ install -m0755 debian/console-setup-udeb.base-installer \ debian/console-setup-udeb/usr/lib/base-installer.d/20console-setup $(pre) --udeb debian/console-setup-udeb/usr/lib/base-installer.d/20console-setup + install -m 644 debian/vtrgb debian/console-setup-udeb/etc/ + install -m 644 debian/vtrgb.vga debian/console-setup-udeb/etc/ # console-setup-*-ekmap dh_movefiles -p console-setup-amiga-ekmap --sourcedir=debian/console-setup-udeb usr/share/console-setup/amiga.ekmap.gz - cat amiga.ekmap.gz >debian/console-setup-amiga-ekmap/usr/share/console-setup/amiga.ekmap.gz + #cat amiga.ekmap.gz >debian/console-setup-amiga-ekmap/usr/share/console-setup/amiga.ekmap.gz dh_movefiles -p console-setup-ataritt-ekmap --sourcedir=debian/console-setup-udeb usr/share/console-setup/ataritt.ekmap.gz - cat ataritt.ekmap.gz >debian/console-setup-ataritt-ekmap/usr/share/console-setup/ataritt.ekmap.gz + #cat ataritt.ekmap.gz >debian/console-setup-ataritt-ekmap/usr/share/console-setup/ataritt.ekmap.gz dh_movefiles -p console-setup-pc-ekmap --sourcedir=debian/console-setup-udeb usr/share/console-setup/pc105.ekmap.gz - cat pc105.ekmap.gz >debian/console-setup-pc-ekmap/usr/share/console-setup/pc105.ekmap.gz + #cat pc105.ekmap.gz >debian/console-setup-pc-ekmap/usr/share/console-setup/pc105.ekmap.gz + dh_install -pconsole-setup-pc-ekmap Keyboard/pc105.tree \ + usr/share/console-setup-mini dh_movefiles -p console-setup-sun4-ekmap --sourcedir=debian/console-setup-udeb usr/share/console-setup/sun4.ekmap.gz - cat sun4.ekmap.gz >debian/console-setup-sun4-ekmap/usr/share/console-setup/sun4.ekmap.gz + #cat sun4.ekmap.gz >debian/console-setup-sun4-ekmap/usr/share/console-setup/sun4.ekmap.gz dh_movefiles -p console-setup-sun5-ekmap --sourcedir=debian/console-setup-udeb usr/share/console-setup/sun5.ekmap.gz - cat sun5.ekmap.gz >debian/console-setup-sun5-ekmap/usr/share/console-setup/sun5.ekmap.gz + #cat sun5.ekmap.gz >debian/console-setup-sun5-ekmap/usr/share/console-setup/sun5.ekmap.gz # console-setup-pc-ekbd dh_movefiles -p console-setup-pc-ekbd --sourcedir=debian/console-setup-udeb usr/share/console-setup/pc105.ekbd.gz - cat pc105.ekbd.gz >debian/console-setup-pc-ekbd/usr/share/console-setup/pc105.ekbd.gz + #cat pc105.ekbd.gz >debian/console-setup-pc-ekbd/usr/share/console-setup/pc105.ekbd.gz # Build architecture-independent files here. .PHONY : binary-indep @@ -302,7 +304,6 @@ dh_installdocs -pkeyboard-configuration \ FAQ copyright.fonts copyright.xkb dh_installdocs -p console-setup-linux --link-doc=keyboard-configuration - dh_installdocs -pconsole-setup-freebsd --link-doc=keyboard-configuration dh_installdocs -p console-setup-mini --link-doc=keyboard-configuration dh_installdocs -p console-setup --link-doc=keyboard-configuration dh_lintian @@ -318,7 +319,9 @@ $(pre) debian/keyboard-configuration/DEBIAN/postinst $(pre) debian/console-setup/DEBIAN/config $(pre) debian/console-setup/DEBIAN/postinst +ifeq ($(with_udeb),yes) $(pre) --udeb debian/console-setup-udeb/DEBIAN/postinst +endif echo xkb-data:Version=$(xkb_data_version) >> debian/keyboard-configuration.substvars dh_gencontrol dh_md5sums diff -Nru console-setup-1.222/debian/vtrgb console-setup-1.222ubuntu1/debian/vtrgb --- console-setup-1.222/debian/vtrgb 1970-01-01 01:00:00.000000000 +0100 +++ console-setup-1.222ubuntu1/debian/vtrgb 2023-06-29 15:02:02.000000000 +0200 @@ -0,0 +1,3 @@ +1,222,57,255,0,118,44,204,128,255,0,255,0,255,0,255 +1,56,181,199,111,38,181,204,128,0,255,255,0,0,255,255 +1,43,74,6,184,113,233,204,128,0,0,0,255,255,255,255 diff -Nru console-setup-1.222/debian/vtrgb.vga console-setup-1.222ubuntu1/debian/vtrgb.vga --- console-setup-1.222/debian/vtrgb.vga 1970-01-01 01:00:00.000000000 +0100 +++ console-setup-1.222ubuntu1/debian/vtrgb.vga 2023-06-29 15:02:02.000000000 +0200 @@ -0,0 +1,3 @@ +0,170,0,170,0,170,0,170,85,255,85,255,85,255,85,255 +0,0,170,85,0,0,170,170,85,85,255,255,85,85,255,255 +0,0,0,0,170,170,170,170,85,85,85,85,255,255,255,255 diff -Nru console-setup-1.222/Keyboard/ckbcomp console-setup-1.222ubuntu1/Keyboard/ckbcomp --- console-setup-1.222/Keyboard/ckbcomp 2023-06-21 21:20:52.000000000 +0200 +++ console-setup-1.222ubuntu1/Keyboard/ckbcomp 2023-06-29 15:02:02.000000000 +0200 @@ -4815,9 +4815,9 @@ my $file1 = "/etc/console-setup/dkey.${compose_charmap}.inc"; my $file2 = "$installdir/etc/console-setup/dkey.${compose_charmap}.inc"; if (-f $file1) { - system("cat $file1"); + system("cat", $file1); } elsif (-f $file2) { - system("cat $file2"); + system("cat", $file2); } } } else { @@ -4827,18 +4827,18 @@ my $file1 = "/etc/console-setup/compose.${compose_charmap}.inc"; my $file2 = "$installdir/etc/console-setup/compose.${compose_charmap}.inc"; if (-f $file1) { - system("cat $file1"); + system("cat", $file1); } elsif (-f $file2) { - system("cat $file2"); + system("cat", $file2); } } } my $file1 = "/etc/console-setup/remap.inc"; my $file2 = "$installdir/etc/console-setup/remap.inc"; if (-f $file1) { - system("cat $file1"); + system("cat", $file1); } elsif (-f $file2) { - system("cat $file2"); + system("cat", $file2); } exit 0; diff -Nru console-setup-1.222/Keyboard/kbdnames-maker console-setup-1.222ubuntu1/Keyboard/kbdnames-maker --- console-setup-1.222/Keyboard/kbdnames-maker 2023-06-21 21:20:52.000000000 +0200 +++ console-setup-1.222ubuntu1/Keyboard/kbdnames-maker 2023-06-29 15:02:02.000000000 +0200 @@ -30,6 +30,13 @@ } } +# Use a custom-generated locale. Taken from lintian. +chop(my $cwd = `pwd`); +my $locale_path = "$cwd/build-locale"; +system("mkdir $locale_path"); +system("localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias --quiet $locale_path/en_US.UTF-8"); +$ENV{'LOCPATH'} = "$locale_path"; + # Make sure we output UTF-8 $ENV{'LC_ALL'} = "en_US.UTF-8"; binmode STDOUT, ":utf8"; @@ -46,6 +53,7 @@ $lang =~ s:__Latn:__latin:; # special fixup for sr my $d = Locale::gettext->domain("xkeyboard-config"); + my $iso3166 = Locale::gettext->domain("iso_3166"); for my $model (sort keys %KeyboardNames::models) { my $name = $KeyboardNames::models{$model}; @@ -54,6 +62,11 @@ for my $layout (sort keys %KeyboardNames::layouts) { my $name = $KeyboardNames::layouts{$layout}; my $local_layout = $d->get($layout); + if ($layout eq 'Switzerland') { + $local_layout = $iso3166->get($layout); + } else { + $local_layout = $d->get($layout); + } print "$lang*layout*$name*$local_layout\n"; print "$lang*variant*$name**$local_layout\n"; for my $variant (sort keys %{$KeyboardNames::variants{$name}}) { @@ -62,3 +75,4 @@ } } } +system("rm -rf $locale_path"); diff -Nru console-setup-1.222/Keyboard/KeyboardNames.pl console-setup-1.222ubuntu1/Keyboard/KeyboardNames.pl --- console-setup-1.222/Keyboard/KeyboardNames.pl 2023-06-21 21:34:22.000000000 +0200 +++ console-setup-1.222ubuntu1/Keyboard/KeyboardNames.pl 2023-06-29 15:02:36.000000000 +0200 @@ -19,7 +19,7 @@ 'Apple laptop' => 'apple_laptop', 'Asus laptop' => 'asus_laptop', 'Atari TT' => 'ataritt', - 'Azona RF2300 wireless Internet' => 'azonaRF2300', + 'Azona RF2300 Wireless Internet' => 'azonaRF2300', 'BTC 5090' => 'btc5090', 'BTC 5113RF Multimedia' => 'btc5113rf', 'BTC 5126T' => 'btc5126t', @@ -66,14 +66,17 @@ 'Dell USB Multimedia' => 'dellusbmm', 'Dexxa Wireless Desktop' => 'dexxa', 'Diamond 9801/9802' => 'diamond', + 'Do not configure keyboard; keep kernel keymap' => 'SKIP', 'Ennyah DKB-1008' => 'ennyah_dkb1008', 'Everex STEPnote' => 'everex', 'FL90' => 'compalfl90', 'Fujitsu-Siemens Amilo laptop' => 'fscaa1667g', 'Generic 101-key PC' => 'pc101', - 'Generic 102-key PC (intl.)' => 'pc102', + 'Generic 102-key PC' => 'pc102', 'Generic 104-key PC' => 'pc104', - 'Generic 105-key PC (intl.)' => 'pc105', + 'Generic 104-key PC with L-shaped Enter key' => 'pc104alt', + 'Generic 105-key PC' => 'pc105', + 'Generic 86-key PC' => 'pc86', 'Genius Comfy KB-12e' => 'geniuscomfy', 'Genius Comfy KB-16M/Multimedia KWD-910' => 'genius', 'Genius Comfy KB-21e-Scroll' => 'geniuscomfy2', @@ -129,6 +132,7 @@ 'MacBook/MacBook Pro' => 'macbook78', 'MacBook/MacBook Pro (intl.)' => 'macbook79', 'Macintosh' => 'macintosh', + 'Macintosh Old' => 'macintosh_old', 'Memorex MX1998' => 'mx1998', 'Memorex MX2500 EZ-Access' => 'mx2500', 'Memorex MX2750' => 'mx2750', @@ -153,6 +157,7 @@ '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', @@ -179,8 +184,6 @@ 'Toshiba Satellite S3000' => 'toshiba_s3000', 'Truly Ergonomic 227' => 'teck227', 'Truly Ergonomic 229' => 'teck229', - 'Truly Ergonomic Computer Keyboard Model 227 (Wide Alt keys)' => 'teck227', - 'Truly Ergonomic Computer Keyboard Model 229 (Standard sized Alt keys, additional Super and Menu key)' => 'teck229', 'Trust Direct Access' => 'trustda', 'Trust Slimline' => 'trust_slimline', 'Trust Wireless Classic' => 'trust', @@ -197,7 +200,7 @@ ); %layouts = ( - 'Afghani' => 'af', + 'A user-defined custom Layout' => 'custom', 'Albanian' => 'al', 'Amharic' => 'et', 'Arabic' => 'ara', @@ -218,6 +221,7 @@ 'Croatian' => 'hr', 'Czech' => 'cz', 'Danish' => 'dk', + 'Dari' => 'af', 'Dhivehi' => 'mv', 'Dutch' => 'nl', 'Dzongkha' => 'bt', @@ -236,24 +240,20 @@ 'French' => 'fr', 'French (Canada)' => 'ca', 'French (Democratic Republic of the Congo)' => 'cd', - 'French (Guinea)' => 'gn', 'French (Togo)' => 'tg', 'Georgian' => 'ge', 'German' => 'de', 'German (Austria)' => 'at', - 'German (Switzerland)' => 'ch', 'Greek' => 'gr', 'Hebrew' => 'il', 'Hungarian' => 'hu', 'Icelandic' => 'is', 'Indian' => 'in', - 'Indonesian (Arab Melayu, phonetic)' => 'id', - 'Indonesian (Javanese)' => 'jv', + 'Indonesian (Latin)' => 'id', 'Iraqi' => 'iq', 'Irish' => 'ie', 'Italian' => 'it', 'Japanese' => 'jp', - 'Japanese (PC-98)' => 'nec_vndr/jp', 'Kazakh' => 'kz', 'Khmer (Cambodia)' => 'kh', 'Korean' => 'kr', @@ -268,6 +268,7 @@ 'Moldavian' => 'md', 'Mongolian' => 'mn', 'Montenegrin' => 'me', + 'NKo (AZERTY)' => 'gn', 'Nepali' => 'np', 'Norwegian' => 'no', 'Persian' => 'ir', @@ -285,6 +286,7 @@ 'Swahili (Kenya)' => 'ke', 'Swahili (Tanzania)' => 'tz', 'Swedish' => 'se', + 'Switzerland' => 'ch', 'Taiwanese' => 'tw', 'Tajik' => 'tj', 'Thai' => 'th', @@ -300,9 +302,9 @@ %variants = ( 'af' => { + 'Dari (Afghanistan, OLPC)' => 'fa-olpc', 'Pashto' => 'ps', - 'Pashto (Afghanistan, OLPC)' => 'olpc-ps', - 'Persian (Afghanistan, Dari OLPC)' => 'fa-olpc', + 'Pashto (Afghanistan, OLPC)' => 'ps-olpc', 'Uzbek (Afghanistan)' => 'uz', 'Uzbek (Afghanistan, OLPC)' => 'uz-olpc', }, @@ -319,25 +321,24 @@ }, 'ara' => { 'Arabic (AZERTY)' => 'azerty', - 'Arabic (AZERTY/digits)' => 'azerty_digits', + 'Arabic (AZERTY, Eastern Arabic numerals)' => 'azerty_digits', 'Arabic (Buckwalter)' => 'buckwalter', + 'Arabic (Eastern Arabic numerals)' => 'digits', 'Arabic (Macintosh)' => 'mac', 'Arabic (OLPC)' => 'olpc', 'Arabic (QWERTY)' => 'qwerty', - 'Arabic (digits)' => 'digits', - 'Arabic (qwerty/digits)' => 'qwerty_digits', + 'Arabic (QWERTY, Eastern Arabic numerals)' => 'qwerty_digits', }, 'at' => { 'German (Austria, Macintosh)' => 'mac', 'German (Austria, no dead keys)' => 'nodeadkeys', - 'German (Austria, with Sun dead keys)' => 'sundeadkeys', }, 'az' => { 'Azerbaijani (Cyrillic)' => 'cyrillic', }, 'ba' => { + 'Bosnian (US)' => 'us', 'Bosnian (US, with Bosnian digraphs)' => 'unicodeus', - 'Bosnian (US, with Bosnian letters)' => 'us', 'Bosnian (with Bosnian digraphs)' => 'unicode', 'Bosnian (with guillemets)' => 'alternatequotes', }, @@ -345,15 +346,14 @@ 'Bangla (Probhat)' => 'probhat', }, 'be' => { + 'Belgian (ISO, alt.)' => 'iso-alternate', + 'Belgian (Latin-9 only, alt.)' => 'oss_latin9', 'Belgian (Wang 724 AZERTY)' => 'wang', - 'Belgian (alt. ISO)' => 'iso-alternate', 'Belgian (alt.)' => 'oss', - 'Belgian (alt., Latin-9 only)' => 'oss_latin9', - 'Belgian (alt., with Sun dead keys)' => 'oss_sundeadkeys', 'Belgian (no dead keys)' => 'nodeadkeys', - 'Belgian (with Sun dead keys)' => 'sundeadkeys', }, 'bg' => { + 'Bulgarian (enhanced)' => 'bekl', 'Bulgarian (new phonetic)' => 'bas_phonetic', 'Bulgarian (traditional phonetic)' => 'phonetic', }, @@ -373,12 +373,13 @@ }, 'by' => { 'Belarusian (Latin)' => 'latin', + 'Belarusian (intl.)' => 'intl', 'Belarusian (legacy)' => 'legacy', + 'Belarusian (phonetic)' => 'phonetic', + 'Russian (Belarus)' => 'ru', }, 'ca' => { - 'Canadian Multilingual' => 'multix', - 'Canadian Multilingual (1st part)' => 'multi', - 'Canadian Multilingual (2nd part)' => 'multi-2gr', + 'Canadian (CSA)' => 'multix', 'English (Canada)' => 'eng', 'French (Canada, Dvorak)' => 'fr-dvorak', 'French (Canada, legacy)' => 'fr-legacy', @@ -388,28 +389,26 @@ 'French (Switzerland)' => 'fr', 'French (Switzerland, Macintosh)' => 'fr_mac', 'French (Switzerland, no dead keys)' => 'fr_nodeadkeys', - 'French (Switzerland, with Sun dead keys)' => 'fr_sundeadkeys', 'German (Switzerland, Macintosh)' => 'de_mac', 'German (Switzerland, legacy)' => 'legacy', 'German (Switzerland, no dead keys)' => 'de_nodeadkeys', - 'German (Switzerland, with Sun dead keys)' => 'de_sundeadkeys', }, 'cm' => { - 'Cameroon Multilingual (AZERTY)' => 'azerty', - 'Cameroon Multilingual (Dvorak)' => 'dvorak', - 'Cameroon Multilingual (QWERTY)' => 'qwerty', + 'Cameroon (AZERTY, intl.)' => 'azerty', + 'Cameroon (Dvorak, intl.)' => 'dvorak', + 'Cameroon Multilingual (QWERTY, intl.)' => 'qwerty', 'French (Cameroon)' => 'french', 'Mmuock' => 'mmuock', }, 'cn' => { - 'Hanyu Pinyin (altgr)' => 'altgr-pinyin', + 'Hanyu Pinyin Letters (with AltGr dead keys)' => 'altgr-pinyin', 'Mongolian (Bichig)' => 'mon_trad', - 'Mongolian Galik' => 'mon_trad_galik', - 'Mongolian Manchu' => 'mon_trad_manchu', - 'Mongolian Manchu Galik' => 'mon_manchu_galik', - 'Mongolian Todo' => 'mon_trad_todo', - 'Mongolian Todo Galik' => 'mon_todo_galik', - 'Mongolian Xibe' => 'mon_trad_xibe', + 'Mongolian (Galik)' => 'mon_trad_galik', + 'Mongolian (Manchu Galik)' => 'mon_manchu_galik', + 'Mongolian (Manchu)' => 'mon_trad_manchu', + 'Mongolian (Todo Galik)' => 'mon_todo_galik', + 'Mongolian (Todo)' => 'mon_trad_todo', + 'Mongolian (Xibe)' => 'mon_trad_xibe', 'Tibetan' => 'tib', 'Tibetan (with ASCII numerals)' => 'tib_asciinum', 'Uyghur' => 'ug', @@ -425,16 +424,18 @@ }, 'de' => { 'German (Dvorak)' => 'dvorak', + 'German (E1)' => 'e1', + 'German (E2)' => 'e2', 'German (Macintosh)' => 'mac', 'German (Macintosh, no dead keys)' => 'mac_nodeadkeys', 'German (Neo 2)' => 'neo', 'German (QWERTY)' => 'qwerty', 'German (T3)' => 'T3', + 'German (US)' => 'us', 'German (dead acute)' => 'deadacute', 'German (dead grave acute)' => 'deadgraveacute', 'German (dead tilde)' => 'deadtilde', 'German (no dead keys)' => 'nodeadkeys', - 'German (with Sun dead keys)' => 'sundeadkeys', 'Lower Sorbian' => 'dsb', 'Lower Sorbian (QWERTZ)' => 'dsb_qwertz', 'Romanian (Germany)' => 'ro', @@ -446,34 +447,36 @@ 'Danish (Dvorak)' => 'dvorak', 'Danish (Macintosh)' => 'mac', 'Danish (Macintosh, no dead keys)' => 'mac_nodeadkeys', - 'Danish (Win keys)' => 'winkeys', + 'Danish (Windows)' => 'winkeys', 'Danish (no dead keys)' => 'nodeadkeys', }, 'dz' => { 'Arabic (Algeria)' => 'ar', 'Berber (Algeria, Tifinagh)' => 'ber', + 'Kabyle (AZERTY, with dead keys)' => 'azerty-deadkeys', + 'Kabyle (QWERTY, UK, with dead keys)' => 'qwerty-gb-deadkeys', + 'Kabyle (QWERTY, US, with dead keys)' => 'qwerty-us-deadkeys', }, 'ee' => { 'Estonian (Dvorak)' => 'dvorak', - 'Estonian (US, with Estonian letters)' => 'us', + 'Estonian (US)' => 'us', 'Estonian (no dead keys)' => 'nodeadkeys', }, 'epo' => { - 'Esperanto (displaced semicolon and quote, obsolete)' => 'legacy', + 'Esperanto (legacy)' => 'legacy', }, 'es' => { - 'Asturian (Spain, with bottom-dot H and bottom-dot L)' => 'ast', + 'Asturian (Spain, with bottom-dot H and L)' => 'ast', 'Catalan (Spain, with middle-dot L)' => 'cat', 'Spanish (Dvorak)' => 'dvorak', 'Spanish (Macintosh)' => 'mac', - 'Spanish (Win keys)' => 'winkeys', + 'Spanish (Windows)' => 'winkeys', 'Spanish (dead tilde)' => 'deadtilde', 'Spanish (no dead keys)' => 'nodeadkeys', - 'Spanish (with Sun dead keys)' => 'sundeadkeys', }, 'fi' => { 'Finnish (Macintosh)' => 'mac', - 'Finnish (Winkeys)' => 'winkeys', + 'Finnish (Windows)' => 'winkeys', 'Finnish (classic)' => 'classic', 'Finnish (classic, no dead keys)' => 'nodeadkeys', 'Northern Saami (Finland)' => 'smi', @@ -482,36 +485,35 @@ 'Faroese (no dead keys)' => 'nodeadkeys', }, 'fr' => { - 'French (AFNOR standardized AZERTY)' => 'afnor', + 'Breton (France)' => 'bre', 'French (AZERTY)' => 'azerty', - 'French (Bepo, ergonomic, Dvorak way)' => 'bepo', - 'French (Bepo, ergonomic, Dvorak way, AFNOR)' => 'bepo_afnor', - 'French (Bepo, ergonomic, Dvorak way, Latin-9 only)' => 'bepo_latin9', - 'French (Breton)' => 'bre', + 'French (AZERTY, AFNOR)' => 'afnor', + 'French (BEPO)' => 'bepo', + 'French (BEPO, AFNOR)' => 'bepo_afnor', + 'French (BEPO, Latin-9 only)' => 'bepo_latin9', 'French (Dvorak)' => 'dvorak', 'French (Macintosh)' => 'mac', - 'French (US, with French letters)' => 'us', + 'French (US)' => 'us', 'French (alt.)' => 'oss', 'French (alt., Latin-9 only)' => 'oss_latin9', 'French (alt., no dead keys)' => 'oss_nodeadkeys', - 'French (alt., with Sun dead keys)' => 'oss_sundeadkeys', 'French (legacy, alt.)' => 'latin9', 'French (legacy, alt., no dead keys)' => 'latin9_nodeadkeys', - 'French (legacy, alt., with Sun dead keys)' => 'latin9_sundeadkeys', 'French (no dead keys)' => 'nodeadkeys', - 'French (with Sun dead keys)' => 'sundeadkeys', 'Georgian (France, AZERTY Tskapo)' => 'geo', 'Occitan' => 'oci', }, 'gb' => { 'English (UK, Colemak)' => 'colemak', + 'English (UK, Colemak-DH)' => 'colemak_dh', 'English (UK, Dvorak)' => 'dvorak', 'English (UK, Dvorak, with UK punctuation)' => 'dvorakukp', 'English (UK, Macintosh)' => 'mac', - 'English (UK, extended, with Win keys)' => 'extd', - 'English (UK, intl., Macintosh)' => 'mac_intl', + 'English (UK, Macintosh, intl.)' => 'mac_intl', + 'English (UK, extended, Windows)' => 'extd', 'English (UK, intl., with dead keys)' => 'intl', 'Polish (British keyboard)' => 'pl', + 'Scottish Gaelic' => 'gla', }, 'ge' => { 'Georgian (MESS)' => 'mess', @@ -536,34 +538,37 @@ 'Greek (simple)' => 'simple', }, 'hr' => { + 'Croatian (US)' => 'us', 'Croatian (US, with Croatian digraphs)' => 'unicodeus', - 'Croatian (US, with Croatian letters)' => 'us', 'Croatian (with Croatian digraphs)' => 'unicode', 'Croatian (with guillemets)' => 'alternatequotes', }, 'hu' => { - 'Hungarian (101/QWERTY/comma/dead keys)' => '101_qwerty_comma_dead', - 'Hungarian (101/QWERTY/comma/no dead keys)' => '101_qwerty_comma_nodead', - 'Hungarian (101/QWERTY/dot/dead keys)' => '101_qwerty_dot_dead', - 'Hungarian (101/QWERTY/dot/no dead keys)' => '101_qwerty_dot_nodead', - 'Hungarian (101/QWERTZ/comma/dead keys)' => '101_qwertz_comma_dead', - 'Hungarian (101/QWERTZ/comma/no dead keys)' => '101_qwertz_comma_nodead', - 'Hungarian (101/QWERTZ/dot/dead keys)' => '101_qwertz_dot_dead', - 'Hungarian (101/QWERTZ/dot/no dead keys)' => '101_qwertz_dot_nodead', - 'Hungarian (102/QWERTY/comma/dead keys)' => '102_qwerty_comma_dead', - 'Hungarian (102/QWERTY/comma/no dead keys)' => '102_qwerty_comma_nodead', - 'Hungarian (102/QWERTY/dot/dead keys)' => '102_qwerty_dot_dead', - 'Hungarian (102/QWERTY/dot/no dead keys)' => '102_qwerty_dot_nodead', - 'Hungarian (102/QWERTZ/comma/dead keys)' => '102_qwertz_comma_dead', - 'Hungarian (102/QWERTZ/comma/no dead keys)' => '102_qwertz_comma_nodead', - 'Hungarian (102/QWERTZ/dot/dead keys)' => '102_qwertz_dot_dead', - 'Hungarian (102/QWERTZ/dot/no dead keys)' => '102_qwertz_dot_nodead', 'Hungarian (QWERTY)' => 'qwerty', + 'Hungarian (QWERTY, 101-key, comma, dead keys)' => '101_qwerty_comma_dead', + 'Hungarian (QWERTY, 101-key, comma, no dead keys)' => '101_qwerty_comma_nodead', + 'Hungarian (QWERTY, 101-key, dot, dead keys)' => '101_qwerty_dot_dead', + 'Hungarian (QWERTY, 101-key, dot, no dead keys)' => '101_qwerty_dot_nodead', + 'Hungarian (QWERTY, 102-key, comma, dead keys)' => '102_qwerty_comma_dead', + 'Hungarian (QWERTY, 102-key, comma, no dead keys)' => '102_qwerty_comma_nodead', + 'Hungarian (QWERTY, 102-key, dot, dead keys)' => '102_qwerty_dot_dead', + 'Hungarian (QWERTY, 102-key, dot, no dead keys)' => '102_qwerty_dot_nodead', + 'Hungarian (QWERTZ, 101-key, comma, dead keys)' => '101_qwertz_comma_dead', + 'Hungarian (QWERTZ, 101-key, comma, no dead keys)' => '101_qwertz_comma_nodead', + 'Hungarian (QWERTZ, 101-key, dot, dead keys)' => '101_qwertz_dot_dead', + 'Hungarian (QWERTZ, 101-key, dot, no dead keys)' => '101_qwertz_dot_nodead', + 'Hungarian (QWERTZ, 102-key, comma, dead keys)' => '102_qwertz_comma_dead', + 'Hungarian (QWERTZ, 102-key, comma, no dead keys)' => '102_qwertz_comma_nodead', + 'Hungarian (QWERTZ, 102-key, dot, dead keys)' => '102_qwertz_dot_dead', + 'Hungarian (QWERTZ, 102-key, dot, no dead keys)' => '102_qwertz_dot_nodead', 'Hungarian (no dead keys)' => 'nodeadkeys', 'Hungarian (standard)' => 'standard', }, 'id' => { - 'Indonesian (Arab Melayu, ext. phonetic)' => 'phoneticx', + 'Indonesian (Arab Melayu, extended phonetic)' => 'melayu-phoneticx', + 'Indonesian (Arab Melayu, phonetic)' => 'melayu-phonetic', + 'Indonesian (Arab Pegon, phonetic)' => 'pegon-phonetic', + 'Javanese' => 'javanese', }, 'ie' => { 'CloGaelach' => 'CloGaelach', @@ -578,37 +583,43 @@ }, 'in' => { 'Bangla (India)' => 'ben', - 'Bangla (India, Baishakhi Inscript)' => 'ben_inscript', + 'Bangla (India, Baishakhi InScript)' => 'ben_inscript', 'Bangla (India, Baishakhi)' => 'ben_baishakhi', 'Bangla (India, Bornona)' => 'ben_bornona', + 'Bangla (India, Gitanjali)' => 'ben_gitanjali', 'Bangla (India, Probhat)' => 'ben_probhat', - 'Bangla (India, Uni Gitanjali)' => 'ben_gitanjali', 'English (India, with rupee)' => 'eng', 'Gujarati' => 'guj', + 'Gujarati (KaGaPa, phonetic)' => 'guj-kagapa', 'Hindi (Bolnagri)' => 'bolnagri', - 'Hindi (KaGaPa phonetic)' => 'hin-kagapa', + 'Hindi (KaGaPa, phonetic)' => 'hin-kagapa', 'Hindi (Wx)' => 'hin-wx', + 'Indic IPA' => 'iipa', 'Kannada' => 'kan', - 'Kannada (KaGaPa phonetic)' => 'kan-kagapa', + 'Kannada (KaGaPa, phonetic)' => 'kan-kagapa', 'Malayalam' => 'mal', 'Malayalam (Lalitha)' => 'mal_lalitha', - 'Malayalam (enhanced Inscript, with rupee)' => 'mal_enhanced', + 'Malayalam (enhanced InScript, with rupee)' => 'mal_enhanced', 'Manipuri (Eeyek)' => 'eeyek', - 'Marathi (KaGaPa phonetic)' => 'mar-kagapa', + 'Marathi (KaGaPa, phonetic)' => 'mar-kagapa', + 'Marathi (enhanced InScript)' => 'marathi', 'Ol Chiki' => 'olck', 'Oriya' => 'ori', + 'Oriya (Bolnagri)' => 'ori-bolnagri', + 'Oriya (Wx)' => 'ori-wx', 'Punjabi (Gurmukhi Jhelum)' => 'jhelum', 'Punjabi (Gurmukhi)' => 'guru', - 'Sanskrit (KaGaPa phonetic)' => 'san-kagapa', - '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', + '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', 'Telugu' => 'tel', - 'Telugu (KaGaPa phonetic)' => 'tel-kagapa', + 'Telugu (KaGaPa, phonetic)' => 'tel-kagapa', 'Telugu (Sarala)' => 'tel-sarala', - 'Urdu (Win keys)' => 'urd-winkeys', + 'Urdu (Windows)' => 'urd-winkeys', 'Urdu (alt. phonetic)' => 'urd-phonetic3', 'Urdu (phonetic)' => 'urd-phonetic', }, @@ -619,6 +630,7 @@ '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', @@ -629,16 +641,14 @@ 'Icelandic (Dvorak)' => 'dvorak', 'Icelandic (Macintosh)' => 'mac', 'Icelandic (Macintosh, legacy)' => 'mac_legacy', - 'Icelandic (no dead keys)' => 'nodeadkeys', - 'Icelandic (with Sun dead keys)' => 'Sundeadkeys', }, 'it' => { 'Friulian (Italy)' => 'fur', 'Georgian (Italy)' => 'geo', 'Italian (IBM 142)' => 'ibm', 'Italian (Macintosh)' => 'mac', - 'Italian (US, with Italian letters)' => 'us', - 'Italian (Winkeys)' => 'winkeys', + 'Italian (US)' => 'us', + 'Italian (Windows)' => 'winkeys', 'Italian (intl., with dead keys)' => 'intl', 'Italian (no dead keys)' => 'nodeadkeys', 'Sicilian' => 'scn', @@ -657,7 +667,7 @@ 'Kyrgyz (phonetic)' => 'phonetic', }, 'kr' => { - 'Korean (101/104 key compatible)' => 'kr104', + 'Korean (101/104-key compatible)' => 'kr104', }, 'kz' => { 'Kazakh (Latin)' => 'latin', @@ -666,18 +676,16 @@ 'Russian (Kazakhstan, with Kazakh)' => 'ruskaz', }, 'la' => { - 'Lao (STEA proposed standard layout)' => 'stea', + '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', 'Spanish (Latin American, no dead keys)' => 'nodeadkeys', - 'Spanish (Latin American, with Sun dead keys)' => 'sundeadkeys', }, 'lk' => { - 'Sinhala (US, with Sinhala letters)' => 'us', + 'Sinhala (US)' => 'us', 'Tamil (Sri Lanka, TamilNet 99)' => 'tam_unicode', 'Tamil (Sri Lanka, TamilNet 99, TAB encoding)' => 'tam_TAB', }, @@ -685,38 +693,41 @@ 'Lithuanian (IBM LST 1205-92)' => 'ibm', 'Lithuanian (LEKP)' => 'lekp', 'Lithuanian (LEKPa)' => 'lekpa', - 'Lithuanian (US, with Lithuanian letters)' => 'us', + 'Lithuanian (Ratise)' => 'ratise', + 'Lithuanian (US)' => 'us', 'Lithuanian (standard)' => 'std', 'Samogitian' => 'sgs', }, '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' => { - 'Berber (Morocco, Tifinagh alt. phonetic)' => 'tifinagh-alt-phonetic', 'Berber (Morocco, Tifinagh alt.)' => 'tifinagh-alt', 'Berber (Morocco, Tifinagh extended phonetic)' => 'tifinagh-extended-phonetic', 'Berber (Morocco, Tifinagh extended)' => 'tifinagh-extended', 'Berber (Morocco, Tifinagh phonetic)' => 'tifinagh-phonetic', + 'Berber (Morocco, Tifinagh phonetic, alt.)' => 'tifinagh-alt-phonetic', 'Berber (Morocco, Tifinagh)' => 'tifinagh', 'French (Morocco)' => 'french', + 'Tarifit' => 'rif', }, 'md' => { 'Moldavian (Gagauz)' => 'gag', }, 'me' => { - 'Montenegrin (Cyrillic with guillemets)' => 'cyrillicalternatequotes', 'Montenegrin (Cyrillic)' => 'cyrillic', 'Montenegrin (Cyrillic, ZE and ZHE swapped)' => 'cyrillicyz', - 'Montenegrin (Latin with guillemets)' => 'latinalternatequotes', + 'Montenegrin (Cyrillic, with guillemets)' => 'cyrillicalternatequotes', 'Montenegrin (Latin, QWERTY)' => 'latinyz', 'Montenegrin (Latin, Unicode)' => 'latinunicode', 'Montenegrin (Latin, Unicode, QWERTY)' => 'latinunicodeyz', + 'Montenegrin (Latin, with guillemets)' => 'latinalternatequotes', }, 'mk' => { 'Macedonian (no dead keys)' => 'nodeadkeys', @@ -728,11 +739,15 @@ }, 'mm' => { 'Burmese Zawgyi' => 'zawgyi', + 'Mon' => 'mnw', + 'Mon (A1)' => 'mnw-a1', + 'Shan' => 'shn', + 'Shan (Zawgyi Tai)' => 'zgt', }, 'mt' => { - 'Maltese (UK layout with AltGr overrides)' => 'alt-gb', - 'Maltese (US layout with AltGr overrides)' => 'alt-us', - 'Maltese (with US layout)' => 'us', + 'Maltese (UK, with AltGr overrides)' => 'alt-gb', + 'Maltese (US)' => 'us', + 'Maltese (US, with AltGr overrides)' => 'alt-us', }, 'my' => { 'Malay (Jawi, phonetic)' => 'phonetic', @@ -744,8 +759,8 @@ }, 'nl' => { 'Dutch (Macintosh)' => 'mac', + 'Dutch (US)' => 'us', 'Dutch (standard)' => 'std', - 'Dutch (with Sun dead keys)' => 'sundeadkeys', }, 'no' => { 'Northern Saami (Norway)' => 'smi', @@ -754,7 +769,7 @@ 'Norwegian (Dvorak)' => 'dvorak', 'Norwegian (Macintosh)' => 'mac', 'Norwegian (Macintosh, no dead keys)' => 'mac_nodeadkeys', - 'Norwegian (Win keys)' => 'winkeys', + 'Norwegian (Windows)' => 'winkeys', 'Norwegian (no dead keys)' => 'nodeadkeys', }, 'ph' => { @@ -789,46 +804,45 @@ 'Esperanto (Portugal, Nativo)' => 'nativo-epo', 'Portuguese (Macintosh)' => 'mac', 'Portuguese (Macintosh, no dead keys)' => 'mac_nodeadkeys', - 'Portuguese (Macintosh, with Sun dead keys)' => 'mac_sundeadkeys', 'Portuguese (Nativo for US keyboards)' => 'nativo-us', 'Portuguese (Nativo)' => 'nativo', 'Portuguese (no dead keys)' => 'nodeadkeys', - 'Portuguese (with Sun dead keys)' => 'sundeadkeys', }, 'ro' => { - 'Romanian (Win keys)' => 'winkeys', - 'Romanian (cedilla)' => 'cedilla', - 'Romanian (standard cedilla)' => 'std_cedilla', + 'Romanian (Windows)' => 'winkeys', 'Romanian (standard)' => 'std', }, 'rs' => { 'Pannonian Rusyn' => 'rue', - 'Serbian (Cyrillic with guillemets)' => 'alternatequotes', 'Serbian (Cyrillic, ZE and ZHE swapped)' => 'yz', - 'Serbian (Latin with guillemets)' => 'latinalternatequotes', + 'Serbian (Cyrillic, with guillemets)' => 'alternatequotes', 'Serbian (Latin)' => 'latin', 'Serbian (Latin, QWERTY)' => 'latinyz', 'Serbian (Latin, Unicode)' => 'latinunicode', 'Serbian (Latin, Unicode, QWERTY)' => 'latinunicodeyz', + 'Serbian (Latin, with guillemets)' => 'latinalternatequotes', }, 'ru' => { + 'Abkhazian (Russia)' => 'ab', 'Bashkirian' => 'bak', 'Chuvash' => 'cv', 'Chuvash (Latin)' => 'cv_latin', 'Kalmyk' => 'xal', 'Komi' => 'kom', 'Mari' => 'chm', - 'Ossetian (Win keys)' => 'os_winkeys', + 'Ossetian (Windows)' => 'os_winkeys', '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 yazherty)' => 'phonetic_yazherty', 'Russian (phonetic)' => 'phonetic', 'Russian (phonetic, AZERTY)' => 'phonetic_azerty', 'Russian (phonetic, Dvorak)' => 'phonetic_dvorak', 'Russian (phonetic, French)' => 'phonetic_fr', - 'Russian (phonetic, with Win keys)' => 'phonetic_winkeys', + 'Russian (phonetic, Windows)' => 'phonetic_winkeys', + 'Russian (phonetic, YAZHERTY)' => 'phonetic_YAZHERTY', 'Russian (typewriter)' => 'typewriter', 'Russian (typewriter, legacy)' => 'typewriter-legacy', 'Serbian (Russia)' => 'srp', @@ -841,15 +855,15 @@ 'Russian (Sweden, phonetic)' => 'rus', 'Russian (Sweden, phonetic, no dead keys)' => 'rus_nodeadkeys', 'Swedish (Dvorak)' => 'dvorak', + 'Swedish (Dvorak, intl.)' => 'us_dvorak', 'Swedish (Macintosh)' => 'mac', 'Swedish (Svdvorak)' => 'svdvorak', - 'Swedish (US, with Swedish letters)' => 'us', - 'Swedish (based on US Intl. Dvorak)' => 'us_dvorak', + 'Swedish (US)' => 'us', 'Swedish (no dead keys)' => 'nodeadkeys', 'Swedish Sign Language' => 'swl', }, 'si' => { - 'Slovenian (US, with Slovenian letters)' => 'us', + 'Slovenian (US)' => 'us', 'Slovenian (with guillemets)' => 'alternatequotes', }, 'sk' => { @@ -875,26 +889,31 @@ 'Turkmen (Alt-Q)' => 'alt', }, 'tr' => { - 'Crimean Tatar (Turkish Alt-Q)' => 'crh_alt', - 'Crimean Tatar (Turkish F)' => 'crh_f', - 'Crimean Tatar (Turkish Q)' => 'crh', 'Kurdish (Turkey, F)' => 'ku_f', 'Kurdish (Turkey, Latin Alt-Q)' => 'ku_alt', 'Kurdish (Turkey, Latin Q)' => 'ku', + 'Old Turkic' => 'otk', + 'Old Turkic (F)' => 'otkf', + 'Ottoman (F)' => 'otf', + 'Ottoman (Q)' => 'ot', 'Turkish (Alt-Q)' => 'alt', + 'Turkish (E)' => 'e', 'Turkish (F)' => 'f', 'Turkish (intl., with dead keys)' => 'intl', - 'Turkish (with Sun dead keys)' => 'sundeadkeys', }, 'tw' => { 'Saisiyat (Taiwan)' => 'saisiyat', 'Taiwanese (indigenous)' => 'indigenous', }, 'ua' => { + 'Crimean Tatar (Turkish Alt-Q)' => 'crh_alt', + 'Crimean Tatar (Turkish F)' => 'crh_f', + 'Crimean Tatar (Turkish Q)' => 'crh', 'Russian (Ukraine, standard RSTU)' => 'rstu_ru', - 'Ukrainian (Win keys)' => 'winkeys', + 'Ukrainian (Windows)' => 'winkeys', 'Ukrainian (homophonic)' => 'homophonic', 'Ukrainian (legacy)' => 'legacy', + 'Ukrainian (macOS)' => 'macOS', 'Ukrainian (phonetic)' => 'phonetic', 'Ukrainian (standard RSTU)' => 'rstu', 'Ukrainian (typewriter)' => 'typewriter', @@ -902,13 +921,18 @@ 'us' => { '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', 'English (Dvorak, alt. intl.)' => 'dvorak-alt-intl', 'English (Dvorak, intl., with dead keys)' => 'dvorak-intl', 'English (Dvorak, left-handed)' => 'dvorak-l', 'English (Dvorak, right-handed)' => 'dvorak-r', 'English (Macintosh)' => 'mac', 'English (Norman)' => 'norman', + 'English (US, Symbolic)' => 'symbolic', 'English (US, alt. intl.)' => 'alt-intl', 'English (US, euro on 5)' => 'euro', 'English (US, intl., with dead keys)' => 'intl', @@ -917,7 +941,8 @@ 'English (classic Dvorak)' => 'dvorak-classic', 'English (intl., with AltGr dead keys)' => 'altgr-intl', 'English (programmer Dvorak)' => 'dvp', - 'English (the divide/multiply keys toggle the layout)' => 'olpc2', + 'English (the divide/multiply toggle the layout)' => 'olpc2', + 'Hawaiian' => 'haw', 'Russian (US, phonetic)' => 'rus', 'Serbo-Croatian (US)' => 'hbs', }, @@ -925,8 +950,8 @@ 'Uzbek (Latin)' => 'latin', }, 'vn' => { - 'Vietnamese (French, with Vietnamese letters)' => 'fr', - 'Vietnamese (US, with Vietnamese letters)' => 'us', + 'Vietnamese (France)' => 'fr', + 'Vietnamese (US)' => 'us', }, ); diff -Nru console-setup-1.222/Keyboard/keymaptree console-setup-1.222ubuntu1/Keyboard/keymaptree --- console-setup-1.222/Keyboard/keymaptree 1970-01-01 01:00:00.000000000 +0100 +++ console-setup-1.222ubuntu1/Keyboard/keymaptree 2023-06-29 15:02:02.000000000 +0200 @@ -0,0 +1,126 @@ +#!/bin/sh +set -e + +# keymaptree -- build decision trees covering every keymap we can think of +# Copyright (C) 2006, 2007 Canonical Ltd.; written by Colin Watson. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# If you have not received a copy of the GNU General Public License +# along with this program, write to the Free Software Foundation, Inc., +# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +# Default values: +output='' +models='' +useonly="$(< keymaptree.use grep -v '^#' | xargs | sed 's/ /,/g')" +skip='' +names='KeyboardNames.pl' + +while [ "$1" ]; do + case "$1" in + -output) + shift + output="$1" + ;; + -useonly) + shift + useonly="$1" + ;; + -skip) + shift + skip="$1" + ;; + -names) + shift + names="$1" + ;; + -\?|-help|--help) + cat >&2 < [...] +Legal options are: +-?,-help,--help Print this message +-output Write decision tree to file (default: stdout) +-useonly Include only these keymaps in the decision tree + (comma-separated) +-skip Exclude these keymaps from the decision tree + (comma-separated) +-names Use this file instead of KeyboardNames.pl +EOF + exit 0 + ;; + -*) + echo "keymaptree: Unrecognised option $1" >&2 + exit 1 + ;; + *) + models="${models:+$models }$1" + ;; + esac + shift +done + +if [ -z "$models" ]; then + echo "keymaptree: Need at least one model" >&2 + exit 1 +fi + +for model in $models; do + case $model in + amiga|ataritt|macintosh_old|pc105|sun4|sun5) + ;; + *) + echo "keymaptree: Unrecognised model $model" >&2 + exit 1 + ;; + esac +done + +variantpairs="$(./kbdnames-maker "$names" | grep '^C\*' | grep 'variant\*' | \ + sort -t '*' | cut -d'*' --output-delimiter=: -f3,4 | sed 's/:$//' | \ + egrep -v '^(nec|nec_vndr)/jp')" + +rm -rf tree-keymaps +gkincludeopts='' +gkfiles='' + +for model in $models; do + mkdir -p "tree-keymaps/$model" + for variantpair in $variantpairs; do + case $variantpair in + *:*) + layout="${variantpair%%:*}" + variant="${variantpair#*:}" + ;; + *) + layout="$variantpair" + variant='' + ;; + esac + ./ckbcomp-mini -I. -model "$model" -layout "$layout" ${variant:+-variant "$variant"} | \ + perl -ne ' + if (/^keycode ([0-9]+)/) { + $keycodes{$1} = $_; + } else { + for $code (sort { $a <=> $b } keys %keycodes) { + print $keycodes{$code}; + } + %keycodes = (); + print; + }' \ + > "tree-keymaps/$model/$layout${variant:+:$variant}" + done + gkincludeopts="${gkincludeopts:+$gkincludeopts }-I tree-keymaps/$model" + echo "$variantpairs" > "tree-keymaps/$model.list" + gkfiles="${gkfiles:+$gkfiles }tree-keymaps/$model.list" +done +gen_keymap ${output:+-o $output} -v $gkincludeopts \ + ${useonly:+-u $useonly} ${skip:+-s $skip} $gkfiles diff -Nru console-setup-1.222/Keyboard/keymaptree.use console-setup-1.222ubuntu1/Keyboard/keymaptree.use --- console-setup-1.222/Keyboard/keymaptree.use 1970-01-01 01:00:00.000000000 +0100 +++ console-setup-1.222ubuntu1/Keyboard/keymaptree.use 2023-06-29 15:02:02.000000000 +0200 @@ -0,0 +1,48 @@ +# This list was generated by taking the list of i386 and powerpc keymaps +# offered by console-keymaps-tree from console-data and converting them to X +# keymap layouts and variants. Feel free to add more keymaps to this list, +# as long as gen_keymap (called from keymaptree) still thinks they're +# distinguishable. + +be +bg +br +by +ca +ch +cs +cz +de:nodeadkeys +dk +ee +es +fi +fr +fr:latin9 +fr:oss +gb +gr +hr +hu +il +is +it +latam +lt +lv +mk +no +pl +pt +ro +ro:std +ru +se +sk:qwerty +th:tis +tr +tr:f +ua +us +us:dvorak +us:intl diff -Nru console-setup-1.222/Keyboard/Makefile console-setup-1.222ubuntu1/Keyboard/Makefile --- console-setup-1.222/Keyboard/Makefile 2023-06-21 21:20:52.000000000 +0200 +++ console-setup-1.222ubuntu1/Keyboard/Makefile 2023-06-29 15:02:02.000000000 +0200 @@ -12,7 +12,11 @@ gzipped-ekbds := $./pc105.ekbd.gz -xkbdir ?= $(kbddir)/ckb +xkbdir ?= /usr/share/X11/xkb + +%.tree : %.ekmap.gz $./keymaptree.use + (cd $(kbddir) && set -x && \ + ./keymaptree -output $@ -useonly "$$(cat $./Keyboard/keymaptree.use | grep -v '^#' | xargs | sed 's/ /,/g')" -names ./KeyboardNames.pl $(notdir $(@:%.tree=%))) $./%.ekmap : model = $(notdir $(@:%.ekmap=%)) $./%.ekmap : @@ -63,7 +67,7 @@ build-common .PHONY : compose-files dkey-files compose-files : $(compose_files) dkey-files : $(dkey_files) -build-mini-linux : gzipped-ekmaps $./charmap_functions.sh +build-mini-linux : gzipped-ekmaps $./charmap_functions.sh $./pc105.tree .PHONY : gzipped-ekmaps gzipped-ekmaps : $(gzipped-ekmaps) build-mini-freebsd : gzipped-ekbds $./charmap_functions.sh @@ -79,10 +83,11 @@ clean .PHONY : $~clean $~clean: -rm -rf $(kbdcleanfiles) + -rm -f *.tree maintainer-clean .PHONY : $~maintainer-clean $~maintainer-clean: $~clean - cd $(kbddir) && ./xmlreader >KeyboardNames.pl + cd $(kbddir) && ./xmlreader $(xkbdir)/rules/xorg.xml >KeyboardNames.pl -$./KeyboardNames.pl: +KeyboardNames.pl $./KeyboardNames.pl: $(kbddir)/xmlreader $(xkbdir)/rules/base.xml >$@ diff -Nru console-setup-1.222/Keyboard/pc105.tree console-setup-1.222ubuntu1/Keyboard/pc105.tree --- console-setup-1.222/Keyboard/pc105.tree 1970-01-01 01:00:00.000000000 +0100 +++ console-setup-1.222ubuntu1/Keyboard/pc105.tree 2023-06-29 15:02:02.000000000 +0200 @@ -0,0 +1,448 @@ +STEP 0 +PRESS ) +PRESS у +PRESS υ +PRESS г +PRESS n +PRESS γ +PRESS u +PRESS ה +PRESS v +PRESS y +PRESS ν +CODE 10 1 +CODE 11 39 +CODE 12 76 +CODE 17 44 +CODE 18 63 +CODE 20 40 +CODE 21 83 +CODE 22 104 +CODE 23 2 +CODE 27 108 +CODE 30 2 +CODE 33 40 +CODE 34 41 +CODE 35 44 +CODE 38 40 +CODE 39 2 +CODE 41 44 +CODE 43 91 +CODE 44 106 +CODE 45 68 +CODE 46 2 +CODE 47 104 +CODE 49 104 +CODE 52 40 +STEP 1 +PRESS b +PRESS ß +PRESS y +PRESS v +PRESS u +PRESS ה +PRESS n +CODE 39 2 +CODE 40 3 +CODE 44 6 +CODE 12 9 +CODE 46 2 +CODE 47 11 +CODE 48 11 +CODE 49 11 +CODE 51 2 +CODE 21 12 +CODE 22 11 +CODE 23 2 +CODE 30 2 +CODE 31 34 +STEP 3 +FINDP ö +YES 5 +NO 4 +STEP 11 +PRESS z +CODE 44 12 +CODE 21 6 +STEP 12 +FINDP ö +YES 26 +NO 13 +STEP 13 +FINDP ç +YES 21 +NO 14 +STEP 14 +FINDP æ +YES 18 +NO 15 +STEP 15 +FINDP ñ +YES 17 +NO 16 +STEP 6 +FINDP ö +YES 7 +NO 4 +STEP 34 +PRESS z +CODE 44 35 +CODE 21 8 +STEP 35 +FINDP ö +YES 38 +NO 36 +STEP 36 +FINDP ç +YES 21 +NO 37 +STEP 37 +PRESS æ +CODE 40 19 +CODE 30 17 +CODE 39 20 +STEP 38 +PRESS ö +CODE 12 28 +CODE 39 31 +STEP 39 +PRESS r +PRESS у +PRESS υ +PRESS г +PRESS n +PRESS γ +PRESS u +PRESS ה +PRESS v +PRESS y +PRESS ν +CODE 33 40 +CODE 34 41 +CODE 35 44 +CODE 38 40 +CODE 17 44 +CODE 47 45 +CODE 49 45 +CODE 18 63 +CODE 19 45 +CODE 20 40 +CODE 21 45 +CODE 22 45 +CODE 24 40 +CODE 52 40 +STEP 45 +FINDP ș +YES 75 +NO 46 +STEP 46 +FINDP é +YES 74 +NO 47 +STEP 47 +FINDP ç +YES 73 +NO 48 +STEP 48 +FINDP š +YES 72 +NO 49 +STEP 83 +PRESS ω +PRESS w +CODE 16 84 +CODE 17 94 +CODE 44 76 +CODE 30 80 +CODE 47 42 +STEP 84 +PRESS q +CODE 16 85 +CODE 30 81 +STEP 41 +FINDP ч +YES 43 +NO 42 +STEP 2 +MAP tr:f +STEP 104 +PRESS ω +PRESS w +CODE 16 105 +CODE 17 109 +CODE 44 76 +CODE 30 80 +CODE 47 42 +STEP 105 +PRESS z +CODE 17 81 +CODE 44 85 +CODE 21 106 +STEP 85 +FINDP ö +YES 92 +NO 86 +STEP 86 +FINDP ç +YES 21 +NO 87 +STEP 87 +FINDP å +YES 18 +NO 88 +STEP 88 +FINDP ä +YES 91 +NO 89 +STEP 89 +FINDP ñ +YES 17 +NO 90 +STEP 90 +PRESS @ +CODE 16 71 +CODE 40 71 +CODE 3 62 +STEP 21 +PRESS ç +CODE 43 22 +CODE 39 23 +STEP 23 +FINDP è +YES 25 +NO 24 +STEP 92 +PRESS ö +CODE 51 27 +CODE 12 28 +CODE 39 93 +STEP 93 +FINDP ü +YES 30 +NO 32 +STEP 109 +PRESS z +PRESS ζ +CODE 44 94 +CODE 21 106 +STEP 94 +FINDP ö +YES 26 +NO 95 +STEP 95 +FINDP é +YES 103 +NO 96 +STEP 96 +FINDP ç +YES 101 +NO 97 +STEP 97 +FINDP æ +YES 18 +NO 98 +STEP 98 +FINDP ș +YES 75 +NO 99 +STEP 99 +FINDP š +YES 72 +NO 100 +STEP 100 +FINDP ñ +YES 17 +NO 49 +STEP 49 +FINDP £ +YES 71 +NO 50 +STEP 50 +FINDP ¨ +YES 70 +NO 51 +STEP 51 +FINDP ѝ +YES 44 +NO 52 +STEP 52 +FINDP ș +YES 69 +NO 53 +STEP 53 +FINDP ψ +YES 42 +NO 54 +STEP 54 +FINDP ב +YES 16 +NO 55 +STEP 55 +FINDP љ +YES 43 +NO 56 +STEP 56 +FINDP ภ +YES 68 +NO 57 +STEP 57 +FINDP ч +YES 63 +NO 58 +STEP 58 +FINDP ə +YES 62 +NO 59 +STEP 59 +FINDP š +YES 61 +NO 60 +STEP 60 +MAP us +STEP 61 +MAP lv +STEP 62 +MAP pl +STEP 63 +FINDP ы +YES 65 +NO 64 +STEP 64 +MAP ua +STEP 65 +FINDP и +YES 67 +NO 66 +STEP 66 +MAP by +STEP 67 +MAP ru +STEP 68 +MAP th:tis +STEP 43 +MAP mk +STEP 16 +MAP il +STEP 69 +MAP ro +STEP 44 +MAP bg +STEP 70 +MAP us:intl +STEP 71 +MAP gb +STEP 17 +MAP latam +STEP 72 +MAP lt +STEP 75 +MAP ro:std +STEP 18 +PRESS æ +CODE 40 19 +CODE 39 20 +STEP 19 +MAP no +STEP 20 +MAP dk +STEP 101 +PRESS º +CODE 40 24 +CODE 41 22 +CODE 50 102 +CODE 43 73 +CODE 86 73 +STEP 102 +PRESS ç +CODE 43 22 +CODE 39 24 +STEP 22 +MAP es +STEP 24 +MAP pt +STEP 73 +MAP br +STEP 103 +PRESS é +CODE 26 25 +CODE 11 91 +CODE 53 74 +STEP 25 +MAP it +STEP 91 +MAP sk:qwerty +STEP 74 +MAP ca +STEP 26 +PRESS ö +CODE 51 27 +CODE 12 28 +CODE 39 29 +STEP 27 +MAP tr +STEP 28 +MAP is +STEP 29 +FINDP å +YES 31 +NO 30 +STEP 30 +MAP ee +STEP 31 +FINDP ə +YES 33 +NO 32 +STEP 32 +MAP se +STEP 33 +MAP fi +STEP 106 +FINDP ö +YES 7 +NO 107 +STEP 107 +PRESS š +CODE 26 4 +CODE 4 108 +STEP 4 +MAP hr +STEP 108 +MAP cz +STEP 7 +PRESS ö +CODE 11 5 +CODE 39 8 +STEP 5 +MAP hu +STEP 8 +FINDP é +YES 10 +NO 9 +STEP 9 +MAP de:nodeadkeys +STEP 10 +MAP ch +STEP 76 +FINDP œ +YES 82 +NO 77 +STEP 77 +FINDP º +YES 79 +NO 78 +STEP 78 +MAP fr:oss +STEP 79 +FINDP œ +YES 81 +NO 80 +STEP 81 +MAP be +STEP 82 +MAP fr:latin9 +STEP 80 +MAP fr +STEP 42 +MAP gr +STEP 40 +MAP us:dvorak diff -Nru console-setup-1.222/Keyboard/xmlreader console-setup-1.222ubuntu1/Keyboard/xmlreader --- console-setup-1.222/Keyboard/xmlreader 2023-06-21 21:20:52.000000000 +0200 +++ console-setup-1.222ubuntu1/Keyboard/xmlreader 2023-06-29 15:02:02.000000000 +0200 @@ -199,6 +199,15 @@ my $arg = shift @{$tree}; if ($tag eq 'configItem') { ($name, $description) = parse_configItem $arg; + if ($name eq 'ch') { + # "German (Switzerland)" is an unhelpful layout description, + # as this layout includes variants such as "French + # (Switzerland)". Override the description to something + # more generic. Be careful to ensure that a translation for + # this string is available somewhere; if not in iso_3166, + # then amend Keyboard/kbdnames-maker appropriately. + $description = 'Switzerland'; + } if ($name ne "") { $layouts{$description} = $name; } @@ -278,6 +287,9 @@ if (not exists $modelvalues{sun5}) { $models{'Sun Type 5'} = 'sun5'; } +if (not exists $modelvalues{SKIP}) { + $models{'Do not configure keyboard; keep kernel keymap'} = 'SKIP'; +} print <<'EOT'; #!/usr/bin/perl -w diff -Nru console-setup-1.222/setupcon console-setup-1.222ubuntu1/setupcon --- console-setup-1.222/setupcon 2023-06-21 21:20:52.000000000 +0200 +++ console-setup-1.222ubuntu1/setupcon 2023-06-29 15:02:02.000000000 +0200 @@ -60,11 +60,8 @@ trap "exit 2" 1 2 3 13 15 tempfile () { if \ - TMPFILE=`mktemp /tmp/tmpkbd.XXXXXX 2>/dev/null` \ - || TMPFILE=`mktemp /run/tmpkbd.XXXXXX 2>/dev/null` \ - || TMPFILE=`mktemp /dev/.tmpkbd.XXXXXX 2>/dev/null` \ - || TMPFILE=`mktemp /lib/init/rw/tmpkbd.XXXXXX 2>/dev/null` \ - || TMPFILE=`mktemp 2>/dev/null` + TMPFILE=`mktemp /run/tmpkbd.XXXXXX 2>/dev/null` \ + || TMPFILE=`mktemp /tmp/tmpkbd.XXXXXX 2>/dev/null` then tempfiles="$tempfiles $TMPFILE" return 0 @@ -669,12 +666,19 @@ CONSOLE_MAP=${CONSOLE_MAP:-$ACM} [ -z "$CONSOLE_MAP" ] || CONSOLE_MAP=`findfile $mapdir "$CONSOLE_MAP"` [ -n "$CONSOLE_MAP" -o "$CHARMAP" = UTF-8 ] || CONSOLE_MAP=`findfile $mapdir $stdmap` +[ -n "$CONSOLE_MAP" -o "$CHARMAP" = UTF-8 ] || CONSOLE_MAP=`findfile $mapdir ${stdmap%.gz}` # FONTFILES FONTFILES='' if [ "$FONT" ]; then for f in $FONT; do FONTFILES="$FONTFILES `findfile $fontdir $f`" + RES=`findfile $fontdir $f` + if [ -z "$RES" ]; then + fdec="${f%.gz}" + RES=`findfile $fontdir $fdec` + fi + FONTFILES="$FONTFILES $RES" done fi FONTFILES=`echo $FONTFILES` # remove extra spaces @@ -729,6 +733,11 @@ fi [ -n "$XKBMODEL" -o -z "$savekbdfile" ] || exit 1 +# Backwards-compatibility with Ubuntu-specific preseeding +if [ "$XKBMODEL" = SKIP ]; then + XKBMODEL= +fi + # do_kbd [ "$XKBMODEL$KMAP" ] || do_kbd='' if [ "$do_kbd" ]; then @@ -988,6 +997,31 @@ fi done +if [ -n "$do_save" ]; then + case "$CONSOLE_MAP" in + /etc/console-setup/*) ;; + ?*) + console_map_dec="${CONSOLE_MAP%.gz}" + if [ "$console_map_dec" = "$CONSOLE_MAP" ]; then + cp "$CONSOLE_MAP" /etc/console-setup/ + else + gunzip -c "$CONSOLE_MAP" >"/etc/console-setup/${console_map_dec##*/}" + fi + rm -f "/etc/console-setup/${console_map_dec##*/}.gz" + ;; + esac + for font in $FONTFILES; do + case "$font" in + /etc/console-setup/*) ;; + ?*) cp "$font" /etc/console-setup/ ;; + esac + done + case "$FONTMAPFILE" in + /etc/console-setup/*) ;; + ?*) cp "$FONTMAPFILE" /etc/console-setup/ ;; + esac +fi + if [ "$savekbdfile" ]; then case "$kernel" in linux) @@ -1392,3 +1426,5 @@ echo exit 0 >>"$setupdir"/bin/setupcon sort $TMPFILE | uniq | grep -v 'printf$' >"$setupdir"/morefiles fi + +exit 0