diff -Nru ibus-libpinyin-1.11.1/debian/changelog ibus-libpinyin-1.11.1/debian/changelog --- ibus-libpinyin-1.11.1/debian/changelog 2019-12-07 18:43:43.000000000 -0500 +++ ibus-libpinyin-1.11.1/debian/changelog 2020-03-27 12:04:22.000000000 -0400 @@ -1,3 +1,14 @@ +ibus-libpinyin (1.11.1-2) unstable; urgency=high + + * Team upload. + * Prepare for Ubuntu 20.04 LTS release. + * debian/patches: + + Cherry-pick upstream patches on using Python 3.2+. + + Cherry-pick upstream patches to fix generation of .desktop + files. + + -- Boyuan Yang Fri, 27 Mar 2020 12:04:22 -0400 + ibus-libpinyin (1.11.1-1) unstable; urgency=medium * Team upload. diff -Nru ibus-libpinyin-1.11.1/debian/patches/0002-Use-Python-3.2.patch ibus-libpinyin-1.11.1/debian/patches/0002-Use-Python-3.2.patch --- ibus-libpinyin-1.11.1/debian/patches/0002-Use-Python-3.2.patch 1969-12-31 19:00:00.000000000 -0500 +++ ibus-libpinyin-1.11.1/debian/patches/0002-Use-Python-3.2.patch 2020-03-27 12:02:19.000000000 -0400 @@ -0,0 +1,21 @@ +From: Peng Wu +Date: Tue, 3 Dec 2019 14:07:17 +0800 +Subject: Use Python 3.2 + +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index a7b0a67..cf2c716 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -94,7 +94,7 @@ AC_ARG_WITH(python, + [Select python2 or python3]), + [PYTHON=$with_python], [] + ) +-AM_PATH_PYTHON([2.5]) ++AM_PATH_PYTHON([3.2]) + + # check icon_prop_key in IBus.EngineDesc + AC_MSG_CHECKING([if IBus.EngineDesc has get_icon_prop_key]) diff -Nru ibus-libpinyin-1.11.1/debian/patches/0003-fixes-desktop-file-for-ibus-libpinyin-setup-dialog.patch ibus-libpinyin-1.11.1/debian/patches/0003-fixes-desktop-file-for-ibus-libpinyin-setup-dialog.patch --- ibus-libpinyin-1.11.1/debian/patches/0003-fixes-desktop-file-for-ibus-libpinyin-setup-dialog.patch 1969-12-31 19:00:00.000000000 -0500 +++ ibus-libpinyin-1.11.1/debian/patches/0003-fixes-desktop-file-for-ibus-libpinyin-setup-dialog.patch 2020-03-27 12:02:19.000000000 -0400 @@ -0,0 +1,26 @@ +From: Peng Wu +Date: Tue, 3 Dec 2019 14:23:02 +0800 +Subject: fixes desktop file for ibus-libpinyin setup dialog + +--- + data/Makefile.am | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/data/Makefile.am b/data/Makefile.am +index 169620c..53313dd 100644 +--- a/data/Makefile.am ++++ b/data/Makefile.am +@@ -66,9 +66,10 @@ desktop_in_files = \ + desktop_files = $(desktop_in_files:.desktop.in=.desktop) + + $(desktop_files): $(desktop_in_files) Makefile +- $(AM_V_GEN)$(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@ +- sed -i -e 's|@libexecdir[@]|$(libexecdir)|g' \ +- -e 's|@pkgdatadir[@]|$(pkgdatadir)|g' $@ ++ $(AM_V_GEN)$(MSGFMT) --desktop --template $@.in -d $(top_srcdir)/po -o $@.tmp ++ sed -e 's|@libexecdir[@]|$(libexecdir)|g' \ ++ -e 's|@pkgdatadir[@]|$(pkgdatadir)|g' $@.tmp > $@ ++ rm $@.tmp + + desktopdir=$(datadir)/applications + desktop_DATA = $(desktop_files) diff -Nru ibus-libpinyin-1.11.1/debian/patches/series ibus-libpinyin-1.11.1/debian/patches/series --- ibus-libpinyin-1.11.1/debian/patches/series 2019-12-07 18:12:37.000000000 -0500 +++ ibus-libpinyin-1.11.1/debian/patches/series 2020-03-27 12:02:19.000000000 -0400 @@ -1 +1,3 @@ 0002-fixes-lua-5.2-compile.patch +0002-Use-Python-3.2.patch +0003-fixes-desktop-file-for-ibus-libpinyin-setup-dialog.patch