Created by Mathieu Trudel-Lapierre on 2015-12-15 and last modified on 2015-12-15
Get this branch:
bzr branch lp:~cyphermox/console-setup/merge_1.134
Only Mathieu Trudel-Lapierre can upload to this branch. If you are Mathieu Trudel-Lapierre please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

Mathieu Trudel-Lapierre

Recent revisions

465. By Mathieu Trudel-Lapierre on 2015-12-15

* 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.
  - 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
  - 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
  - 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
  - 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
  - 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.
  - setupcon: Map XKBMODEL=SKIP to '' for compatibility with existing
  - 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.
  - 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.
  - Move vtrgb handling to console-setup-linux package, since this is clearly
  - 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.
  - Properly handle setting XKBVARIANT when using keyboard detection.
  - 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
  - Add systemd unit for console-setup.
  - Drop console-setup-freebsd.

464. By Martin Pitt on 2015-11-24

debian/rules: Drop obsolete and no-op dh_installinit --upstart-only
option. (LP: #1519228)

463. By Martin Pitt on 2015-11-24

releasing package console-setup version 1.108ubuntu9

462. By Martin Pitt on 2015-11-24

Cherry-pick fix from git for udpkg/Hurd noise in keyboard-configuration.

461. By Martin Pitt on 2015-11-24

sync with the actual archive's 1.108ubuntu8

460. By Mathieu Trudel-Lapierre on 2015-10-19

releasing package console-setup version 1.108ubuntu8

459. By Mathieu Trudel-Lapierre on 2015-10-19

Properly handle setting XKBVARIANT when using keyboard detection.
(LP: #1506551)

458. By Colin Watson on 2015-10-02

releasing package console-setup version 1.108ubuntu7

457. By Colin Watson on 2015-10-02

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).

456. By Colin Watson on 2015-10-02

Fix incorrect versioning change from last upload; initramfs-tools
0.85eubuntu12 looks wrong but was in fact correct.

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
This branch contains Public information 
Everyone can see this information.