-
Committer:
Dmitry Shachnev
-
Date:
2014-05-13 12:38:47 UTC
-
mfrom:
(12.1.75 trusty-proposed)
-
Revision ID:
mitya57@ubuntu.com-20140513123847-gi9hokrvv8pn9cfy
* 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.