[Merge] lp:~mitya57/ubuntu/trusty/xkeyboard-config/2.10.1-1ubuntu1 into lp:ubuntu/xkeyboard-config

[Dmitry Shachnev]

Dmitry Shachnev has proposed merging lp:~mitya57/ubuntu/trusty/xkeyboard-config/2.10.1-1ubuntu1 into lp:ubuntu/xkeyboard-config.

Requested reviews:
  Ubuntu branches (ubuntu-branches)
Related bugs:
  Bug #991002 in xkeyboard-config (Ubuntu): "Use the modern English name Bangla instead of Bengali for the language code bn"
  https://bugs.launchpad.net/ubuntu/+source/xkeyboard-config/+bug/991002

For more details, see:
https://code.launchpad.net/~mitya57/ubuntu/trusty/xkeyboard-config/2.10.1-1ubuntu1/+merge/200141

[ Dmitry Shachnev ]
* Merge with Debian unstable, remaining changes:
  - control, rules, xkb-data-i18n.install, xkb-data.install: Split out
    xkb-data-i18n to be used by console-setup.
  - xkb-data.postinst.in: Remove the xkb cache to make sure it gets
    regenerated.
  - 105_intelligent_keyboard.patch: Add support for the Intelligent
    Keyboard K04.
  - 108_fix_intltool_make_check.diff: Fix make check in the presence
    of the quilt patch system.
  - Add multi-arch support.
* Dropped change (Ubuntu 12.04 LTS has a version newer than 1.9):
  - Migrate settings from dvorak-intl to dvorak-alt-intl to match rename
    in xkeyboard-config 1.9.

[ Gunnar Hjalmarsson ]
* debian/patches/bengali_to_bangla.patch:
  Use the modern language name Bangla instead of Bengali (LP: #991002).
-- 
The attached diff has been truncated due to its size.
https://code.launchpad.net/~mitya57/ubuntu/trusty/xkeyboard-config/2.10.1-1ubuntu1/+merge/200141
Your team Ubuntu branches is requested to review the proposed merge of lp:~mitya57/ubuntu/trusty/xkeyboard-config/2.10.1-1ubuntu1 into lp:ubuntu/xkeyboard-config.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: review-diff.txt
Type: text/x-diff
Size: 524288 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/ubuntu-reviews/attachments/20131229/86ffe4f0/attachment-0001.diff>