Ubuntu Seeds

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

  1. lp-1430893
  2. Merge into ubuntu.vivid
Proposed by Aron Xu
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 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
=== modified file 'desktop'
--- desktop 2015-02-20 09:24:39 +0000
+++ desktop 2015-03-16 11:17:42 +0000
@@ -42,7 +42,6 @@
42 * (ibus-gtk)42 * (ibus-gtk)
43 * (ibus-gtk3)43 * (ibus-gtk3)
44 * (ibus-table)44 * (ibus-table)
45 * (ibus-pinyin)
4645
47= Desktop GNOME Apps =46= Desktop GNOME Apps =
4847
4948
=== modified file 'live'
--- live 2014-06-24 03:10:36 +0000
+++ live 2015-03-16 11:17:42 +0000
@@ -28,6 +28,18 @@
28 * gparted28 * gparted
29 * cifs-utils # Needed by casper for CIFS root=29 * cifs-utils # Needed by casper for CIFS root=
3030
31== Input methods ==
32 * fcitx
33 * fcitx-frontend-gtk2
34 * fcitx-frontend-gtk3
35 * fcitx-frontend-qt4
36 * fcitx-frontend-qt5
37 * fcitx-ui-classic
38 * fcitx-ui-qimpanel
39 * fcitx-table
40 * fcitx-pinyin
41 * fcitx-module-cloudpinyin
42
31== Ubiquity components ==43== Ubiquity components ==
3244
33These packages make up the Ubiquity live installer.45These packages make up the Ubiquity live installer.

Subscribers

People subscribed via source and target branches