dictionary-el (1.10-3) unstable; urgency=medium

  * debian/control: Canonicalize per cme.  In particular, declare
    Standards-Version: 3.9.8 (already compliant, in fact).
  * dictionary.el:
    - Per Hermógenes Oliveira <oliveira-guest@alioth.debian.org>,
      adjust buffer-read-only rather than calling toggle-read-only, which
      is deprecated and can have unwanted side effects.  (Closes: #850279.)
    - Per the ever-patient Kevin Ryde <user42@zip.com.au>, adjust
      dictionary-tooltip-dictionary's defcustom type to acknowledge that nil
      (the default value) is in fact valid.  (Closes: #719041.)  Also, tweak
      dictionary-display-tooltip (used by GNU Emacs) to proceed even if
      dictionary-tooltip-dictionary is nil, as already done for XEmacs.

[dgit import package dictionary-el 1.10-3]

15 files changed, 406 insertions, 4 deletions

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..f69bb34
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,11 @@
+dictionary-*.tar.gz
+debian
+build
+connection.elc
+deb/compat
+deb/dictionary.debhelper.log
+deb/dictionary.substvars
+deb/dictionary/
+deb/files
+dictionary.elc
+link.elc
diff --git a/debian/.gitignore b/debian/.gitignore
new file mode 100644
index 0000000..17fc026
--- /dev/null
+++ b/debian/.gitignore
@@ -0,0 +1,4 @@
+*.debhelper*
+*.substvars
+dictionary-el
+files
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..0a90b6e
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,244 @@
+dictionary-el (1.10-3) unstable; urgency=medium
+
+  * debian/control: Canonicalize per cme.  In particular, declare
+    Standards-Version: 3.9.8 (already compliant, in fact).
+  * dictionary.el:
+    - Per Hermógenes Oliveira <oliveira-guest@alioth.debian.org>,
+      adjust buffer-read-only rather than calling toggle-read-only, which
+      is deprecated and can have unwanted side effects.  (Closes: #850279.)
+    - Per the ever-patient Kevin Ryde <user42@zip.com.au>, adjust
+      dictionary-tooltip-dictionary's defcustom type to acknowledge that nil
+      (the default value) is in fact valid.  (Closes: #719041.)  Also, tweak
+      dictionary-display-tooltip (used by GNU Emacs) to proceed even if
+      dictionary-tooltip-dictionary is nil, as already done for XEmacs.
+
+ -- Aaron M. Ucko <ucko@debian.org>  Thu, 05 Jan 2017 21:32:36 -0500
+
+dictionary-el (1.10-2) unstable; urgency=medium
+
+  * debian/control:
+    - Depend on emacsen-common (>= 2.0.8), per the new emacsen policy.
+    - Standards-Version: 3.9.5 (already compliant).
+  * debian/copyright: Belatedly update years (accidentally missed earlier).
+  * debian/emacsen-compat: Declare compliance with modern policy.
+
+ -- Aaron M. Ucko <ucko@debian.org>  Tue, 17 Jun 2014 10:46:58 -0400
+
+dictionary-el (1.10-1) unstable; urgency=low
+
+  * New upstream release, incorporating among other things all outstanding
+    Debian changes.  (Closes: #709093.)
+  * Standards-Version: 3.9.4 (already compliant).
+
+ -- Aaron M. Ucko <ucko@debian.org>  Tue, 21 May 2013 22:33:25 -0400
+
+dictionary-el (1.8.7-15) unstable; urgency=low
+
+  * dictionary.el:
+    - (dictionary-display-dictionary-line) Special-case "--exit--", which
+      doesn't name a dictionary but rather marks the end of the server's
+      default search list.  (Closes: #611941.)
+    - When customizing dictionary-server or other connection-related
+      variables with a connection already open, offer to close it so
+      that the change can take immediate effect.  (Closes: #611943.)
+  * dictionary-init.el: Register dictionary and dictionary-proxy as
+    customization groups associated with dictionary.el.  (Closes: #611942.)
+  * debian/compat: formally advance to Debhelper 9.
+  * debian/control:
+    - Advance debhelper build dependency accordingly.
+    - Drop Recommends; mule-ucs is long gone, and trying to recommend it
+      only in the absence of a modern emacs flavor failed to account for
+      the (unofficial) emacs-snapshot package.  (Closes: #660901.)
+    - Repoint Vcs-* fields at anonscm.debian.org (vs. git.debian.org).
+    - Standards-Version: 3.9.3 (already compliant).
+
+ -- Aaron M. Ucko <ucko@debian.org>  Tue, 19 Jun 2012 22:34:10 -0400
+
+dictionary-el (1.8.7-14) unstable; urgency=low
+
+  * dictionary.el (dictionary-mode): call make-local-hook only under XEmacs;
+    GNU Emacs deprecated it back in version 21, and will retire it altogether
+    in the upcoming version 24.  (Closes: #600800.)
+  * debian/compat: formally advance to Debhelper 8, as it is safe to do so.
+  * debian/control:
+    - Advance debhelper build-dependency accordingly.
+    - Update Recommends: again, as emacs22 and emacs-snapshot are no more.
+    - Standards-Version: 3.9.1.  (No further changes needed.)
+    - Set Vcs-* fields to point to (new) personal git.d.o repository.
+  * debian/.gitignore: Direct git to ignore content generated during build.
+
+ -- Aaron M. Ucko <ucko@debian.org>  Sat, 23 Oct 2010 22:49:06 -0400
+
+dictionary-el (1.8.7-13) unstable; urgency=low
+
+  * debian/rules: don't ship lpath.el, not needed in Debian.  (Closes: #582579)
+  * debian/control:
+    - retire Conflicts: declaration on ancient unofficial "dictionary" package.
+    - Standards-Version: 3.9.0.  (No further changes needed.)
+
+ -- Aaron M. Ucko <ucko@debian.org>  Sun, 18 Jul 2010 14:54:55 -0400
+
+dictionary-el (1.8.7-12) unstable; urgency=low
+
+  * debian/control: update Recommends: setting, as emacs23 is now current
+    and emacs21 is deprecated and due for removal.  (Closes: #540094.)
+  * debian/control: per Lintian's advice, formally depend on
+    ${misc:Depends} in case debhelper ever populates it.
+  * debian/{control,rules}: advance Debhelper requirement to 7.0.50, and
+    use its override_dh_* support to minimize rules further.
+  * debian/emacsen-startup: per Alexander Zhukov, consult
+    debian-emacs-flavor rather than flavor, which may not always be defined.
+  * debian/control: update Section to lisp and Standards-Version to
+    3.8.2.  (No other changes required.)
+
+ -- Aaron M. Ucko <ucko@debian.org>  Wed, 05 Aug 2009 22:23:14 -0400
+
+dictionary-el (1.8.7-11) unstable; urgency=low
+
+  * Migrate from CDBS to Debhelper 7.
+  * Declare compliance with Policy 3.8.0.  (No changes needed.)
+
+ -- Aaron M. Ucko <ucko@debian.org>  Sat, 14 Jun 2008 17:45:14 -0400
+
+dictionary-el (1.8.7-10) unstable; urgency=low
+
+  * dictionary.el: eliminate possible opportunities for double-encoding in
+    dictionary-do-matching (not fully fixed last time, oops) and
+    dictionary-display-more-info.  (Closes: #470953.)
+  * debian/{compat,control}: advance to Debhelper 6 on principle.
+
+ -- Aaron M. Ucko <ucko@debian.org>  Tue, 18 Mar 2008 20:06:45 -0400
+
+dictionary-el (1.8.7-9) unstable; urgency=low
+
+  * dictionary.el (dictionary-do-{search,matching}): avoid invoking concat
+    on a nominally multibyte dictionary name, to avoid double-encoding the
+    search term when consulting a single dictionary.  (Closes: #454931.)
+  * debian/control: declare Standards-Version: 3.7.3 (no changes needed).
+
+ -- Aaron M. Ucko <ucko@debian.org>  Tue, 05 Feb 2008 19:23:35 -0500
+
+dictionary-el (1.8.7-8) unstable; urgency=low
+
+  * dictionary.el: per Kevin Ryde, call read-string with a default value
+    rather than an initial input, which usage is deprecated and less
+    user-friendly.  (Closes: #442426.)
+  * debian/control: preferably recommend mule-ucs over GNU Emacs, on the
+    basis that users who satisfied the Depends: without the latter
+    installed are presumably running XEmacs and likely to view it as dead
+    weight.  (Closes: #435761.)
+  * debian/control: specify a Homepage here in addition to debian/copyright.
+
+ -- Aaron M. Ucko <ucko@debian.org>  Thu, 18 Oct 2007 20:43:11 -0400
+
+dictionary-el (1.8.7-7) unstable; urgency=low
+
+  * Fix typo in previous changelog entry.
+
+ -- Aaron M. Ucko <ucko@debian.org>  Thu, 05 Jul 2007 19:09:03 -0400
+
+dictionary-el (1.8.7-6) unstable; urgency=low
+
+  * debian/emacsen-install: per Michael Olson, make absolute rather
+    than relative symlinks to .el files to accommodate non-standard
+    filesystem setups in which /usr/share/$FLAVOR is a symlink.
+    (Closes: #431649.)
+  * debian/copyright: correctly mark license as GPL 2 *or later*, but
+    specifically refer users to /usr/share/common-licenses/GPL-2 anyway.
+
+ -- Aaron M. Ucko <ucko@debian.org>  Thu, 05 Jul 2007 18:54:27 -0400
+
+dictionary-el (1.8.7-5) unstable; urgency=low
+
+  * dictionary.el: per Kevin Ryde, mark the connection as safe to kill
+    without bugging the user.  (Closes: #417533.)
+  * debian/control: tweak dependencies slightly in preparation for
+    emacs22.
+
+ -- Aaron M. Ucko <ucko@debian.org>  Fri, 29 Jun 2007 16:30:44 -0400
+
+dictionary-el (1.8.7-4) unstable; urgency=low
+
+  * debian/emacsen-install: symlink uncompiled .el files rather than
+    copying them, and leave the symlinks behind for reference.
+  * debian/{compat,control}: modernize, using debhelper 5, declaring
+    standards-version 3.7.2 (no changes needed), and explicitly supporting
+    emacs-snapshot.
+
+ -- Aaron M. Ucko <ucko@debian.org>  Tue, 31 Oct 2006 20:06:08 -0500
+
+dictionary-el (1.8.7-3) unstable; urgency=low
+
+  * debian/emacsen-startup: use debian-pkg-add-load-path-item per current
+    policy rather than manipulating load-path directly.  (Closes: #328713.)
+  * debian/copyright: update the FSF's address per Lintian's reminder.
+  * debian/control: update standards version to 3.6.2 (no changes needed).
+  * Fix local error that resulted in the last upload accidentally
+    pretending to be a native package.
+
+ -- Aaron M. Ucko <ucko@debian.org>  Fri, 16 Sep 2005 18:23:40 -0400
+
+dictionary-el (1.8.7-2) unstable; urgency=low
+
+  * debian/emacsen-startup: cope with being unable to load
+    dictionary-init, as this package is not always fully
+    installed/configured.  (Closes: #308335.)
+
+ -- Aaron M. Ucko <ucko@debian.org>  Wed, 18 May 2005 18:50:11 -0400
+
+dictionary-el (1.8.7-1) unstable; urgency=low
+
+  * New upstream release:
+     "* fixed decoding problem while displaying the dictionary selection
+        in dictionary-select-dictionary (reported by Kuno Strassmann)
+      * added patch fixing the wrong display of dictionary description
+        (provided by Sergei Pokrovsky)
+      * added dictionary-description-open-delimiter and
+        dictionary-description-close-delimiter (suggested by Sergei
+        Pokrovsky)"
+  * debian/rocks: removed (obsolete artifact of CBS).
+  * debian/rules: force sane permissions (0644, not 0755!) on *.el.
+  * debian/watch: new, to help track upstream.
+
+ -- Aaron M. Ucko <ucko@debian.org>  Sun,  2 Jan 2005 11:38:53 -0500
+
+dictionary-el (1.8.5-2) unstable; urgency=low
+
+  * debian/control:
+    - Standards-version 3.6.1.
+    - Rename Build-Depends-Indep to Build-Depends.
+    - Bump build dependency on debhelper to 4.1.46 per cdbs's advice.
+  * debian/copyright: added years.
+
+ -- Aaron M. Ucko <ucko@debian.org>  Wed, 14 Jan 2004 18:20:16 -0500
+
+dictionary-el (1.8.5-1) unstable; urgency=low
+
+  * New upstream release:
+    "* added variable dictionary-use-single-buffer to allow selecting
+       between single/multiple buffers for dictionary access
+     * added tooltip support for XEmacs based on balloon-help"
+  * Convert from CBS to CDBS.
+  * Fix case in short description.
+  * emacsen-install: use -(-)no-site-file.
+  * emacsen-startup: load dictionary-init rather than duplicating it!
+  * Bump standards version to 3.5.10 (no changes).
+
+ -- Aaron M. Ucko <ucko@debian.org>  Thu, 26 Jun 2003 20:58:40 -0400
+
+dictionary-el (1.8.4-1) unstable; urgency=low
+
+  * New upstream release (no relevant changes, but I'm putting out new
+    packages anyway, so I might as well take it...).
+  * Fix "Upstream Author(s)" in debian/copyright.
+  * Replace debian/rules with CBS.
+  * Bump standards version to 3.5.8; no changes required.
+
+ -- Aaron M. Ucko <ucko@debian.org>  Thu,  5 Dec 2002 22:00:58 -0500
+
+dictionary-el (1.8.3-1) unstable; urgency=low
+
+  * Initial Release (closes: #164490, #111436)
+
+ -- Aaron M. Ucko <ucko@debian.org>  Sat, 12 Oct 2002 18:57:44 -0400
+
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..ec63514
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..33b82e3
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,20 @@
+Source: dictionary-el
+Maintainer: Aaron M. Ucko <ucko@debian.org>
+Section: lisp
+Priority: optional
+Build-Depends: debhelper (>= 9)
+Standards-Version: 3.9.8
+Vcs-Browser: https://anonscm.debian.org/cgit/users/ucko/dictionary-el.git
+Vcs-Git: https://anonscm.debian.org/git/users/ucko/dictionary-el.git
+Homepage: http://www.myrkr.in-berlin.de/dictionary/
+
+Package: dictionary-el
+Architecture: all
+Depends: emacs | emacsen,
+         emacsen-common (>= 2.0.8),
+         ${misc:Depends}
+Provides: dict-client
+Description: dictionary client for Emacs
+ dictionary-el is a DICT (RFC 2229) client for (X)Emacs, with support
+ for brace-delimited cross references and UTF-8-encoded entries.
+ Note that XEmacs bundles a slightly older version of this package.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..6b30248
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,28 @@
+This package was debianized by Aaron M. Ucko <ucko@debian.org> on
+Sat, 12 Oct 2002 14:45:54 -0400.
+
+It was downloaded from http://www.myrkr.in-berlin.de/dictionary/.
+
+Copyright © 1999-2013 Torsten Hilbrich <dictionary@myrkr.in-berlin.de>
+
+Copyright:
+
+   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, 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.
+
+   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 GNU/Linux systems, the complete text of the GNU General
+Public License, version 2, can be found in
+`/usr/share/common-licenses/GPL-2'.
+
diff --git a/debian/dirs b/debian/dirs
new file mode 100644
index 0000000..005c7e5
--- /dev/null
+++ b/debian/dirs
@@ -0,0 +1 @@
+usr/share/emacs/site-lisp/dictionary-el
diff --git a/debian/docs b/debian/docs
new file mode 100644
index 0000000..e845566
--- /dev/null
+++ b/debian/docs
@@ -0,0 +1 @@
+README
diff --git a/debian/emacsen-compat b/debian/emacsen-compat
new file mode 100644
index 0000000..573541a
--- /dev/null
+++ b/debian/emacsen-compat
@@ -0,0 +1 @@
+0
diff --git a/debian/emacsen-install b/debian/emacsen-install
new file mode 100644
index 0000000..b082925
--- /dev/null
+++ b/debian/emacsen-install
@@ -0,0 +1,45 @@
+#! /bin/sh -e
+# /usr/lib/emacsen-common/packages/install/dictionary-el
+
+# Written by Jim Van Zandt <jrv@vanzandt.mv.com>, borrowing heavily
+# from the install scripts for gettext by Santiago Vila
+# <sanvila@ctv.es> and octave by Dirk Eddelbuettel <edd@debian.org>.
+
+FLAVOR=$1
+PACKAGE=dictionary-el
+
+if [ ${FLAVOR} = emacs ]; then exit 0; fi
+
+echo install/${PACKAGE}: Handling install for emacsen flavor ${FLAVOR}
+
+FLAVORTEST=`echo $FLAVOR | cut -c-6`
+if [ ${FLAVORTEST} = xemacs ] ; then
+    SITEFLAG="-no-site-file"
+else
+    SITEFLAG="--no-site-file"
+fi
+FLAGS="${SITEFLAG} -q -batch -l path.el -f batch-byte-compile"
+
+ELDIR=/usr/share/emacs/site-lisp/${PACKAGE}
+ELCDIR=/usr/share/${FLAVOR}/site-lisp/${PACKAGE}
+
+## Install-info-altdir does not actually exist. 
+## Maybe somebody will write it.
+#if test -x /usr/sbin/install-info-altdir; then
+#    echo install/${PACKAGE}: install Info links for ${FLAVOR}
+#    install-info-altdir --quiet --section "" "" --dirname=${FLAVOR} /usr/info/${PACKAGE}.info.gz
+#fi
+
+install -m 755 -d ${ELCDIR}
+cd ${ELCDIR}
+rm -f *.el
+ln -s ${ELDIR}/*.el .
+FILES=`echo *.el`
+
+cat << EOF > path.el
+(setq load-path (cons "." load-path) byte-compile-warnings nil)
+EOF
+${FLAVOR} ${FLAGS} ${FILES}
+rm -f path.el # *.el
+
+exit 0
diff --git a/debian/emacsen-remove b/debian/emacsen-remove
new file mode 100644
index 0000000..6e30b79
--- /dev/null
+++ b/debian/emacsen-remove
@@ -0,0 +1,15 @@
+#!/bin/sh -e
+# /usr/lib/emacsen-common/packages/remove/dictionary-el
+
+FLAVOR=$1
+PACKAGE=dictionary-el
+
+if [ ${FLAVOR} != emacs ]; then
+#    if test -x /usr/sbin/install-info-altdir; then
+#        echo remove/${PACKAGE}: removing Info links for ${FLAVOR}
+#        install-info-altdir --quiet --remove --dirname=${FLAVOR} /usr/info/dictionary-el.info.gz
+#    fi
+
+    echo remove/${PACKAGE}: purging byte-compiled files for ${FLAVOR}
+    rm -rf /usr/share/${FLAVOR}/site-lisp/${PACKAGE}
+fi
diff --git a/debian/emacsen-startup b/debian/emacsen-startup
new file mode 100644
index 0000000..4140962
--- /dev/null
+++ b/debian/emacsen-startup
@@ -0,0 +1,18 @@
+;; -*-emacs-lisp-*-
+;;
+;; Emacs startup file for the Debian GNU/Linux dictionary-el package
+;;
+;; Originally contributed by Nils Naumann <naumann@unileoben.ac.at>
+;; Modified by Dirk Eddelbuettel <edd@debian.org>
+;; Adapted for dh-make by Jim Van Zandt <jrv@vanzandt.mv.com>
+
+;; The dictionary-el package follows the Debian/GNU Linux 'emacsen' policy and
+;; byte-compiles its elisp files for each 'emacs flavor' (emacs19,
+;; xemacs19, emacs20, xemacs20...).  The compiled code is then
+;; installed in a subdirectory of the respective site-lisp directory.
+;; We have to add this to the load-path:
+(debian-pkg-add-load-path-item
+ (concat "/usr/share/" (symbol-name debian-emacs-flavor)
+	 "/site-lisp/dictionary-el"))
+(or (load "dictionary-init" t)
+    (message "The dictionary-el package appears not to be fully installed."))
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..233c191
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,11 @@
+#!/usr/bin/make -f
+instdir=debian/dictionary-el/usr/share/emacs/site-lisp/dictionary-el
+
+%:
+	dh $@
+
+override_dh_auto_build: ;
+
+override_dh_install:
+	install -m644 *.el $(instdir)
+	rm $(instdir)/lpath.el
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..0a5f0a5
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=2
+http://www.myrkr.in-berlin.de/dictionary/download.html dictionary-([\d\.]+).tar.gz
diff --git a/dictionary.el b/dictionary.el
index a5885c3..ef820de 100755
--- a/dictionary.el
+++ b/dictionary.el
@@ -679,7 +679,7 @@ This function knows about the special meaning of quotes (\")"
 
 (defun dictionary-pre-buffer ()
   "These commands are executed at the begin of a new buffer"
-  (toggle-read-only 0)
+  (setq buffer-read-only nil)
   (erase-buffer)
   (if dictionary-create-buttons
       (progn
@@ -722,7 +722,7 @@ This function knows about the special meaning of quotes (\")"
   (goto-char dictionary-marker)
   
   (set-buffer-modified-p nil)
-  (toggle-read-only 1))
+  (setq buffer-read-only t))
 
 (defun dictionary-display-search-result (reply)
   "This function starts displaying the result starting with the `reply'."
@@ -1183,7 +1183,7 @@ It presents the word at point as default input and allows editing it."
   nil
   "This dictionary to lookup words for tooltips"
   :group 'dictionary
-  :type 'string)
+  :type '(choice (const :tag "Default" nil) string))
 
 (defun dictionary-definition (word &optional dictionary)
   (interactive)
@@ -1276,7 +1276,7 @@ It presents the word at point as default input and allows editing it."
 (defun dictionary-display-tooltip (event)
   "Search the current word in the `dictionary-tooltip-dictionary'."
   (interactive "e")
-  (if dictionary-tooltip-dictionary
+  (if t ; dictionary-tooltip-dictionary
       (let ((word (save-window-excursion
  		    (save-excursion
  		      (mouse-set-point event)