diff -Nru ibus-pinyin-1.5.0/debian/changelog ibus-pinyin-1.5.0/debian/changelog --- ibus-pinyin-1.5.0/debian/changelog 2015-09-02 16:54:46.000000000 +0000 +++ ibus-pinyin-1.5.0/debian/changelog 2016-12-10 04:16:37.000000000 +0000 @@ -1,22 +1,21 @@ -ibus-pinyin (1.5.0-3ubuntu3) wily; urgency=medium +ibus-pinyin (1.5.0-4) unstable; urgency=medium - * Don't hardcode dependency on shared libraries. + * Acknowledge NMU. + * Update upstream site etc. + * Add ibus-pinyin-default-full.patch: Set ibus-pinyin engine to + full pinyin as default when dconf data not exist.(from openSUSE) + * Update the CVE-2013-4509 patch with upstream one. + * Depend on dh_lua and drop liblua5.1-0-dev. + * Depend on dh_python. - -- Matthias Klose Wed, 02 Sep 2015 18:54:17 +0200 + -- Osamu Aoki Sat, 10 Dec 2016 13:16:37 +0900 -ibus-pinyin (1.5.0-3ubuntu2) wily; urgency=medium +ibus-pinyin (1.5.0-3.1) unstable; urgency=medium - * No-change rebuild for libstdc++6 ABI changes. + * Non-maintainer upload. + * Remove hard-coded dependency on libpyzy-1.0-0 (Closes: #797332) - -- Matthias Klose Wed, 02 Sep 2015 12:31:44 +0200 - -ibus-pinyin (1.5.0-3ubuntu1) utopic; urgency=low - - * Merge with Debian, remaining changes: - - debian/patches/lua52.diff: Use lua5.2 by default. - - debian/control: Build-Depends on liblua5.2-dev - - -- Aron Xu Sat, 20 Sep 2014 20:52:47 +0800 + -- Jonathan Wiltshire Thu, 03 Sep 2015 22:11:56 +0100 ibus-pinyin (1.5.0-3) unstable; urgency=medium diff -Nru ibus-pinyin-1.5.0/debian/control ibus-pinyin-1.5.0/debian/control --- ibus-pinyin-1.5.0/debian/control 2015-09-02 16:55:01.000000000 +0000 +++ ibus-pinyin-1.5.0/debian/control 2016-12-10 04:16:37.000000000 +0000 @@ -2,15 +2,14 @@ Section: utils Priority: optional Maintainer: IME Packaging Team -Uploaders: LI Daobing , - Asias He , - Aron Xu , +Uploaders: Aron Xu , Osamu Aoki Build-Depends: debhelper (>= 9), dh-autoreconf, + dh-lua, + dh-python, intltool (>= 0.35.0), libibus-1.0-dev (>= 1.5), - liblua5.2-dev, libopencc-dev (>= 0.1.0), libpyzy-dev, libsqlite3-dev (>= 3.6), @@ -18,10 +17,10 @@ python-dev (>= 2.6.6-3~), sqlite3, uuid-dev -Standards-Version: 3.9.5 -Homepage: http://code.google.com/p/ibus -Vcs-Git: git://anonscm.debian.org/pkg-ime/ibus-pinyin.git -Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-ime/ibus-pinyin.git +Standards-Version: 3.9.8 +Homepage: https://github.com/ibus/ibus/wiki +Vcs-Git: https://anonscm.debian.org/git/pkg-ime/ibus-pinyin.git +Vcs-Browser: https://anonscm.debian.org/cgit/pkg-ime/ibus-pinyin.git Package: ibus-pinyin Architecture: any diff -Nru ibus-pinyin-1.5.0/debian/copyright ibus-pinyin-1.5.0/debian/copyright --- ibus-pinyin-1.5.0/debian/copyright 2014-06-04 14:49:11.000000000 +0000 +++ ibus-pinyin-1.5.0/debian/copyright 2016-12-10 04:16:37.000000000 +0000 @@ -1,6 +1,6 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: ibus-pinyin -Source: http://code.google.com/p/ibus/downloads/list +Source: https://github.com/ibus/ibus-pinyin/releases Files: * Copyright: 2008-2010 Peng Huang diff -Nru ibus-pinyin-1.5.0/debian/patches/ibus-pinyin-default-full.patch ibus-pinyin-1.5.0/debian/patches/ibus-pinyin-default-full.patch --- ibus-pinyin-1.5.0/debian/patches/ibus-pinyin-default-full.patch 1970-01-01 00:00:00.000000000 +0000 +++ ibus-pinyin-1.5.0/debian/patches/ibus-pinyin-default-full.patch 2016-12-10 04:16:37.000000000 +0000 @@ -0,0 +1,19 @@ +--- a/src/PYConfig.cc ++++ b/src/PYConfig.cc +@@ -103,7 +103,7 @@ + PyZy::Variant::fromUnsignedInt (option ())); + + m_orientation = IBUS_ORIENTATION_HORIZONTAL; +- m_page_size = 5; ++ m_page_size = 9; + m_shift_select_candidate = FALSE; + m_minus_equal_page = TRUE; + m_comma_period_page = TRUE; +@@ -111,6 +111,7 @@ + + m_init_chinese = TRUE; + m_init_full = FALSE; ++ m_double_pinyin = FALSE; + m_init_full_punct = TRUE; + m_init_simp_chinese = TRUE; + m_special_phrases = TRUE; diff -Nru ibus-pinyin-1.5.0/debian/patches/ibus-pinyin-support-setContentType-method.patch ibus-pinyin-1.5.0/debian/patches/ibus-pinyin-support-setContentType-method.patch --- ibus-pinyin-1.5.0/debian/patches/ibus-pinyin-support-setContentType-method.patch 1970-01-01 00:00:00.000000000 +0000 +++ ibus-pinyin-1.5.0/debian/patches/ibus-pinyin-support-setContentType-method.patch 2016-12-10 04:16:37.000000000 +0000 @@ -0,0 +1,182 @@ +From 97565d04e40634a1ab62790f718a8377754d2954 Mon Sep 17 00:00:00 2001 +From: Peng Wu +Date: Wed, 19 Feb 2014 10:57:40 -0500 +Subject: [PATCH 1/1] support setContentType method + +ibus now supports setContentType method, if an application input some +password, the password will not be shown. + +BUG=rhbz#1027029 +R=Shawn.P.Huang@gmail.com + +Review URL: https://codereview.appspot.com/22330043 + +Patch from Peng Wu . +--- + src/PYBopomofoEngine.cc | 5 +++++ + src/PYEngine.cc | 54 +++++++++++++++++++++++++++++++++++++++++++++++++ + src/PYEngine.h | 14 +++++++++++-- + src/PYPinyinEngine.cc | 5 +++++ + 4 files changed, 76 insertions(+), 2 deletions(-) + +--- a/src/PYBopomofoEngine.cc ++++ b/src/PYBopomofoEngine.cc +@@ -72,6 +72,9 @@ + { + gboolean retval = FALSE; + ++ if (contentIsPassword()) ++ return retval; ++ + /* check Shift + Release hotkey, + * and then ignore other Release key event */ + if (modifiers & IBUS_RELEASE_MASK) { +@@ -139,6 +142,8 @@ + void + BopomofoEngine::focusOut (void) + { ++ Engine::focusOut(); ++ + reset (); + } + +--- a/src/PYEngine.cc ++++ b/src/PYEngine.cc +@@ -67,6 +67,12 @@ + guint modifiers); + static void ibus_pinyin_engine_focus_in (IBusEngine *engine); + static void ibus_pinyin_engine_focus_out (IBusEngine *engine); ++#if IBUS_CHECK_VERSION (1, 5, 4) ++static void ibus_pinyin_engine_set_content_type ++ (IBusEngine *engine, ++ guint purpose, ++ guint hints); ++#endif + static void ibus_pinyin_engine_reset (IBusEngine *engine); + static void ibus_pinyin_engine_enable (IBusEngine *engine); + static void ibus_pinyin_engine_disable (IBusEngine *engine); +@@ -123,6 +129,10 @@ + engine_class->focus_in = ibus_pinyin_engine_focus_in; + engine_class->focus_out = ibus_pinyin_engine_focus_out; + ++#if IBUS_CHECK_VERSION (1, 5, 4) ++ engine_class->set_content_type = ibus_pinyin_engine_set_content_type; ++#endif ++ + engine_class->page_up = ibus_pinyin_engine_page_up; + engine_class->page_down = ibus_pinyin_engine_page_down; + +@@ -182,6 +192,17 @@ + return pinyin->engine->processKeyEvent (keyval, keycode, modifiers); + } + ++#if IBUS_CHECK_VERSION (1, 5, 4) ++static void ++ibus_pinyin_engine_set_content_type (IBusEngine *engine, ++ guint purpose, ++ guint hints) ++{ ++ IBusPinyinEngine *pinyin = (IBusPinyinEngine *) engine; ++ return pinyin->engine->setContentType (purpose, hints); ++} ++#endif ++ + static void + ibus_pinyin_engine_property_activate (IBusEngine *engine, + const gchar *prop_name, +@@ -220,6 +241,39 @@ + FUNCTION(cursor_down, cursorDown) + #undef FUNCTION + ++Engine::Engine (IBusEngine *engine) : m_engine (engine) ++{ ++#if IBUS_CHECK_VERSION (1, 5, 4) ++ m_input_purpose = IBUS_INPUT_PURPOSE_FREE_FORM; ++#endif ++} ++ ++gboolean ++Engine::contentIsPassword() ++{ ++#if IBUS_CHECK_VERSION (1, 5, 4) ++ return IBUS_INPUT_PURPOSE_PASSWORD == m_input_purpose; ++#else ++ return false; ++#endif ++} ++ ++void ++Engine::focusOut (void) ++{ ++#if IBUS_CHECK_VERSION (1, 5, 4) ++ m_input_purpose = IBUS_INPUT_PURPOSE_FREE_FORM; ++#endif ++} ++ ++#if IBUS_CHECK_VERSION(1, 5, 4) ++void ++Engine::setContentType (guint purpose, guint hints) ++{ ++ m_input_purpose = (IBusInputPurpose) purpose; ++} ++#endif ++ + Engine::~Engine (void) + { + } +--- a/src/PYEngine.h ++++ b/src/PYEngine.h +@@ -37,13 +37,18 @@ + + class Engine { + public: +- Engine (IBusEngine *engine) : m_engine (engine) { } ++ Engine (IBusEngine *engine); + virtual ~Engine (void); + ++ gboolean contentIsPassword(); ++ + // virtual functions + virtual gboolean processKeyEvent (guint keyval, guint keycode, guint modifiers) = 0; + virtual void focusIn (void) = 0; +- virtual void focusOut (void) = 0; ++ virtual void focusOut (void); ++#if IBUS_CHECK_VERSION (1, 5, 4) ++ virtual void setContentType (guint purpose, guint hints); ++#endif + virtual void reset (void) = 0; + virtual void enable (void) = 0; + virtual void disable (void) = 0; +@@ -122,6 +127,11 @@ + + protected: + Pointer m_engine; // engine pointer ++ ++#if IBUS_CHECK_VERSION (1, 5, 4) ++ IBusInputPurpose m_input_purpose; ++#endif ++ + }; + + }; +--- a/src/PYPinyinEngine.cc ++++ b/src/PYPinyinEngine.cc +@@ -82,6 +82,9 @@ + { + gboolean retval = FALSE; + ++ if (contentIsPassword()) ++ return retval; ++ + /* check Shift + Release hotkey, + * and then ignore other Release key event */ + if (modifiers & IBUS_RELEASE_MASK) { +@@ -195,6 +198,8 @@ + void + PinyinEngine::focusOut (void) + { ++ Engine::focusOut (); ++ + reset (); + } + diff -Nru ibus-pinyin-1.5.0/debian/patches/lua52.diff ibus-pinyin-1.5.0/debian/patches/lua52.diff --- ibus-pinyin-1.5.0/debian/patches/lua52.diff 2014-09-20 12:54:25.000000000 +0000 +++ ibus-pinyin-1.5.0/debian/patches/lua52.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,20 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -116,7 +116,7 @@ - - # check lua - PKG_CHECK_MODULES(LUA, [ -- lua >= 5.1 -+ lua >= 5.2 - ], [], - [has_lua_extension=no] - ) -@@ -124,7 +124,7 @@ - if test x"$has_lua_extension" = x"no"; - then - PKG_CHECK_MODULES(LUA, [ -- lua5.1 -+ lua5.2 - ], [], - [enable_lua_extension=no] - ); diff -Nru ibus-pinyin-1.5.0/debian/patches/series ibus-pinyin-1.5.0/debian/patches/series --- ibus-pinyin-1.5.0/debian/patches/series 2014-09-20 12:54:46.000000000 +0000 +++ ibus-pinyin-1.5.0/debian/patches/series 2016-12-10 04:09:10.000000000 +0000 @@ -1,9 +1,13 @@ # Patch0: # Fixes lua 5.2 compile ibus-pinyin-fixes-lua-compile.patch + # Patch1: # Fri Nov 8 2013 Peng Wu - 1.5.0-5 # Fixes ibus: visible password entry flaw. (rhbz#1027029) (CVE-2013-4509) -ibus-pinyin-support-set-content-type-method.patch +# ibus-pinyin-support-set-content-type-method.patch +# Updated upstream patch: 97565d0 ("support setContentType method", 2014-02-19) +ibus-pinyin-support-setContentType-method.patch -lua52.diff +# PATCH ibus-pinyin-default-full.patch qzhao@suse.com -- set Fullpinyin beyond dconf database as default. +ibus-pinyin-default-full.patch diff -Nru ibus-pinyin-1.5.0/debian/rules ibus-pinyin-1.5.0/debian/rules --- ibus-pinyin-1.5.0/debian/rules 2014-06-04 13:07:05.000000000 +0000 +++ ibus-pinyin-1.5.0/debian/rules 2016-12-10 04:16:37.000000000 +0000 @@ -1,7 +1,7 @@ #!/usr/bin/make -f #DH_VERBOSE = 1 # see FEATURE AREAS in dpkg-buildflags(1) -#export DEB_BUILD_MAINT_OPTIONS = hardening=+all +export DEB_BUILD_MAINT_OPTIONS = hardening=+all # see ENVIRONMENT in dpkg-buildflags(1) # package maintainers to append CFLAGS export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic diff -Nru ibus-pinyin-1.5.0/debian/watch ibus-pinyin-1.5.0/debian/watch --- ibus-pinyin-1.5.0/debian/watch 2014-01-26 08:49:25.000000000 +0000 +++ ibus-pinyin-1.5.0/debian/watch 2016-12-10 04:16:37.000000000 +0000 @@ -1,3 +1,6 @@ version=3 -opts=downloadurlmangle=s#.*(ibus-pinyin-([\d.]+)\.tar\.gz).*#http://ibus.googlecode.com/files/$1#,filenamemangle=s#.*(ibus-pinyin-([\d.]+)\.tar\.gz).*#$1# \ - http://code.google.com/p/ibus/downloads/list ^.*detail\?name=ibus-pinyin-([\d.]+)\.tar\.gz.* +opts=filenamemangle=s#.*/archive/([\d.]+\.tar\.[gx]z)#ibus-pinyin-$1# \ +https://github.com/ibus/ibus-pinyin/releases \ +/ibus/ibus-pinyin/archive/([\d.]+)\.tar\.[gx]z debian uupdate +# +