diff -Nru ucimf-openvanilla-2.10.11/debian/changelog ucimf-openvanilla-2.10.11/debian/changelog --- ucimf-openvanilla-2.10.11/debian/changelog 2014-03-14 12:19:54.000000000 +0000 +++ ucimf-openvanilla-2.10.11/debian/changelog 2017-01-18 11:56:54.000000000 +0000 @@ -1,9 +1,14 @@ -ucimf-openvanilla (2.10.11-2ubuntu1) trusty; urgency=low +ucimf-openvanilla (2.10.11-3) unstable; urgency=medium - * Use autoreconf helper for newer arches to correctly - build shared libs. + * Bump Standards-Version to 3.9.8. + * Bump compat to 10. + * Fix GCC-6 compiling error. + * Add ChangZhuo Chen as Uploaders. + * Update Homepage to GitHub. + * Add Vcs-* fields. + * Use copyright format 1.0. - -- Daniel T Chen Fri, 14 Mar 2014 08:19:33 -0400 + -- ChangZhuo Chen (陳昌倬) Wed, 18 Jan 2017 19:56:54 +0800 ucimf-openvanilla (2.10.11-2) unstable; urgency=low diff -Nru ucimf-openvanilla-2.10.11/debian/compat ucimf-openvanilla-2.10.11/debian/compat --- ucimf-openvanilla-2.10.11/debian/compat 2010-05-26 12:30:42.000000000 +0000 +++ ucimf-openvanilla-2.10.11/debian/compat 2017-01-18 02:34:45.000000000 +0000 @@ -1 +1 @@ -7 +10 diff -Nru ucimf-openvanilla-2.10.11/debian/control ucimf-openvanilla-2.10.11/debian/control --- ucimf-openvanilla-2.10.11/debian/control 2014-03-14 12:19:24.000000000 +0000 +++ ucimf-openvanilla-2.10.11/debian/control 2017-01-18 11:46:25.000000000 +0000 @@ -1,16 +1,25 @@ Source: ucimf-openvanilla Section: utils Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: IME Packaging Team -Uploaders: Aron Xu -Build-Depends: debhelper (>= 7.0.50~), autotools-dev, libltdl-dev, libucimf-dev, openvanilla-imgeneric, dh-autoreconf -Standards-Version: 3.9.2 -Homepage: http://code.google.com/p/ucimf +Maintainer: IME Packaging Team +Uploaders: Aron Xu , + ChangZhuo Chen (陳昌倬) +Build-Depends: debhelper (>= 10), + autotools-dev, + libltdl-dev, + libucimf-dev, + openvanilla-imgeneric, +Standards-Version: 3.9.8 +Homepage: https://github.com/matlinuxer2/ucimf +Vcs-Browser: https://anonscm.debian.org/git/pkg-ime/ucimf-openvanilla.git +Vcs-Git: https://anonscm.debian.org/git/pkg-ime/ucimf-openvanilla.git Package: ucimf-openvanilla Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, ucimf, openvanilla-imgeneric +Depends: ${shlibs:Depends}, + ${misc:Depends}, + ucimf, + openvanilla-imgeneric Suggests: openvanilla-imgeneric-data-all | openvanilla-imgeneric-data-zh-tw | openvanilla-imgeneric-data-zh-cn | openvanilla-imgeneric-data-zh-hk | openvanilla-imgeneric-data-ja | openvanilla-imgeneric-data-ko | openvanilla-imgeneric-data-th | openvanilla-imgeneric-data-vi Description: openvanilla input method collection for ucimf This package contains a collection of openvanilla input method diff -Nru ucimf-openvanilla-2.10.11/debian/copyright ucimf-openvanilla-2.10.11/debian/copyright --- ucimf-openvanilla-2.10.11/debian/copyright 2010-07-11 03:45:54.000000000 +0000 +++ ucimf-openvanilla-2.10.11/debian/copyright 2017-01-18 11:52:47.000000000 +0000 @@ -1,92 +1,59 @@ -Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135 -Name: ucimf-openvanilla -Maintainer: Chun-Yu Lee (Mat) -Source: http://code.google.com/p/openvanilla +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: libchewing +Upstream-Contact: Chun-Yu Lee (Mat) +Source: https://github.com/matlinuxer2/ucimf -Copyright: 2006-2010, The OpenVanilla Project +Files: * +Copyright: 2006, Chun-Yu Lee (Mat) +License: GPL-2+ - ( from: http://openvanilla.googlecode.com/svn/trunk/License/LICENSE.txt ) - The OpenVanilla Architecture: Framework, Loaders and Modules - - Copyright (c) 2004-2009 The OpenVanilla Project (http://openvanilla.org) - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions - are met: - - 1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - 3. Neither the name of OpenVanilla nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. +Files: include/OpenVanilla/*.h +Copyright: (c) 2004-2010 The OpenVanilla Project +License: BSD-3-clause Files: debian/* Copyright: 2010, Aron Xu + 2017, ChangZhuo Chen (陳昌倬) License: GPL-2+ -Files: src/*.cpp, src/*.h -Copyright: 2006, Chun-Yu Lee (Mat) License: GPL-2+ - This package is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public License - version 2 or any higher version as published by the Free Software - Foundation. - - This package is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this package; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, - Boston, MA 02110-1301 USA - -On Debian systems, the complete text of the GNU General Public -License version 2 can be found in `/usr/share/common-licenses/GPL-2'. - -Files: include/OpenVanilla/*.h -Copyright: 2004-2007, The OpenVanilla Project (http://openvanilla.org) -License: - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions - are met: - - 1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - 3. Neither the name of OpenVanilla nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - - + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + . + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + On Debian systems, the complete text of the GNU General + Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". + +License: BSD-3-clause + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + . + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + . + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + . + 3. Neither the name of the University nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + . + THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + SUCH DAMAGE. diff -Nru ucimf-openvanilla-2.10.11/debian/patches/fix-GCC-6.patch ucimf-openvanilla-2.10.11/debian/patches/fix-GCC-6.patch --- ucimf-openvanilla-2.10.11/debian/patches/fix-GCC-6.patch 1970-01-01 00:00:00.000000000 +0000 +++ ucimf-openvanilla-2.10.11/debian/patches/fix-GCC-6.patch 2017-01-18 10:55:25.000000000 +0000 @@ -0,0 +1,19 @@ +--- a/src/debug.h ++++ b/src/debug.h +@@ -3,10 +3,10 @@ + #endif + #include + +-#define UCIMF_ERR(format...) {extern int LogFd; if( LogFd >=0 ){ dprintf( LogFd, "[Err]:"format );} } +-#define UCIMF_WARNING(format...) {extern int LogFd; if( LogFd >=0 ){ dprintf( LogFd, "[WARN]:"format );} } +-#define UCIMF_INFO(format...) {extern int LogFd; if( LogFd >=0 ){ dprintf( LogFd, "[INFO]:"format );} } +-#define UCIMF_DEBUG(format...) {extern int LogFd; if( LogFd >=0 ){ dprintf( LogFd, "[DEBUG]:"format);} } ++#define UCIMF_ERR(format, ...) {extern int LogFd; if( LogFd >=0 ){ dprintf( LogFd, "[Err]:" #format, ##__VA_ARGS__ );} } ++#define UCIMF_WARNING(format, ...) {extern int LogFd; if( LogFd >=0 ){ dprintf( LogFd, "[WARN]:" #format, ##__VA_ARGS__ );} } ++#define UCIMF_INFO(format, ...) {extern int LogFd; if( LogFd >=0 ){ dprintf( LogFd, "[INFO]:" #format, ##__VA_ARGS__ );} } ++#define UCIMF_DEBUG(format, ...) {extern int LogFd; if( LogFd >=0 ){ dprintf( LogFd, "[DEBUG]:" #format, ##__VA_ARGS__);} } + +-#define UrINFO(format...) UCIMF_INFO(format) +-#define UrDEBUG(format...) UCIMF_DEBUG(format) ++#define UrINFO(format, ...) UCIMF_INFO(#format, ##__VA_ARGS__) ++#define UrDEBUG(format, ...) UCIMF_DEBUG(#format, ##__VA_ARGS__) diff -Nru ucimf-openvanilla-2.10.11/debian/patches/series ucimf-openvanilla-2.10.11/debian/patches/series --- ucimf-openvanilla-2.10.11/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ ucimf-openvanilla-2.10.11/debian/patches/series 2017-01-18 10:52:28.000000000 +0000 @@ -0,0 +1 @@ +fix-GCC-6.patch diff -Nru ucimf-openvanilla-2.10.11/debian/rules ucimf-openvanilla-2.10.11/debian/rules --- ucimf-openvanilla-2.10.11/debian/rules 2014-03-14 12:19:32.000000000 +0000 +++ ucimf-openvanilla-2.10.11/debian/rules 2017-01-18 11:05:11.000000000 +0000 @@ -1,8 +1,18 @@ #!/usr/bin/make -f -LDFLAGS += -Wl,--as-needed +#DH_VERBOSE = 1 + +DPKG_EXPORT_BUILDFLAGS = 1 +include /usr/share/dpkg/default.mk + +export V=1 +export DEB_BUILD_MAINT_LDFLAGS = -Wl,--as-needed +export DEB_BUILD_MAINT_OPTIONS = hardening=+all + %: - dh $@ --with autoreconf + dh $@ + override_dh_makeshlibs: + override_dh_auto_install: dh_auto_install find . -name *.la -type f -exec rm -f {} \;