diff -Nru skksearch-0.0/debian/changelog skksearch-0.0/debian/changelog --- skksearch-0.0/debian/changelog 2018-01-24 12:57:37.000000000 +0000 +++ skksearch-0.0/debian/changelog 2021-01-01 23:42:49.000000000 +0000 @@ -1,3 +1,16 @@ +skksearch (0.0-25) unstable; urgency=medium + + * Add SKK-JISYO.edict to skksearch.conf + * Reorder dictionaries in skksearch.conf + * Update 010_debian.patch to 2021-01-02 + * Update Standards-Version to 4.5.1 + * Switch CDBS to dh with debhelper-compat (= 13) + * Add Rules-Requires-Root: no + * Update debian/copyright + * Relax dependency on skkdic-extra and skkdic + + -- Tatsuya Kinoshita Sat, 02 Jan 2021 08:42:49 +0900 + skksearch (0.0-24) unstable; urgency=medium * Update debhelper compat version to 10 diff -Nru skksearch-0.0/debian/compat skksearch-0.0/debian/compat --- skksearch-0.0/debian/compat 2018-01-24 12:51:57.000000000 +0000 +++ skksearch-0.0/debian/compat 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -10 diff -Nru skksearch-0.0/debian/control skksearch-0.0/debian/control --- skksearch-0.0/debian/control 2018-01-24 12:56:55.000000000 +0000 +++ skksearch-0.0/debian/control 2021-01-01 23:40:57.000000000 +0000 @@ -2,17 +2,20 @@ Section: utils Priority: optional Maintainer: Tatsuya Kinoshita -Build-Depends: cdbs, debhelper (>= 10), libdb-dev, libcdb-dev -Standards-Version: 4.1.3 +Build-Depends: debhelper-compat (= 13), libdb-dev, libcdb-dev +Standards-Version: 4.5.1 Vcs-Browser: https://salsa.debian.org/debian/skksearch Vcs-Git: https://salsa.debian.org/debian/skksearch.git +Rules-Requires-Root: no Package: skksearch Architecture: any Provides: skkserv Conflicts: skkserv Replaces: skkserv -Depends: ${shlibs:Depends}, ${misc:Depends}, skkdic-cdb | skkdic | skkdic-extra, openbsd-inetd | inet-superserver +Depends: ${shlibs:Depends}, ${misc:Depends}, skkdic-cdb, openbsd-inetd | inet-superserver +Recommends: skkdic-extra +Suggests: skkdic Enhances: skk Description: SKK dictionary server handling multiple dictionaries skksearch is a dictionary server for SKK Japanese input systems. diff -Nru skksearch-0.0/debian/copyright skksearch-0.0/debian/copyright --- skksearch-0.0/debian/copyright 2018-01-24 12:56:38.000000000 +0000 +++ skksearch-0.0/debian/copyright 2021-01-01 23:22:35.000000000 +0000 @@ -20,11 +20,11 @@ version 2 can be found in "/usr/share/common-licenses/GPL-2". Files: debian/* -Copyright: 2006-2018, Tatsuya Kinoshita - 2006-2007, Noritada Kobayashi - 2005-2006, Kenshi Muto - 2005, Matej Vela - 2000-2003, Takao KAWAMURA +Copyright: 2006-2021, Tatsuya Kinoshita + 2006-2007, Noritada Kobayashi + 2005-2006, Kenshi Muto + 2005, Matej Vela + 2000-2003, Takao KAWAMURA License: permissive-debian There is no restriction, so this package may be distributed under the same conditions as the upstream. diff -Nru skksearch-0.0/debian/patches/010_debian.patch skksearch-0.0/debian/patches/010_debian.patch --- skksearch-0.0/debian/patches/010_debian.patch 2018-01-24 12:55:14.000000000 +0000 +++ skksearch-0.0/debian/patches/010_debian.patch 2021-01-01 23:16:05.000000000 +0000 @@ -3,10 +3,14 @@ diff --git a/ChangeLog b/ChangeLog new file mode 100644 -index 0000000..78708e7 +index 0000000..43780d7 --- /dev/null +++ b/ChangeLog -@@ -0,0 +1,40 @@ +@@ -0,0 +1,44 @@ ++2021-01-02 Tatsuya Kinoshita ++ ++ * main.c: Typo fix. ++ +2015-01-28 Tatsuya Kinoshita + + * README: Convert to UTF-8. @@ -302,7 +306,7 @@ } fgets(buf, DIC_BUFSIZE, fp); diff --git a/main.c b/main.c -index 043fd94..b04b504 100644 +index 043fd94..3df17db 100644 --- a/main.c +++ b/main.c @@ -15,6 +15,7 @@ @@ -353,8 +357,12 @@ argv[0]); exit(1); } -@@ -108,6 +112,33 @@ main(int argc, char *argv[]) { - err(LOG_DEBUG, "openning dictionary %s", argv[optind + i]); +@@ -105,9 +109,36 @@ main(int argc, char *argv[]) { + exit(1); + } + for (i = 0; i < dicnum; i++) { +- err(LOG_DEBUG, "openning dictionary %s", argv[optind + i]); ++ err(LOG_DEBUG, "opening dictionary %s", argv[optind + i]); diclist[i] = dic_open(argv[optind + i]); } + if (conf != NULL) { @@ -374,7 +382,7 @@ + err(LOG_ERR, "too many dicts in config file\n"); + exit(1); + } -+ err(LOG_DEBUG, "openning dictionary %s", p); ++ err(LOG_DEBUG, "opening dictionary %s", p); + dicnum++; + diclist[i++] = dic_open(p); + } diff -Nru skksearch-0.0/debian/rules skksearch-0.0/debian/rules --- skksearch-0.0/debian/rules 2018-01-24 12:15:16.000000000 +0000 +++ skksearch-0.0/debian/rules 2021-01-01 23:21:03.000000000 +0000 @@ -1,10 +1,6 @@ #!/usr/bin/make -f - -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/makefile.mk - -DEB_INSTALL_DOCS_ALL := -DEB_INSTALL_MANPAGES_skksearch := debian/skksearch.8 +# -*- makefile -*- +#export DH_VERBOSE=1 export DEB_BUILD_MAINT_OPTIONS = hardening=+all dpkg_buildflags = DEB_BUILD_MAINT_OPTIONS=$(DEB_BUILD_MAINT_OPTIONS) dpkg-buildflags @@ -12,11 +8,14 @@ CPPFLAGS=$(shell $(dpkg_buildflags) --get CPPFLAGS) LDFLAGS=$(shell $(dpkg_buildflags) --get LDFLAGS) -DEB_MAKE_BUILD_TARGET := CFLAGS='$(CFLAGS) $(CPPFLAGS) -DSYSLOG' LDFLAGS='$(LDFLAGS) -lcdb -ldb' -DEB_MAKE_INSTALL_TARGET := -DEB_MAKE_CHECK_TARGET := +%: + dh $@ + +override_dh_update_autotools_config override_dh_autoreconf override_dh_auto_configure override_dh_auto_test override_dh_auto_install: + +override_dh_auto_build: + dh_auto_build -- CFLAGS='$(CFLAGS) $(CPPFLAGS) -DSYSLOG' LDFLAGS='$(LDFLAGS) -lcdb -ldb' -install/skksearch:: - install -D -m 644 README $(DEB_DESTDIR)/usr/share/doc/skksearch/README.ja - f=$(DEB_DESTDIR)/usr/share/doc/skksearch/README.ja && \ - iconv -f iso-2022-jp -t utf-8 "$$f" > "$$f".tmp && mv -f "$$f".tmp "$$f" || rm -f "$$f".tmp +override_dh_install: + dh_install + install -D -m 644 README debian/skksearch/usr/share/doc/skksearch/README.ja diff -Nru skksearch-0.0/debian/skksearch.conf skksearch-0.0/debian/skksearch.conf --- skksearch-0.0/debian/skksearch.conf 2018-01-24 12:15:16.000000000 +0000 +++ skksearch-0.0/debian/skksearch.conf 2021-01-01 23:15:07.000000000 +0000 @@ -1,29 +1,33 @@ # type:file cdb:/usr/share/skk/SKK-JISYO.cdb -# plain:/usr/share/skk/SKK-JISYO +#plain:/usr/share/skk/SKK-JISYO # skkdic-extra -# plain:/usr/share/skk/SKK-JISYO.lisp -# plain:/usr/share/skk/SKK-JISYO.JIS2 -# plain:/usr/share/skk/SKK-JISYO.JIS2004 -# plain:/usr/share/skk/SKK-JISYO.JIS3_4 -# plain:/usr/share/skk/SKK-JISYO.assoc -# plain:/usr/share/skk/SKK-JISYO.china_taiwan -# plain:/usr/share/skk/SKK-JISYO.fullname -# plain:/usr/share/skk/SKK-JISYO.geo -# plain:/usr/share/skk/SKK-JISYO.hukugougo -# plain:/usr/share/skk/SKK-JISYO.itaiji -# plain:/usr/share/skk/SKK-JISYO.itaiji.JIS3_4 -# plain:/usr/share/skk/SKK-JISYO.jinmei -# plain:/usr/share/skk/SKK-JISYO.law -# plain:/usr/share/skk/SKK-JISYO.mazegaki -# plain:/usr/share/skk/SKK-JISYO.noregist -# plain:/usr/share/skk/SKK-JISYO.not_wrong -# plain:/usr/share/skk/SKK-JISYO.notes -# plain:/usr/share/skk/SKK-JISYO.okinawa -# plain:/usr/share/skk/SKK-JISYO.propernoun -# plain:/usr/share/skk/SKK-JISYO.pubdic+ -# plain:/usr/share/skk/SKK-JISYO.requested -# plain:/usr/share/skk/SKK-JISYO.station -# plain:/usr/share/skk/SKK-JISYO.zipcode -# plain:/usr/share/skk/SKK-JISYO.office.zipcode +##plain:/usr/share/skk/SKK-JISYO.ML +##plain:/usr/share/skk/SKK-JISYO.M +##plain:/usr/share/skk/SKK-JISYO.S +##plain:/usr/share/skk/SKK-JISYO.not_wrong +##plain:/usr/share/skk/SKK-JISYO.notes +#plain:/usr/share/skk/SKK-JISYO.lisp +#plain:/usr/share/skk/SKK-JISYO.JIS2 +#plain:/usr/share/skk/SKK-JISYO.assoc +#plain:/usr/share/skk/SKK-JISYO.china_taiwan +#plain:/usr/share/skk/SKK-JISYO.fullname +#plain:/usr/share/skk/SKK-JISYO.geo +#plain:/usr/share/skk/SKK-JISYO.hukugougo +#plain:/usr/share/skk/SKK-JISYO.jinmei +#plain:/usr/share/skk/SKK-JISYO.law +#plain:/usr/share/skk/SKK-JISYO.mazegaki +#plain:/usr/share/skk/SKK-JISYO.noregist +#plain:/usr/share/skk/SKK-JISYO.okinawa +#plain:/usr/share/skk/SKK-JISYO.propernoun +#plain:/usr/share/skk/SKK-JISYO.pubdic+ +#plain:/usr/share/skk/SKK-JISYO.requested +#plain:/usr/share/skk/SKK-JISYO.station +#plain:/usr/share/skk/SKK-JISYO.zipcode +#plain:/usr/share/skk/SKK-JISYO.office.zipcode +#plain:/usr/share/skk/SKK-JISYO.JIS3_4 +#plain:/usr/share/skk/SKK-JISYO.JIS2004 +#plain:/usr/share/skk/SKK-JISYO.edict +#plain:/usr/share/skk/SKK-JISYO.itaiji +#plain:/usr/share/skk/SKK-JISYO.itaiji.JIS3_4 diff -Nru skksearch-0.0/debian/skksearch.manpages skksearch-0.0/debian/skksearch.manpages --- skksearch-0.0/debian/skksearch.manpages 1970-01-01 00:00:00.000000000 +0000 +++ skksearch-0.0/debian/skksearch.manpages 2021-01-01 23:21:03.000000000 +0000 @@ -0,0 +1 @@ +debian/skksearch.8