diff -Nru mozc-2.17.2116.102+gitfd0f5b34+dfsg/debian/apparmor/mozc_server mozc-2.17.2116.102+gitfd0f5b34+dfsg/debian/apparmor/mozc_server --- mozc-2.17.2116.102+gitfd0f5b34+dfsg/debian/apparmor/mozc_server 1970-01-01 09:00:00.000000000 +0900 +++ mozc-2.17.2116.102+gitfd0f5b34+dfsg/debian/apparmor/mozc_server 2016-03-18 03:26:49.000000000 +0900 @@ -0,0 +1,7 @@ +# vim:syntax=apparmor +# Profile abstraction for allowing mozc to run in including guest session +# Author: Aron Xu + +# Requires apparmor 2.9 + + unix (bind, listen) type=stream addr="@tmp/.mozc.*", diff -Nru mozc-2.17.2116.102+gitfd0f5b34+dfsg/debian/changelog mozc-2.17.2116.102+gitfd0f5b34+dfsg/debian/changelog --- mozc-2.17.2116.102+gitfd0f5b34+dfsg/debian/changelog 2015-09-23 05:38:21.000000000 +0900 +++ mozc-2.17.2116.102+gitfd0f5b34+dfsg/debian/changelog 2016-03-20 19:29:49.000000000 +0900 @@ -1,3 +1,19 @@ +mozc (2.17.2116.102+gitfd0f5b34+dfsg-1ubuntu1) xenial; urgency=low + + [ Ikuya Awashiro ] + * Merge from Debian unstable. (LP: #1547816) Remaining changes: + - Drop uim support for main inclusion + - Do not generate shlibs for fcitx + - Add apparmor configuration. + + [ Mitsuya Shibata ] + * Drop "Run testcases." by new upstream sources changes. + Upstream drops the code of test frameworks from source archive. We need to + exec git-submodule to run testcases. Therefore drop "run testcases" as + same as Debian. + + -- Mitsuya Shibata Sun, 20 Mar 2016 19:29:14 +0900 + mozc (2.17.2116.102+gitfd0f5b34+dfsg-1) unstable; urgency=medium * New upstream release. @@ -7,6 +23,27 @@ -- Nobuhiro Iwamatsu Sat, 12 Sep 2015 13:59:18 +0900 +mozc (1.15.1857.102-1ubuntu3) xenial; urgency=medium + + * Add apparmor configuration. + + -- Aron Xu Fri, 18 Mar 2016 02:31:12 +0800 + +mozc (1.15.1857.102-1ubuntu2) wily; urgency=medium + + * Run testcases. + + -- Aron Xu Wed, 09 Sep 2015 19:10:29 +0800 + +mozc (1.15.1857.102-1ubuntu1) wily; urgency=medium + + * Drop uim support for main inclusion + * Allow parallel building + * Remove useless build dependency libssl-dev + * Do not generate shlibs for fcitx + + -- Aron Xu Sun, 16 Aug 2015 23:01:48 +0800 + mozc (1.15.1857.102-1) unstable; urgency=medium * New upstream release. @@ -374,7 +411,7 @@ - Add patch UI of tegaki I/F for mozc-scim -- Nobuhiro Iwamatsu Sat, 23 Apr 2011 04:14:54 +0900 - + mozc (1.1.626.102-2) unstable; urgency=low * Fix invalid syntax in startup file for emacs-mozc (Closes: #619512). @@ -488,3 +525,4 @@ * Initial release (Closes: #581158) -- Nobuhiro Iwamatsu Wed, 12 May 2010 05:34:49 +0900 + diff -Nru mozc-2.17.2116.102+gitfd0f5b34+dfsg/debian/control mozc-2.17.2116.102+gitfd0f5b34+dfsg/debian/control --- mozc-2.17.2116.102+gitfd0f5b34+dfsg/debian/control 2015-09-23 05:38:21.000000000 +0900 +++ mozc-2.17.2116.102+gitfd0f5b34+dfsg/debian/control 2016-03-20 19:58:15.000000000 +0900 @@ -1,12 +1,13 @@ Source: mozc Section: utils Priority: optional -Maintainer: Nobuhiro Iwamatsu +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Nobuhiro Iwamatsu Build-Depends: debhelper (>= 9), libibus-1.0-dev (>= 1.4.1) | libibus-dev (>= 1.4.1), pkg-config, libxcb-xfixes0-dev, libgtk2.0-dev, python-dev, gyp (>= 0.1~svn1729-2), protobuf-compiler, - libprotobuf-dev (>= 2.5.0-9), libqt4-dev, libuim-dev, + libprotobuf-dev (>= 2.5.0-9), libqt4-dev, libzinnia-dev, fcitx-libs-dev, gettext, desktop-file-utils, ninja-build Standards-Version: 3.9.6 @@ -43,25 +44,6 @@ . This open-source project originates from Google Japanese Input. -Package: uim-mozc -Architecture: i386 amd64 armel armhf -Depends: ${misc:Depends}, ${shlibs:Depends}, uim-utils (>= 1:1.8.1-2), - mozc-data, mozc-server (= ${binary:Version}) -Recommends: mozc-utils-gui (= ${binary:Version}) -Multi-Arch: same -Description: Mozc engine for uim - Client of the Mozc input method - uim is an input method module library supporting various languages, which - become a frontend for Anthy, SKK, Canna, T-Code, TUT-Code, - Pinyin (Chinese input method), Hangul (Korean input method), - IPA (International Phonetic Alphabet), etc. - Most of the functions are implemented with Scheme, so it's very simple - and flexible. - . - Mozc is a Japanese Input Method Editor (IME) designed for multi-platform - such as Chromium OS, Windows, Mac and Linux. - . - uim-mozc provides client part of the Mozc input method. - Package: fcitx-mozc Architecture: i386 amd64 armel armhf Depends: ${misc:Depends}, ${shlibs:Depends}, fcitx-bin, fcitx-data, fcitx-modules, diff -Nru mozc-2.17.2116.102+gitfd0f5b34+dfsg/debian/mozc-server.install mozc-2.17.2116.102+gitfd0f5b34+dfsg/debian/mozc-server.install --- mozc-2.17.2116.102+gitfd0f5b34+dfsg/debian/mozc-server.install 2015-09-23 05:38:21.000000000 +0900 +++ mozc-2.17.2116.102+gitfd0f5b34+dfsg/debian/mozc-server.install 2016-03-20 18:44:24.000000000 +0900 @@ -1,2 +1,3 @@ src/out_linux/Release/mozc_server usr/lib/mozc/ #out_linux/Release/mozc_renderer usr/lib/mozc/ +debian/apparmor/mozc_server etc/apparmor.d/abstractions/ diff -Nru mozc-2.17.2116.102+gitfd0f5b34+dfsg/debian/patches/series mozc-2.17.2116.102+gitfd0f5b34+dfsg/debian/patches/series --- mozc-2.17.2116.102+gitfd0f5b34+dfsg/debian/patches/series 2015-09-23 05:38:21.000000000 +0900 +++ mozc-2.17.2116.102+gitfd0f5b34+dfsg/debian/patches/series 2016-03-18 06:09:45.000000000 +0900 @@ -1,4 +1,4 @@ -uim-mozc.patch +#uim-mozc.patch fcitx-mozc.patch gcc.patch usage_dict.txt.patch diff -Nru mozc-2.17.2116.102+gitfd0f5b34+dfsg/debian/rules mozc-2.17.2116.102+gitfd0f5b34+dfsg/debian/rules --- mozc-2.17.2116.102+gitfd0f5b34+dfsg/debian/rules 2015-09-23 05:38:21.000000000 +0900 +++ mozc-2.17.2116.102+gitfd0f5b34+dfsg/debian/rules 2016-03-20 22:07:46.000000000 +0900 @@ -19,7 +19,6 @@ BUILD_DIR=./out_linux TARGETS=unix/ibus/ibus.gyp:ibus_mozc \ unix/emacs/emacs.gyp:mozc_emacs_helper \ - unix/uim/uim.gyp:uim-mozc \ unix/fcitx/fcitx.gyp:fcitx-mozc \ server/server.gyp:mozc_server gui/gui.gyp:mozc_tool \ renderer/renderer.gyp:mozc_renderer @@ -84,8 +83,8 @@ $(CURDIR)/debian/ibus-mozc/usr/share/ibus/component/mozc.xml # uim-mozc - install -D -m 0755 src/$(BUILD_DIR)/Release/libuim-mozc.so \ - $(CURDIR)/debian/uim-mozc/usr/lib/$(DEB_BUILD_MULTIARCH)/uim/plugin/libuim-mozc.so + #install -D -m 0755 src/$(BUILD_DIR)/Release/libuim-mozc.so \ + # $(CURDIR)/debian/uim-mozc/usr/lib/$(DEB_BUILD_MULTIARCH)/uim/plugin/libuim-mozc.so # fcitx-mozc install -D -m 0755 src/$(BUILD_DIR)/Release/fcitx-mozc.so \ @@ -111,6 +110,9 @@ chmod -x debian/mozc-data/usr/share/icons/mozc/*.png dh_fixperms +override_dh_makeshlibs: + dh_makeshlibs -Xfcitx + .PHONY: override_dh_installemacsen override_dh_installemacsen: dh_installemacsen --priority=50