[Merge] lp:~gunnarhj/ubuntu/utopic/im-config/new-upstream into lp:ubuntu/im-config

[Gunnar Hjalmarsson]

Gunnar Hjalmarsson has proposed merging lp:~gunnarhj/ubuntu/utopic/im-config/new-upstream into lp:ubuntu/im-config.

Commit message:
* Dropped patches:
  - 01_fcitx-default-if-installed.patch (replaced by upstream fix in
    debian/rules)
  - 02_support-qt5.patch (applied upstream)
* Merge with Debian unstable (LP: #1296753), remaining Ubuntu changes:
  - debian/im-config.user-session.upstart
  - debian/rules: Install upstart job script
  - debian/postinst: Additional condition to be met to edit
    80im-switch.
* debian/patches/02_support-qt5.patch:
  To support Qt5, set QT_IM_MODULE(LP: #1309885)

Requested reviews:
  Ubuntu branches (ubuntu-branches)
Related bugs:
  Bug #1296753 in im-config (Ubuntu): "spelling mistake in the generated ~/.xinputrc"
  https://bugs.launchpad.net/ubuntu/+source/im-config/+bug/1296753
  Bug #1309885 in im-config (Ubuntu): "Cannot enable IM inside Qt5 apps including webapp-container"
  https://bugs.launchpad.net/ubuntu/+source/im-config/+bug/1309885

For more details, see:
https://code.launchpad.net/~gunnarhj/ubuntu/utopic/im-config/new-upstream/+merge/217372
-- 
https://code.launchpad.net/~gunnarhj/ubuntu/utopic/im-config/new-upstream/+merge/217372
Your team Ubuntu branches is requested to review the proposed merge of lp:~gunnarhj/ubuntu/utopic/im-config/new-upstream into lp:ubuntu/im-config.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: review-diff.txt
Type: text/x-diff
Size: 42922 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/ubuntu-reviews/attachments/20140428/b38c46ff/attachment-0001.diff>