diff -Nru unicon-3.0.4+dfsg1/debian/changelog unicon-3.0.4+dfsg1/debian/changelog --- unicon-3.0.4+dfsg1/debian/changelog 2021-01-13 23:57:13.000000000 +0000 +++ unicon-3.0.4+dfsg1/debian/changelog 2021-12-01 08:52:05.000000000 +0000 @@ -1,3 +1,18 @@ +unicon (3.0.4+dfsg1-4) unstable; urgency=medium + + [ NIIBE Yutaka ] + * debian/control (Build-Depends): Remove libpth-dev, actually not used at all. + * debian/patches/005-fix-no-pth.patch: New. + * debian/unicon-imc2.symbols: Update. + + [ xiao sheng wen(肖盛文) ] + * Bump Standards-Version: 4.6.0 + * d/copyright: update debian dir year info + * d/patches: add some files for blhc check + add @LDFLAGS@ @CPPFLAGS@ in Makefile.in + + -- xiao sheng wen Wed, 01 Dec 2021 16:52:05 +0800 + unicon (3.0.4+dfsg1-3) unstable; urgency=medium * Team upload. diff -Nru unicon-3.0.4+dfsg1/debian/control unicon-3.0.4+dfsg1/debian/control --- unicon-3.0.4+dfsg1/debian/control 2021-01-13 23:57:13.000000000 +0000 +++ unicon-3.0.4+dfsg1/debian/control 2021-11-29 15:02:54.000000000 +0000 @@ -1,14 +1,13 @@ Source: unicon Section: utils Build-Depends: debhelper-compat (= 13), - libpth-dev, x11proto-core-dev, libx11-dev, pkg-kde-tools, Priority: optional Maintainer: Debian Chinese Team Uploaders: xiao sheng wen , -Standards-Version: 4.5.1 +Standards-Version: 4.6.0 Rules-Requires-Root: binary-targets Vcs-Browser: https://salsa.debian.org/chinese-team/unicon Vcs-Git: https://salsa.debian.org/chinese-team/unicon.git diff -Nru unicon-3.0.4+dfsg1/debian/copyright unicon-3.0.4+dfsg1/debian/copyright --- unicon-3.0.4+dfsg1/debian/copyright 2021-01-13 23:49:30.000000000 +0000 +++ unicon-3.0.4+dfsg1/debian/copyright 2021-11-29 15:03:46.000000000 +0000 @@ -18,7 +18,7 @@ Files: debian/* Copyright: 2000 - 2009 Yu Guanghui 2014 - 2016 Debian QA team - 2020 xiao sheng wen + 2020 - 2021 xiao sheng wen License: GPL-2+ License: GPL-2 diff -Nru unicon-3.0.4+dfsg1/debian/patches/005-fix-no-pth.patch unicon-3.0.4+dfsg1/debian/patches/005-fix-no-pth.patch --- unicon-3.0.4+dfsg1/debian/patches/005-fix-no-pth.patch 1970-01-01 00:00:00.000000000 +0000 +++ unicon-3.0.4+dfsg1/debian/patches/005-fix-no-pth.patch 2021-12-01 03:05:39.000000000 +0000 @@ -0,0 +1,70 @@ +Description: Remove dependency to libpth-dev + which is actually not used at all. +Origin: vendor, https://salsa.debian.org/chinese-team/unicon/-/merge_requests/1 +Forwarded: not-needed +Author: NIIBE Yutaka + +Index: unicon/unicon/server/Makefile.in +=================================================================== +--- unicon.orig/unicon/server/Makefile.in ++++ unicon/unicon/server/Makefile.in +@@ -7,7 +7,7 @@ APP_OBJS = TLS_HzInput.o TLS_ImmOp.o TLS + TLS_PthSocket.o TLS_Debug.o \ + TLS_DoubleByteConvertor.o TLS_AsciiConvertor.o + +-DLIB_OBJS = TLS_HzInput.o TLS_ImmOp.o TLS_MemFile.o TLS_PthSocket.o \ ++DLIB_OBJS = TLS_HzInput.o TLS_ImmOp.o TLS_MemFile.o \ + TLS_Debug.o TLS_LibMain.o TLS_DoubleByteConvertor.o \ + TLS_AsciiConvertor.o + +Index: unicon/unicon/server/TLS_LibMain.cpp +=================================================================== +--- unicon.orig/unicon/server/TLS_LibMain.cpp ++++ unicon/unicon/server/TLS_LibMain.cpp +@@ -29,20 +29,15 @@ + #include + #include + #include +-#include +-#include +-#include + #include + #include + #include + #include +-#include + + #include + #include + #include + #include +-#include + #include + + TLS_CImmOp *pMyCImmOp = NULL; +Index: unicon/unicon/client/Makefile.in +=================================================================== +--- unicon.orig/unicon/client/Makefile.in ++++ unicon/unicon/client/Makefile.in +@@ -31,7 +31,7 @@ TLC_SocketClient.o: TLC_SocketClient.cpp + gcc $(CFLAGS) -c TLC_SocketClient.cpp -o TLC_SocketClient.o + + test: all $(SERVER_LIB) +- g++ $(CFLAGS) -D__DLL_SUPPORT__ -ldl -lpth test.cpp $(PROG_LIB) $(SERVER_LIB) -o test ++ g++ $(CFLAGS) -D__DLL_SUPPORT__ -ldl test.cpp $(PROG_LIB) $(SERVER_LIB) -o test + + install: all + # mkdir -p $(prefix)/lib +Index: unicon/unicon/unicon/Makefile.in +=================================================================== +--- unicon.orig/unicon/unicon/Makefile.in ++++ unicon/unicon/unicon/Makefile.in +@@ -4,7 +4,7 @@ PROG = unicon + OBJS = ImmHzInput.o AImmHzInput.o Main.o UniKey.o \ + MyInputArea.o SysConfig.o MyConfig.o ConfigManager.o + S_IMM_LIB = ../client/libimmclient.a +-D_IMM_LIB = ../client/libimmclient.a -lpth -ldl -L../server -Wl,-rpath=$(prefix)/lib/unicon -limm_server ++D_IMM_LIB = ../client/libimmclient.a -ldl -L../server -Wl,-rpath=$(prefix)/lib/unicon -limm_server + + # CFLAGS = -g -Wall -I. -DSIMULATE_OS_KEY -DSIMULATE_OS_VIDEO + # __CLIB24_SUPPORT__ diff -Nru unicon-3.0.4+dfsg1/debian/patches/006-server-Makefile.in-add-FLAGS.patch unicon-3.0.4+dfsg1/debian/patches/006-server-Makefile.in-add-FLAGS.patch --- unicon-3.0.4+dfsg1/debian/patches/006-server-Makefile.in-add-FLAGS.patch 1970-01-01 00:00:00.000000000 +0000 +++ unicon-3.0.4+dfsg1/debian/patches/006-server-Makefile.in-add-FLAGS.patch 2021-12-01 02:40:39.000000000 +0000 @@ -0,0 +1,29 @@ +Description: add @LDFLAGS@ @CPPFLAGS@ +Forwarded: not-needed +Author: xiao sheng wen + +--- +Last-Update: 2021-12-01 + +--- unicon-3.0.4+dfsg1.orig/unicon/server/Makefile.in ++++ unicon-3.0.4+dfsg1/unicon/server/Makefile.in +@@ -1,5 +1,7 @@ + prefix=@prefix@ + CFLAGS = @CFLAGS@ ++LDFLAGS = @LDFLAGS@ ++CPPFLAGS = @CPPFLAGS@ + APP_PROG = imm_server + DLIB_PROG = libimm_server.so.0.0 + +@@ -11,10 +13,7 @@ DLIB_OBJS = TLS_HzInput.o TLS_ImmOp.o TL + TLS_Debug.o TLS_LibMain.o TLS_DoubleByteConvertor.o \ + TLS_AsciiConvertor.o + +-LIBS = /usr/lib/libpth.so -ldl +- +-# CFLAGS = -g -D__IMM_DEBUG__ -Wall -I. -I/usr/include -I../include +-CFLAGS = -fPIC -g -Wall -I. -I../include ++CFLAGS = -fPIC -g -Wall -I. -I../include @CFLAGS@ @CPPFLAGS@ + CC=g++ + + all: $(DLIB_PROG) diff -Nru unicon-3.0.4+dfsg1/debian/patches/007-ImmModules-cce-Makefile.in-add-FLAGS.patch unicon-3.0.4+dfsg1/debian/patches/007-ImmModules-cce-Makefile.in-add-FLAGS.patch --- unicon-3.0.4+dfsg1/debian/patches/007-ImmModules-cce-Makefile.in-add-FLAGS.patch 1970-01-01 00:00:00.000000000 +0000 +++ unicon-3.0.4+dfsg1/debian/patches/007-ImmModules-cce-Makefile.in-add-FLAGS.patch 2021-11-30 16:17:37.000000000 +0000 @@ -0,0 +1,25 @@ +Description: add @LDFLAGS@ @CPPFLAGS@ +Author: xiao sheng wen +Forwarded: not-needed + +--- +Last-Update: 2021-11-30 + +--- unicon-3.0.4+dfsg1.orig/unicon/ImmModules/cce/Makefile.in ++++ unicon-3.0.4+dfsg1/unicon/ImmModules/cce/Makefile.in +@@ -1,12 +1,14 @@ + # $Id$ + prefix=@prefix@ + CFLAGS = @CFLAGS@ ++LDFLAGS = @LDFLAGS@ ++CPPFLAGS = @CPPFLAGS@ + CFLAGS += -I. + PROG = cce_hzinput.so cce_pinyin.so gb18030_intcode.so + CCE_OBJS = xl_hzinput.o CCE_hzinput.o intcode.o \ + xl_pinyin.o CCE_pinyin.o + +-CFLAGS = -fPIC -g -O2 -fomit-frame-pointer -W -Wall -I. -I../../include ++CFLAGS = -fPIC -g -O2 -fomit-frame-pointer -W -Wall -I. -I../../include @CFLAGS@ @CPPFLAGS@ + + all: cce_hzinput.so cce_pinyin.so gb18030_intcode.so + diff -Nru unicon-3.0.4+dfsg1/debian/patches/008-ImmModules-turbo-Makefile.in-add-FLAGS.patch unicon-3.0.4+dfsg1/debian/patches/008-ImmModules-turbo-Makefile.in-add-FLAGS.patch --- unicon-3.0.4+dfsg1/debian/patches/008-ImmModules-turbo-Makefile.in-add-FLAGS.patch 1970-01-01 00:00:00.000000000 +0000 +++ unicon-3.0.4+dfsg1/debian/patches/008-ImmModules-turbo-Makefile.in-add-FLAGS.patch 2021-12-01 08:52:05.000000000 +0000 @@ -0,0 +1,44 @@ +Description: add @LDFLAGS@ @CPPFLAGS@ +Forwarded: not-needed +Author: xiao sheng wen + +--- +Last-Update: 2021-12-01 + +--- unicon-3.0.4+dfsg1.orig/unicon/ImmModules/turbo/Makefile.in ++++ unicon-3.0.4+dfsg1/unicon/ImmModules/turbo/Makefile.in +@@ -1,11 +1,11 @@ + prefix=@prefix@ + CFLAGS=@CFLAGS@ +-# CFLAGS += -V2.7.2.3 -I. +-CFLAGS += -I. -O2 ++LDFLAGS = @LDFLAGS@ ++CPPFLAGS = @CPPFLAGS@ + PROG = TL_hzinput.so + TL_OBJS = xl_hzinput.o TL_hzinput.o xl_phrase.o xl_sysphrase.o xl_mfile.o + +-CFLAGS = -fPIC -g -Wall -I../../include -I. ++CFLAGS = -fPIC -g -Wall -I../../include -I. @CFLAGS@ @CPPFLAGS@ + + all:dlib + dlib: $(PROG) +@@ -51,14 +51,14 @@ big5data: cin2tab + ./cin2tab -c xcin-25/simplex -o tl_sysphrase.big5.bin + + cin2tab : cin2tab.c $(TL_OBJS) +- gcc -c -g -I../../include -I. cin2tab.c -o cin2tab.o +- gcc $(TL_OBJS) cin2tab.o -o cin2tab ++ gcc $(CFLAGS) -c -g -I../../include -I. cin2tab.c -o cin2tab.o ++ gcc $(TL_OBJS) cin2tab.o -o cin2tab $(LDFLAGS) + + addphrase : addphrase.c $(TL_OBJS) +- gcc -g -c -I. -I../../include addphrase.c -o addphrase.o +- gcc $(TL_OBJS) addphrase.o -o addphrase ++ gcc $(CFLAGS) -g -c -I. -I../../include addphrase.c -o addphrase.o ++ gcc $(TL_OBJS) addphrase.o -o addphrase $(LDFLAGS) + levelphrase : levelphrase.c +- gcc -g -I../../include -I. levelphrase.c -o levelphrase ++ gcc $(CFLAGS) -g -I../../include -I. levelphrase.c -o levelphrase $(LDFLAGS) + install: all + mkdir -p $(prefix)/lib/unicon/modules/turbo + cp -f *.so $(prefix)/lib/unicon/modules/turbo diff -Nru unicon-3.0.4+dfsg1/debian/patches/009-ImmModules-cce-inputs-Makefile.in-add-FLAGS.patch unicon-3.0.4+dfsg1/debian/patches/009-ImmModules-cce-inputs-Makefile.in-add-FLAGS.patch --- unicon-3.0.4+dfsg1/debian/patches/009-ImmModules-cce-inputs-Makefile.in-add-FLAGS.patch 1970-01-01 00:00:00.000000000 +0000 +++ unicon-3.0.4+dfsg1/debian/patches/009-ImmModules-cce-inputs-Makefile.in-add-FLAGS.patch 2021-12-01 02:21:52.000000000 +0000 @@ -0,0 +1,21 @@ +Description: add @LDFLAGS@ @CPPFLAGS@ +Forwarded: not-needed +Author: xiao sheng wen + +--- +Last-Update: 2021-12-01 + +--- unicon-3.0.4+dfsg1.orig/unicon/ImmModules/cce/inputs/Makefile.in ++++ unicon-3.0.4+dfsg1/unicon/ImmModules/cce/inputs/Makefile.in +@@ -1,8 +1,10 @@ + # $Id$ + prefix=@prefix@ + CFLAGS = @CFLAGS@ ++LDFLAGS = @LDFLAGS@ ++CPPFLAGS = @CPPFLAGS@ + +-CFLAGS += -O2 -I. -I.. ++CFLAGS += -O2 -I. -I.. @CPPFLAGS@ + + LIBDIR = $(prefix)/lib/unicon + LD = gcc $(CFLAGS) $(LDFLAGS) diff -Nru unicon-3.0.4+dfsg1/debian/patches/client-Makefile.in-add-FLAGS.patch unicon-3.0.4+dfsg1/debian/patches/client-Makefile.in-add-FLAGS.patch --- unicon-3.0.4+dfsg1/debian/patches/client-Makefile.in-add-FLAGS.patch 1970-01-01 00:00:00.000000000 +0000 +++ unicon-3.0.4+dfsg1/debian/patches/client-Makefile.in-add-FLAGS.patch 2021-12-01 08:52:05.000000000 +0000 @@ -0,0 +1,26 @@ +Description: add @LDFLAGS@ @CPPFLAGS@ +Forwarded: not-needed +Author: xiao sheng wen + +--- +Last-Update: 2021-12-01 +--- unicon-3.0.4+dfsg1.orig/unicon/client/Makefile.in ++++ unicon-3.0.4+dfsg1/unicon/client/Makefile.in +@@ -1,5 +1,7 @@ + prefix=@prefix@ + CFLAGS = @CFLAGS@ ++LDFLAGS = @LDFLAGS@ ++CPPFLAGS = @CPPFLAGS@ + CFLAGS += -I. + PROG_LIB = libimmclient.a + SLIB_OBJS = TLC_TcpipImmClient.o TLC_ImmServer.o TLC_Utils.o \ +@@ -7,8 +9,7 @@ SLIB_OBJS = TLC_TcpipImmClient.o TLC_Imm + DLIB_OBJS = TLC_LibImmClient.o TLC_Utils.o + SERVER_LIB=../server/libimm_server.so + +-CFLAGS += -g -Wall -I. -I../include -I../server -I../client +-# CFLAGS = -g -D__IMM_DEBUG__ -Wall -I. -I../include ++CFLAGS += -g -Wall -I. -I../include -I../server -I../client @CPPFLAGS@ + + all: $(PROG_LIB) + diff -Nru unicon-3.0.4+dfsg1/debian/patches/series unicon-3.0.4+dfsg1/debian/patches/series --- unicon-3.0.4+dfsg1/debian/patches/series 2021-01-13 23:57:13.000000000 +0000 +++ unicon-3.0.4+dfsg1/debian/patches/series 2021-12-01 08:52:05.000000000 +0000 @@ -2,3 +2,9 @@ 002-fix-spelling-error-xl_intcode.c.patch 003-fix-return-for-clang.patch 004-fix-missing_type.patch +005-fix-no-pth.patch +006-server-Makefile.in-add-FLAGS.patch +007-ImmModules-cce-Makefile.in-add-FLAGS.patch +008-ImmModules-turbo-Makefile.in-add-FLAGS.patch +009-ImmModules-cce-inputs-Makefile.in-add-FLAGS.patch +client-Makefile.in-add-FLAGS.patch diff -Nru unicon-3.0.4+dfsg1/debian/unicon-imc2.symbols unicon-3.0.4+dfsg1/debian/unicon-imc2.symbols --- unicon-3.0.4+dfsg1/debian/unicon-imc2.symbols 2021-01-13 23:53:41.000000000 +0000 +++ unicon-3.0.4+dfsg1/debian/unicon-imc2.symbols 2021-11-29 09:19:00.000000000 +0000 @@ -52,14 +52,6 @@ _ZN12TLS_CMemFileC2Em@Base 3.0.4+dfsg1 _ZN12TLS_CMemFileD1Ev@Base 3.0.4+dfsg1 _ZN12TLS_CMemFileD2Ev@Base 3.0.4+dfsg1 - _ZN14TLS_CPthSocket4ReadEPvi@Base 3.0.4+dfsg1 - _ZN14TLS_CPthSocket5WriteEPvi@Base 3.0.4+dfsg1 - _ZN14TLS_CPthSocket8PollReadEPci@Base 3.0.4+dfsg1 - _ZN14TLS_CPthSocket9PollWriteEPci@Base 3.0.4+dfsg1 - _ZN14TLS_CPthSocketC1Ei@Base 3.0.4+dfsg1 - _ZN14TLS_CPthSocketC2Ei@Base 3.0.4+dfsg1 - _ZN14TLS_CPthSocketD1Ev@Base 3.0.4+dfsg1 - _ZN14TLS_CPthSocketD2Ev@Base 3.0.4+dfsg1 _ZN15TLS_CServerMain10OpenServerEPcS0_l@Base 3.0.4+dfsg1 _ZN15TLS_CServerMain10ResetInputEl@Base 3.0.4+dfsg1 _ZN15TLS_CServerMain11CloseServerEl@Base 3.0.4+dfsg1