Merge lp://qastaging/~mitya57/ubuntu/utopic/xkeyboard-config/2.12-1ubuntu1 into lp://qastaging/ubuntu/utopic/xkeyboard-config
| Status: | Merged |
|---|---|
| Merge reported by: | Dmitry Shachnev |
| Merged at revision: | not available |
| Proposed branch: | lp://qastaging/~mitya57/ubuntu/utopic/xkeyboard-config/2.12-1ubuntu1 |
| Merge into: | lp://qastaging/ubuntu/utopic/xkeyboard-config |
| Diff against target: |
86934 lines (+24677/-20115) 80 files modified
NEWS (+3/-0) configure (+10/-10) configure.ac (+1/-1) debian/changelog (+23/-0) debian/patches/fr-oss-rctrl.diff (+28/-0) debian/patches/series (+1/-0) docs/README.enhancing (+5/-5) keycodes/xfree86 (+2/-2) po/bg.po (+922/-809) po/ca.po (+930/-820) po/cs.po (+2909/-2500) po/da.po (+932/-846) po/de.po (+933/-817) po/el.po (+3394/-1703) po/es.po (+933/-820) po/fr.po (+959/-837) po/gl.po (+2924/-2470) po/ko.po (+1063/-856) po/lt.po (+1095/-1022) po/nl.po (+984/-940) po/pl.po (+930/-817) po/pt_BR.po (+935/-822) po/ru.po (+932/-822) po/uk.po (+922/-809) po/xkeyboard-config.pot (+925/-812) rules/base.extras.xml.in (+53/-14) rules/base.o_s.part (+1/-0) rules/base.xml.in (+66/-14) rules/compat/base.l1v1_c.part (+1/-0) rules/compat/base.l2v2_c.part (+1/-0) rules/compat/base.l3v3_c.part (+1/-0) rules/compat/base.l4v4_c.part (+1/-0) rules/compat/base.lv_c.part (+1/-0) rules/evdev.extras.xml.in (+53/-14) rules/evdev.xml.in (+67/-15) symbols/Makefile.am (+1/-1) symbols/Makefile.in (+1/-1) symbols/af (+6/-6) symbols/al (+64/-0) symbols/ara (+1/-1) symbols/ba (+5/-11) symbols/ca (+5/-6) symbols/cm (+7/-9) symbols/cz (+82/-81) symbols/de (+80/-6) symbols/dk (+8/-0) symbols/es (+8/-0) symbols/eu (+63/-0) symbols/fi (+16/-8) symbols/fr (+0/-2) symbols/group (+9/-0) symbols/hr (+33/-40) symbols/il (+1/-1) symbols/in (+12/-34) symbols/inet (+17/-17) symbols/ir (+1/-1) symbols/is (+2/-1) symbols/it (+8/-2) symbols/jp (+3/-3) symbols/keypad (+1/-1) symbols/kz (+0/-2) symbols/lv (+2/-2) symbols/ma (+1/-1) symbols/me (+1/-1) symbols/nl (+0/-2) symbols/no (+8/-0) symbols/rs (+255/-267) symbols/ru (+399/-425) symbols/se (+55/-4) symbols/si (+6/-7) symbols/sk (+69/-69) symbols/sun_vndr/de (+10/-0) symbols/sun_vndr/pl (+1/-1) symbols/sun_vndr/sk (+1/-1) symbols/tm (+4/-4) symbols/tr (+216/-221) symbols/tw (+6/-6) symbols/ua (+247/-246) symbols/us (+14/-27) types/pc (+8/-0) |
| To merge this branch: | bzr merge lp://qastaging/~mitya57/ubuntu/utopic/xkeyboard-config/2.12-1ubuntu1 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Daniel Holbach (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
xkeyboard-config (2.12-1ubuntu1) utopic; urgency=medium
* Merge with Debian unstable, remaining changes:
- control, rules, xkb-data-
xkb-data-i18n to be used by console-setup.
- xkb-data.
regenerated.
- 105_intelligent
Keyboard K04. Not accepted upstream, so is a candidate for being
dropped in a future upload.
-- Dmitry Shachnev <email address hidden> 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 <email address hidden> Fri, 06 Jun 2014 17:44:52 +0200
Thanks. Uploaded.