diff -Nru ddskk-16.2/debian/changelog ddskk-16.2/debian/changelog --- ddskk-16.2/debian/changelog 2018-08-19 15:50:27.000000000 +0000 +++ ddskk-16.2/debian/changelog 2018-11-25 10:00:56.000000000 +0000 @@ -1,3 +1,15 @@ +ddskk (16.2-5) unstable; urgency=medium + + [ Ondřej Nový ] + * d/changelog: Remove trailing whitespaces + + [ Tatsuya Kinoshita ] + * Use "127.0.0.1" instead of "localhost" for skkserv + * Prefer skkdic-cdb to skkserv by default + * Update Standards-Version to 4.2.1 + + -- Tatsuya Kinoshita Sun, 25 Nov 2018 19:00:56 +0900 + ddskk (16.2-4) unstable; urgency=medium * Fix handling for xemacs21-mule/nomule @@ -644,7 +656,7 @@ * Updated the version of required APEL to 10.0-1. -- Takao KAWAMURA Sun, 20 Feb 2000 21:55:18 +0900 - + ddskk (11.2.cvs.20000108-1) unstable; urgency=low * Corrected the version number from 11.1 to 11.2. diff -Nru ddskk-16.2/debian/control ddskk-16.2/debian/control --- ddskk-16.2/debian/control 2018-08-19 15:50:06.000000000 +0000 +++ ddskk-16.2/debian/control 2018-11-25 09:59:51.000000000 +0000 @@ -4,7 +4,7 @@ Maintainer: Tatsuya Kinoshita Build-Depends: debhelper (>= 11) Build-Depends-Indep: emacs-nox | emacs | emacs25 | emacs24 | emacs23 -Standards-Version: 4.2.0 +Standards-Version: 4.2.1 Vcs-Browser: https://salsa.debian.org/debian/ddskk Vcs-Git: https://salsa.debian.org/debian/ddskk.git Homepage: http://openlab.jp/skk/ @@ -12,7 +12,7 @@ Package: ddskk Architecture: all Depends: emacsen-common (>= 2.0.8), emacs-nox | emacs | emacs25 | emacs24 | emacs23 | emacs-snapshot | xemacs21-mule | xemacs21-mule-canna-wnn | xemacs21-gnome-mule | xemacs21-gnome-mule-canna-wnn, emacs-nox | emacs | emacs25 | emacs24 | emacs23 | emacs-snapshot | apel (>= 10.7), dpkg (>= 1.15.4) | install-info, ${misc:Depends} -Recommends: dbskkd-cdb | skkserv | skkdic-cdb | skkdic +Recommends: skkdic-cdb | dbskkd-cdb | skkserv | skkdic Suggests: skkdic, skkdic-extra, skktools, lookup-el, kakasi, w3m-el, eieio, ruby, dictionaries-common Provides: skk Conflicts: skk diff -Nru ddskk-16.2/debian/emacsen-startup ddskk-16.2/debian/emacsen-startup --- ddskk-16.2/debian/emacsen-startup 2014-03-01 13:12:36.000000000 +0000 +++ ddskk-16.2/debian/emacsen-startup 2018-11-25 09:58:45.000000000 +0000 @@ -25,8 +25,9 @@ (and (get 'skk-henkan-okuri-strictly 'temporary-nil) (setq skk-henkan-okuri-strictly t) (put 'skk-henkan-okuri-strictly 'temporary-nil nil))))) - (setq skk-server-host (or (getenv "SKKSERVER") "localhost")) - ;;(setq skk-cdb-large-jisyo "/usr/share/skk/SKK-JISYO.cdb") + (setq skk-server-host (or (getenv "SKKSERVER") "127.0.0.1")) + (if (file-exists-p "/usr/share/skk/SKK-JISYO.cdb") + (setq skk-cdb-large-jisyo "/usr/share/skk/SKK-JISYO.cdb")) ;;(setq skk-large-jisyo "/usr/share/skk/SKK-JISYO") (setq skk-tut-file "/usr/share/skk/SKK.tut") (if (boundp 'data-directory-list) diff -Nru ddskk-16.2/debian/README.Debian ddskk-16.2/debian/README.Debian --- ddskk-16.2/debian/README.Debian 2018-02-10 14:19:58.000000000 +0000 +++ ddskk-16.2/debian/README.Debian 2018-11-25 09:58:45.000000000 +0000 @@ -7,10 +7,13 @@ (set-input-method "japanese-skk") (inactivate-input-method) -By default, DDSKK tries to connect an skkserv compatible dictionary -server such as dbskkd-cdb, skksearch or yaskkserv on localhost. - - (setq skk-server-host (or (getenv "SKKSERVER") "localhost")) +To use an skkserv compatible dictionary server such as dbskkd-cdb, +skksearch or yaskkserv, set skk-server-host. See also +skk-large-jisyo and skk-cdb-large-jisyo. + + (setq skk-server-host (or (getenv "SKKSERVER") "127.0.0.1")) + (setq skk-large-jisyo nil) + (setq skk-cdb-large-jisyo nil) To directly use a dictionary file without skkserv, set skk-large-jisyo or skk-cdb-large-jisyo. See also @@ -56,4 +59,4 @@ To learn the usage of DDSKK, type `C-x t' (skk-tutorial, Japanese version) or `C-u C-x t' (skk-tutorial, choose Japanese or English). - -- Tatsuya Kinoshita , Sat, 10 Feb 2018 23:19:58 +0900 + -- Tatsuya Kinoshita , Sun, 25 Nov 2018 18:10:13 +0900