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

[Dmitry Shachnev]

Dmitry Shachnev has proposed merging lp:~mitya57/ubuntu/utopic/xkeyboard-config/2.12-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.12-1ubuntu1/+merge/224043

xkeyboard-config (2.12-1ubuntu1) utopic; urgency=medium

  * 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. Not accepted upstream, so is a candidate for being
      dropped in a future upload.

 -- Dmitry Shachnev <mitya57 at ubuntu.com>  Sun, 22 Jun 2014 19:19:04 +0400

xkeyboard-config (2.12-1) unstable; urgency=medium

  * New upstream release
    + revert Russian layout change from 2.11 (closes: #748521)
    + revert it/fr/nl numeric keypad separator change (closes: #748734, #749112)
  * Fix right control key on fr(oss) layout to behave like control again
    (closes: #733757)

 -- Julien Cristau <jcristau at debian.org>  Fri, 06 Jun 2014 17:44:52 +0200
-- 
The attached diff has been truncated due to its size.
https://code.launchpad.net/~mitya57/ubuntu/utopic/xkeyboard-config/2.12-1ubuntu1/+merge/224043
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/20140622/079521ee/attachment-0003.diff>