Accepting request 365739 from home:qzhao:branches:M17N

porting SLE ibus patch to M17N project.

OBS-URL: https://build.opensuse.org/request/show/365739
OBS-URL: https://build.opensuse.org/package/show/M17N/ibus?expand=0&rev=148

ibus.changes

@@ -1,5 +1,38 @@
+--------------------------------------------------------------------
+Mon Feb 28 17:59:28 CET 2016 - qzhao@suse.com
+
+- Add ibus-adapt-new-vala.patch: Fix ibus compile error under
+  new vala compiler, for SLE Desktop 12 SP2. This patch is only
+  for SLED.
+
+--------------------------------------------------------------------
+Mon Feb 28 15:57:01 CET 2016 - qzhao@suse.com
+
+- Add conflict to fcitx to fulfill FATE#319095
+  deprecate fcitx chinese input method in favor of ibus
+  (dummy bsc#933411). This modification is only for SLED.
+
 -------------------------------------------------------------------
-Wed Feb 24 19:01:08 CET 2016 - tiwai@suse.de
+Mon Feb 28 14:57:01 CET 2016 - sbrabec@suse.com
+
+- Add support for translation-update-upstream (dummy bsc#933411).
+
+-------------------------------------------------------------------
+Mon Feb 28 12:20:10 CET 2016 - qzhao@suse.com
+
+- Add setup-switch-im.patch. Switch to ibus when ibus not
+  running.(bnc#899259). This patch is only for SLED.
+
+-------------------------------------------------------------------
+Mon Feb 28 10:30:20 CET 2016 - qzhao@suse.com
+
+- Add hide-setup-menu.patch
+  Make ibus-setup launch from indicator field.(bnc#899259)
+  Remove ibus-setup.desktop from main menu. This patch is only
+  for SLED.
+
+-------------------------------------------------------------------
+Wed Feb 24 11:01:08 CET 2016 - tiwai@suse.de
 
 - Fix the invocation of ibus service for KDE, etc (boo#968486):
   for DEs known to support autostart (KDE, XFCE and LXCE), ibus is