diff -Nru ibus-1.4.1/debian/changelog ibus-1.4.1/debian/changelog --- ibus-1.4.1/debian/changelog 2012-03-21 17:20:26.000000000 +0000 +++ ibus-1.4.1/debian/changelog 2012-03-31 02:26:49.000000000 +0000 @@ -1,6 +1,14 @@ +ibus (1.4.1-3ubuntu2~ppa1) precise; urgency=low + + * debian/patches/06_enable_replace.patch: added. + ibus.desktop never use on Ubuntu. So it is no problem to use + replace (restart) ibus-daemon. (LP: #875435) + + -- Ikuya Awashiro Sat, 31 Mar 2012 11:26:41 +0900 + ibus (1.4.1-3ubuntu1) precise; urgency=low - * Merge from Debian unstable (LP: #961145), remaining changes: + * Merge from Debian unstable, remaining changes: - debian/control: Install im-switch instead of im-config by default. - debian/rules: Build with dh_translations. Add dh-translations build dependency. @@ -29,38 +37,6 @@ -- Osamu Aoki Fri, 16 Mar 2012 22:07:41 +0900 -ibus (1.4.1-1ubuntu3) precise; urgency=low - - * debian/patches/ibus-530711-preload-sys.patch: - - Set default IMEngine (LP: #944035). - - Taken from Fedora. - https://bugzilla.redhat.com/show_bug.cgi?id=530711 - - -- Ikuya Awashiro Fri, 16 Mar 2012 17:18:35 +0900 - -ibus (1.4.1-1ubuntu2) precise; urgency=low - - * debian/patches/05_appindicator.patch: tweak the id so the fallback icon - gets the same name as the normal gtkstatusicon (lp: #885080) - - -- Sebastien Bacher Fri, 09 Mar 2012 22:23:18 +0100 - -ibus (1.4.1-1ubuntu1) precise; urgency=low - - * Merge from Debian unstable, remaining changes: - - debian/control: Install im-switch instead of im-config by default. - - debian/rules: Build with dh_translations. Add dh-translations build - dependency. - - Add 02_title_update.patch: Rename "IBus Preferences" to "Keyboard Input - Methods" - - Add 05_appindicator.patch: Use an indicator rather than a notification - icon. Add python-appindicator recommends. - - debian/control: Recommends on ibus-gtk, ibus-qt4, ibus-clutter need to - be alternatives, because we want derivatives to be able to pick the ones - they need. - - -- Martin Pitt Tue, 06 Mar 2012 09:45:51 +0100 - ibus (1.4.1-1) unstable; urgency=low * Remove old patches included in the upstream. diff -Nru ibus-1.4.1/debian/patches/06_enable_replace.patch ibus-1.4.1/debian/patches/06_enable_replace.patch --- ibus-1.4.1/debian/patches/06_enable_replace.patch 1970-01-01 00:00:00.000000000 +0000 +++ ibus-1.4.1/debian/patches/06_enable_replace.patch 2012-03-27 03:22:21.000000000 +0000 @@ -0,0 +1,11 @@ +--- a/bus/ibus.desktop.in ++++ b/bus/ibus.desktop.in +@@ -2,7 +2,7 @@ + _Name=IBus + _GenericName=Input Method Framework + _Comment=Start IBus Input Method Framework +-Exec=ibus-daemon --xim ++Exec=ibus-daemon --xim --replace + Icon=ibus + Terminal=false + Type=Application diff -Nru ibus-1.4.1/debian/patches/series ibus-1.4.1/debian/patches/series --- ibus-1.4.1/debian/patches/series 2012-03-16 16:22:04.000000000 +0000 +++ ibus-1.4.1/debian/patches/series 2012-03-27 03:20:33.000000000 +0000 @@ -3,3 +3,4 @@ 02_title_update.patch 05_appindicator.patch ibus-530711-preload-sys.patch +06_enable_replace.patch