lp:~abone/ubuntu/precise/console-setup/fix-433897

Created by Andrey Bondarenko and last modified
Get this branch:
bzr branch lp:~abone/ubuntu/precise/console-setup/fix-433897
Only Andrey Bondarenko can upload to this branch. If you are Andrey Bondarenko please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

Owner:
Andrey Bondarenko
Status:
Development

Recent revisions

119. By Andrey Bondarenko

* debian/console-setup.initramfs-confhook: add initramfs hook with
  heuristic on enabling FRAMEBUFFER option (LP: #433897).
* debian/console-setup.console-font.upstart: add upstart job that
  sets up console font when plymouth-splash is starting.
  (thanks to Ahmed El-Mahmoudy) (LP: #632382).

118. By Colin Watson

Update Ubuntu-specific translations from Launchpad (LP: #985605).

117. By Bryce Harrington

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

116. By Stéphane Graber

No change rebuild for new xkb-data. (LP: #953328)

115. By Colin Watson

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

114. By Steve Langasek

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

113. By Colin Watson

Update Greek, Persian, Hebrew, Punjabi, and Traditional Chinese
translations from console-setup 1.68, fixing encoding problems
(LP: #860562).

112. By Steve Langasek

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

111. By Colin Watson

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

110. By Colin Watson

Fix default keyboard selection for language/country combinations lacking
a proper combined locale (LP: #814448).

Branch metadata

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