[Merge] lp:~mitya57/ubuntu/utopic/xkeyboard-config/2.11-1ubuntu1 into lp:ubuntu/xkeyboard-config

[Dmitry Shachnev]

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

Requested reviews:
  Ubuntu Development Team (ubuntu-dev)

For more details, see:
https://code.launchpad.net/~mitya57/ubuntu/utopic/xkeyboard-config/2.11-1ubuntu1/+merge/219358

* 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.
* Dropped bengali_to_bangla.patch, applied upstream.
* Dropped 108_fix_intltool_make_check.diff, seems to be no longer
  needed.

I dropped 108_fix_intltool_make_check.diff because the package builds fine without it and Debian does not have this patch. Ideally I would like to drop 105_intelligent_keyboard.patch as well, as it seems it was either not forwarded upstream or rejected there.
-- 
The attached diff has been truncated due to its size.
https://code.launchpad.net/~mitya57/ubuntu/utopic/xkeyboard-config/2.11-1ubuntu1/+merge/219358
Your team Ubuntu branches is subscribed to branch 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/20140513/c3efb5a8/attachment-0003.diff>