diff -Nru ibus-1.5.5/debian/changelog ibus-1.5.5/debian/changelog --- ibus-1.5.5/debian/changelog 2014-01-26 16:28:39.000000000 +0900 +++ ibus-1.5.5/debian/changelog 2014-02-04 22:11:09.000000000 +0900 @@ -1,3 +1,18 @@ +ibus (1.5.5-1ubuntu1) trusty; urgency=medium + + * Merge with Debian (LP: #1276143); remaining changes: + - debian/rules: + + Build with dh_translations. Add dh-translations build dependency. + - Add 02_title_update.patch: Rename "IBus Preferences" to "Keyboard Input + Methods" + - debian/patches/ibus-no-notification.patch: Don't show the notification + if not actually upgrading from a previous version. (LP: #1255542). + * debian/patches/03_dont_run_dconf_update.patch: added + - Don't run "dconf update" if $(DESTDIR) is set + + https://github.com/ibus/ibus/commit/e6ec45d64a32d16245770f8b80e795a63e6ad553 + + -- Ikuya Awashiro Mon, 03 Feb 2014 22:34:56 +0900 + ibus (1.5.5-1) unstable; urgency=medium * New upstream release. diff -Nru ibus-1.5.5/debian/control ibus-1.5.5/debian/control --- ibus-1.5.5/debian/control 2014-01-26 14:49:24.000000000 +0900 +++ ibus-1.5.5/debian/control 2014-02-03 22:29:27.000000000 +0900 @@ -14,6 +14,7 @@ debhelper (>= 9), desktop-file-utils, dh-autoreconf, + dh-translations, gconf2, gettext, gobject-introspection, diff -Nru ibus-1.5.5/debian/patches/02_title_update.patch ibus-1.5.5/debian/patches/02_title_update.patch --- ibus-1.5.5/debian/patches/02_title_update.patch 1970-01-01 09:00:00.000000000 +0900 +++ ibus-1.5.5/debian/patches/02_title_update.patch 2014-02-03 22:34:21.000000000 +0900 @@ -0,0 +1,41 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 02_title_update.dpatch by Sebastien Bacher +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +--- a/setup/ibus-setup.desktop.in ++++ b/setup/ibus-setup.desktop.in +@@ -1,6 +1,6 @@ + [Desktop Entry] +-_Name=IBus Preferences +-_Comment=Set IBus Preferences ++_Name=Keyboard Input Methods ++_Comment=Adjust methods for keyboard input. + Exec=ibus-setup + Icon=ibus-setup + Terminal=false +--- a/setup/main.py ++++ b/setup/main.py +@@ -381,7 +381,7 @@ + if self.__bus.is_connected(): + return + +- message = _("The IBus daemon is not running. Do you wish to start it?") ++ message = _("Keyboard Input Methods (IBus Daemon) is not running. Do you wish to start it?") + dlg = Gtk.MessageDialog(type = Gtk.MessageType.QUESTION, + buttons = Gtk.ButtonsType.YES_NO, + text = message) +@@ -403,10 +403,7 @@ + + if self.__bus.is_connected(): + message = _("IBus has been started! " +- "If you cannot use IBus, add the following lines to your $HOME/.bashrc; then relog into your desktop.\n" +- " export GTK_IM_MODULE=ibus\n" +- " export XMODIFIERS=@im=ibus\n" +- " export QT_IM_MODULE=ibus" ++ "If you can not use IBus, please open System Menu -> System Settings -> Language Support and set the \"Keyboard Input Method\" to \"ibus\", then log out and back in again." + ) + dlg = Gtk.MessageDialog(type = Gtk.MessageType.INFO, + buttons = Gtk.ButtonsType.OK, diff -Nru ibus-1.5.5/debian/patches/03_dont_run_dconf_update.patch ibus-1.5.5/debian/patches/03_dont_run_dconf_update.patch --- ibus-1.5.5/debian/patches/03_dont_run_dconf_update.patch 1970-01-01 09:00:00.000000000 +0900 +++ ibus-1.5.5/debian/patches/03_dont_run_dconf_update.patch 2014-02-03 22:33:58.000000000 +0900 @@ -0,0 +1,42 @@ +From e6ec45d64a32d16245770f8b80e795a63e6ad553 Mon Sep 17 00:00:00 2001 +From: Colin Walters +Date: Thu, 16 Jan 2014 13:22:12 +0900 +Subject: [PATCH] data/dconf: Don't run "dconf update" if $(DESTDIR) is set + +dconf changed as of +https://git.gnome.org/browse/dconf/commit/?id=c211fc46496597c7ddabd73d623bae4037754916 +to actually emit an error if /etc/dconf/db is empty. When building +ibus in a system such as dpkg/rpm or gnome-continuous, there may +actually be nothing in that directory in the buildroot. + +This will now cause "dconf update" as executed by this Makefile to +fail. The fix is to just check $(DESTDIR), like we should do for all +triggers (e.g. gtk-update-icon-cache too). It's never useful to +execute these from per-component Makefiles if $(DESTDIR) is set. + +Instead, these meta-build systems (dpkg/rpm/jhbuild/Continuous) all +take care of execution of triggers on their own. + +Review URL: https://codereview.appspot.com/51730044 +Patch from Colin Walters . +--- + data/dconf/Makefile.am | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/data/dconf/Makefile.am b/data/dconf/Makefile.am +index c841a34..62c20a3 100644 +--- a/data/dconf/Makefile.am ++++ b/data/dconf/Makefile.am +@@ -61,6 +61,8 @@ org.freedesktop.ibus.gschema.xml.in: $(top_srcdir)/data/ibus.schemas.in + { rc=$$?; $(RM) -rf $@; exit $$rc; } + + install-data-hook: +- dconf update ++ if test -z "$(DESTDIR)"; then \ ++ dconf update; \ ++ fi + + -include $(top_srcdir)/git.mk +-- +1.8.5.1 + diff -Nru ibus-1.5.5/debian/patches/ibus-no-notification.patch ibus-1.5.5/debian/patches/ibus-no-notification.patch --- ibus-1.5.5/debian/patches/ibus-no-notification.patch 1970-01-01 09:00:00.000000000 +0900 +++ ibus-1.5.5/debian/patches/ibus-no-notification.patch 2014-02-03 22:31:32.000000000 +0900 @@ -0,0 +1,19 @@ +Description: don't show notification if not upgrading from a previous version +Author: Marc Deslauriers +Bug: http://code.google.com/p/ibus/issues/detail?id=1677 +Bug-Ubuntu: https://bugs.launchpad.net/ibus/+bug/1255542 +Forwarded: yes + +Index: b/ui/gtk3/panel.vala +=================================================================== +--- a/ui/gtk3/panel.vala ++++ b/ui/gtk3/panel.vala +@@ -418,7 +418,7 @@ + string prev_version = m_settings_general.get_string("version"); + string current_version = null; + +- if (compare_versions(prev_version, "1.5.3") < 0) { ++ if (prev_version != "" && compare_versions(prev_version, "1.5.3") < 0) { + update_version_1_5_3(); + } + diff -Nru ibus-1.5.5/debian/patches/series ibus-1.5.5/debian/patches/series --- ibus-1.5.5/debian/patches/series 2014-01-26 14:30:39.000000000 +0900 +++ ibus-1.5.5/debian/patches/series 2014-02-03 22:33:46.000000000 +0900 @@ -94,3 +94,6 @@ ### - Removed imsettings-gnome, im-chooser, libgnomekbd dependencies. ### 999-update-po.patch +02_title_update.patch +ibus-no-notification.patch +03_dont_run_dconf_update.patch diff -Nru ibus-1.5.5/debian/rules ibus-1.5.5/debian/rules --- ibus-1.5.5/debian/rules 2014-01-26 14:56:07.000000000 +0900 +++ ibus-1.5.5/debian/rules 2014-02-03 22:40:06.000000000 +0900 @@ -9,7 +9,7 @@ export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed %: - dh $@ --with autoreconf,gir,python2 + dh $@ --with autoreconf,gir,python2,translations override_dh_auto_clean: -rm -f bindings/vala/ibus-1.0.vapi