-
Committer:
Package Import Robot
-
Author(s):
Steve Langasek
-
Date:
2011-11-08 09:34:02 UTC
-
mfrom:
(3.2.23 sid)
-
Revision ID:
package-import@ubuntu.com-20111108093402-lvzehn5o6xgs45w7
Tags: 1.70ubuntu1
* 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.