-
Committer:
Bazaar Package Importer
-
Author(s):
Christopher James Halse Rogers
-
Date:
2011-05-24 12:13:34 UTC
-
mfrom:
(12.2.8 experimental)
-
Revision ID:
james.westby@ubuntu.com-20110524121334-u399stisk9lpy96g
Tags: 2.2.1-1ubuntu1
* Merge from Debian experimental.  Remaining Ubuntu changes:
    + xkb-data-i18n.install, xkb-data.install, rules: Split out
      xkb-data-i18n to be used by console-setup.
    + rules: Generate pot file for translations during build
    + 105_intelligent_keyboard.patch: Add support for the Intelligent
      Keyboard K04
*Â debian/patches/108_taiwan.patch:
*Â debian/patches/104_macbook_expose_and_dashboard.patch:
*Â debian/patches/107_lao.patch:
  - Drop, included upstream
*Â debian/xkb-data.postinst.in:
  - Migrate console-setup/keyboard-configuration settings from dvorak-intl
    to dvorak-alt-intl to match rename in xkeyboard-config 1.9. (LP: #742683)
*Â debian/patches/108_fix_intltool_make_check.diff:
  - Fix make check in the presence of the quilt patch system.