diff -Nru mozc-1.3.975.102/debian/README.Debian mozc-1.3.975.102/debian/README.Debian --- mozc-1.3.975.102/debian/README.Debian 2011-11-30 15:18:40.000000000 +0900 +++ mozc-1.3.975.102/debian/README.Debian 2012-03-06 12:31:13.000000000 +0900 @@ -1,18 +1,4 @@ - About Mozc/Debian --- License -The section of Mozc of Debian is non-free. -Because dictionary of mozc is created from IPAdic and naist-jdic. -Nasit-jdic is DFSG-free[0], but IPAdic is DFSG-non-free[1]. - -I thought that I divide dictionary data, but cannot distribute it now -because the data of each dictionary coexist. -And the user cannot use it so that performance declines even if I release -mozc which removed dictionary data in debian. - -I set mozc non-free section from such reason. - -[0]: http://packages.debian.org/source/sid/mecab-naist-jdic -[1]: http://packages.debian.org/source/sid/ipadic -- emacs-mozc From mozc-0.13.499.102-1, mozc-emacs was provided. @@ -32,4 +18,4 @@ Having the above settings, just type C-\ which is bound to `toggle-input-method' by default. --- Wed, 13 Oct 2010 11:08:43 +0900 Nobuhiro Iwamatsu +-- Tue, 06 Mar 2012 08:45:41 +0900 Nobuhiro Iwamatsu diff -Nru mozc-1.3.975.102/debian/changelog mozc-1.3.975.102/debian/changelog --- mozc-1.3.975.102/debian/changelog 2012-01-27 17:30:25.000000000 +0900 +++ mozc-1.3.975.102/debian/changelog 2012-03-06 12:31:13.000000000 +0900 @@ -1,3 +1,12 @@ +mozc (1.3.975.102-2) unstable; urgency=low + + * Update Standards-Version to 3.9.3. + * Fix FTBFS with ibus 1.4.0 (Closes: #662586) + * Update debian/README.Debian. (Closes: #652886) + Remove section of license. + + -- Nobuhiro Iwamatsu Tue, 06 Mar 2012 08:54:20 +0900 + mozc (1.3.975.102-1) unstable; urgency=low * New upstream release (r94). diff -Nru mozc-1.3.975.102/debian/control mozc-1.3.975.102/debian/control --- mozc-1.3.975.102/debian/control 2011-11-30 15:18:40.000000000 +0900 +++ mozc-1.3.975.102/debian/control 2012-03-06 12:31:13.000000000 +0900 @@ -8,7 +8,7 @@ python-dev, gyp (>= 0.1~svn824), protobuf-compiler, libgtest-dev, libprotobuf-dev, libqt4-dev, libscim-dev, libuim-dev, libzinnia-dev -Standards-Version: 3.9.2 +Standards-Version: 3.9.3 Homepage: http://code.google.com/p/mozc/ Package: ibus-mozc diff -Nru mozc-1.3.975.102/debian/patches/bug117_fix_ftbfs_ibus1.4.0.patch mozc-1.3.975.102/debian/patches/bug117_fix_ftbfs_ibus1.4.0.patch --- mozc-1.3.975.102/debian/patches/bug117_fix_ftbfs_ibus1.4.0.patch 1970-01-01 09:00:00.000000000 +0900 +++ mozc-1.3.975.102/debian/patches/bug117_fix_ftbfs_ibus1.4.0.patch 2012-03-06 12:31:13.000000000 +0900 @@ -0,0 +1,58 @@ +Description: Fix FTBFS with ibus 1.4.0 +Forwarded: not-needed +Origin: http://code.google.com/p/mozc/issues/detail?id=117 +Author: ichelm610x@gmail.com +Last-Update: 2012-02-06 + +--- a/unix/ibus/mozc_engine.cc ++++ b/unix/ibus/mozc_engine.cc +@@ -620,8 +620,15 @@ + + #ifndef OS_CHROMEOS + if (prop_mozc_tool_) { ++#if IBUS_CHECK_VERSION(1, 4, 0) ++ while ((prop = ibus_prop_list_get( ++ const_cast( ++ ibus_property_get_sub_props(prop_mozc_tool_)), i++))) { ++ if (!g_strcmp0(property_name, ibus_property_get_key(prop))) { ++#else + while ((prop = ibus_prop_list_get(prop_mozc_tool_->sub_props, i++))) { +- if (!g_strcmp0(property_name, prop->key)) { ++ if (!g_strcmp0(property_name, prop->key)) { ++#endif + const MozcEngineToolProperty *entry = + reinterpret_cast( + g_object_get_data(G_OBJECT(prop), kGObjectDataKey)); +@@ -640,8 +647,15 @@ + } + + i = 0; ++#if IBUS_CHECK_VERSION(1, 4, 0) ++ while ((prop = ibus_prop_list_get( ++ const_cast( ++ ibus_property_get_sub_props(prop_composition_mode_)), i++))) { ++ if (!g_strcmp0(property_name, ibus_property_get_key(prop))) { ++#else + while ((prop = ibus_prop_list_get(prop_composition_mode_->sub_props, i++))) { +- if (!g_strcmp0(property_name, prop->key)) { ++ if (!g_strcmp0(property_name, prop->key)) { ++#endif + const MozcEngineProperty *entry = + reinterpret_cast( + g_object_get_data(G_OBJECT(prop), kGObjectDataKey)); +@@ -1096,8 +1110,15 @@ + + size_t i = 0; + IBusProperty *prop = NULL; ++#if IBUS_CHECK_VERSION(1, 4, 0) ++ while ((prop = ibus_prop_list_get( ++ const_cast( ++ ibus_property_get_sub_props(prop_composition_mode_)), i++))) { ++ if (!g_strcmp0(entry->key, ibus_property_get_key(prop))) { ++#else + while ((prop = ibus_prop_list_get(prop_composition_mode_->sub_props, i++))) { + if (!g_strcmp0(entry->key, prop->key)) { ++#endif + // Update the language panel. + ibus_property_set_icon(prop_composition_mode_, + GetIconPath(entry->icon).c_str()); diff -Nru mozc-1.3.975.102/debian/patches/series mozc-1.3.975.102/debian/patches/series --- mozc-1.3.975.102/debian/patches/series 2011-12-07 08:32:30.000000000 +0900 +++ mozc-1.3.975.102/debian/patches/series 2012-03-06 12:31:13.000000000 +0900 @@ -4,3 +4,4 @@ add_tegaki_ui_scim_mozc.patch add_tegaki_ui_ibus_mozc.patch bug107_request_surrounding_text.patch +bug117_fix_ftbfs_ibus1.4.0.patch