Merge lp:~happyaron/ubuntu-seeds/lp-1430893 into lp:~ubuntu-core-dev/ubuntu-seeds/ubuntu.vivid

Proposed by Aron Xu on 2015-03-11
Status: Merged
Merged at revision: 2316
Proposed branch: lp:~happyaron/ubuntu-seeds/lp-1430893
Merge into: lp:~ubuntu-core-dev/ubuntu-seeds/ubuntu.vivid
Diff against target: 34 lines (+12/-1)
2 files modified
desktop (+0/-1)
live (+12/-0)
To merge this branch: bzr merge lp:~happyaron/ubuntu-seeds/lp-1430893
Reviewer Review Type Date Requested Status
Ubuntu Core Development Team 2015-03-11 Pending
Review via email: mp+252632@code.launchpad.net

Description of the change

This adds Fcitx and its PinYin module in the image, at the same time removes IBus's PinYin module (so does its dependency).

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'desktop'
2--- desktop 2015-02-20 09:24:39 +0000
3+++ desktop 2015-03-16 11:17:42 +0000
4@@ -42,7 +42,6 @@
5 * (ibus-gtk)
6 * (ibus-gtk3)
7 * (ibus-table)
8- * (ibus-pinyin)
9
10 = Desktop GNOME Apps =
11
12
13=== modified file 'live'
14--- live 2014-06-24 03:10:36 +0000
15+++ live 2015-03-16 11:17:42 +0000
16@@ -28,6 +28,18 @@
17 * gparted
18 * cifs-utils # Needed by casper for CIFS root=
19
20+== Input methods ==
21+ * fcitx
22+ * fcitx-frontend-gtk2
23+ * fcitx-frontend-gtk3
24+ * fcitx-frontend-qt4
25+ * fcitx-frontend-qt5
26+ * fcitx-ui-classic
27+ * fcitx-ui-qimpanel
28+ * fcitx-table
29+ * fcitx-pinyin
30+ * fcitx-module-cloudpinyin
31+
32 == Ubiquity components ==
33
34 These packages make up the Ubiquity live installer.

Subscribers

People subscribed via source and target branches