Imported version 1.8.2 from tarball

fixed Makefile

13 files changed, 192 insertions, 28 deletions

diff --git a/Makefile b/Makefile
index b562a0a..6005920 100644
--- a/Makefile
+++ b/Makefile
@@ -1,42 +1,84 @@
-# Makefile for dictionary code
+# -*- Makefile -*- $Id: Makefile.upstream,v 1.5 2002/05/17 17:48:04 torsten Exp $
 
-# This file is part of XEmacs.
+EMACS=emacs
 
-# XEmacs 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.
+VERSION=1.8
+PACKAGE=dictionary
+TYPE=comm
+XEMACS-PACKAGE=$(PACKAGE)-$(VERSION)-pkg.tar.gz
 
-# XEmacs 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.
+SOURCES=dictionary.el connection.el link.el
+COMPILED=dictionary.elc connection.elc link.elc
 
-# You should have received a copy of the GNU General Public License
-# along with XEmacs; see the file COPYING.  If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+.SUFFIXES: .elc .el
 
-VERSION = 1.10
-AUTHOR_VERSION = 1.8
-MAINTAINER = Torsten Hilbrich <dictionary@myrkr.in-berlin.de>
-PACKAGE = dictionary
-PKG_TYPE = regular
-REQUIRES = xemacs-base
-CATEGORY = standard
+.el.elc:
+	$(EMACS) -q -no-site-file -no-init-file -batch -l lpath.el \
+	-f batch-byte-compile $<
 
-ELCS = dictionary.elc connection.elc link.elc
+.PHONY: all
+all: $(COMPILED)
 
-EXTRA_SOURCES = README GPL
+.PHONY: debian
+debian:
+	[ -x debian ] || ln -s deb debian
+	@if [ -x /usr/bin/fakeroot ]; then \
+	  dpkg-buildpackage -us -uc -rfakeroot; \
+	elif [ `id -u` -ne 0 ]; then \
+	  echo "You are not root and fakeroot is not installed, aborting"; \
+	  exit 1; \
+	else \
+	  dpkg-buildpackage -us -uc; \
+	fi
+	@echo "You can now install the debian package, the previous output tells"
+	@echo "you its location (probably stored in ..)"
+	@echo
+	@echo "Please note, this debian package is unofficial, report bugs"
+	@echo "to me only, not to the Debian Bugtracking System."
 
-GENERATED += custom-load.elc
+.PHONY: package
+package: $(XEMACS-PACKAGE) 
 
-include ../../XEmacs.rules
+$(XEMACS-PACKAGE): $(COMPILED)
+	@case $(EMACS) in emacs*) printf "\aNote, packages work with XEmacs 21 only, hope you know what you are doing\n\n";; esac
+	@mkdir -p lisp/$(PACKAGE)
+	@mkdir -p pkginfo
+	@printf ";;;###autoload\n(package-provide '$(PACKAGE)\n:version $(VERSION)\n:type '$(TYPE))\n" > lisp/$(PACKAGE)/_pkg.el
+	@rm -f lisp/$(PACKAGE)/auto-autoloads.el lisp/$(PACKAGE)/custom-load.el
+	@cp $(SOURCES) $(COMPILED) lisp/$(PACKAGE)
+	@cd lisp &&  \
+	$(EMACS) -vanilla -batch -l autoload -f batch-update-directory $(PACKAGE) && \
+	$(EMACS) -vanilla -batch -l cus-dep -f Custom-make-dependencies $(PACKAGE) && \
+	$(EMACS) -vanilla -batch -f batch-byte-compile $(PACKAGE)/auto-autoloads.el $(PACKAGE)/custom-load.el
+	@touch pkginfo/MANIFEST.$(PACKAGE)
+	@find lisp pkginfo -type f > pkginfo/MANIFEST.$(PACKAGE)
+	@tar cf - pkginfo lisp | gzip -c > $(XEMACS-PACKAGE)
 
-all:: $(ELCS) auto-autoloads.elc custom-load.elc
+.PHONY: package-install
+package-install: package
+	@if [ `id -u` -ne 0 ]; then printf "\aWarning, you are not root; the installation might fail\n\n"; fi
+	@$(EMACS) -vanilla -batch -l install-package.el -f install-package `pwd`/$(XEMACS-PACKAGE)
 
-srckit: srckit-std
+.PHONY: view-info
+view-info: info
+	info doc/dictionary.info
 
-binkit: binkit-common
+.PHONY: doc
+doc: info html
 
+.PHONY: info
+info: doc/dictionary.info
 
+doc/dictionary.info: doc/dictionary.texi
+	cd doc && makeinfo --output dictionary.info dictionary
+
+.PHONY: html
+html: doc/dictionary
+
+doc/dictionary: doc/dictionary.texi
+	cd doc && makeinfo --html dictionary
+
+.PHONY: clean
+clean:
+	rm -f $(XEMACS-PACKAGE) $(COMPILED) build
+	rm -rf debian/tmp lisp pkginfo
diff --git a/debian/README.debian b/deb/README.debian
index 524ea98..524ea98 100644
--- a/debian/README.debian
+++ b/deb/README.debian
diff --git a/deb/changelog b/deb/changelog
new file mode 100644
index 0000000..425d785
--- /dev/null
+++ b/deb/changelog
@@ -0,0 +1,122 @@
+dictionary (1.8-2) unstable; urgency=low
+
+  * fixed Makefile
+
+ -- Torsten Hilbrich <dictionary@myrkr.in-berlin.de>  Fri, 14 Jun 2002 19:31:53 +0200
+
+dictionary (1.8-1) unstable; urgency=low
+
+  * added search for similiar words when the searched word is not found.
+
+ -- Torsten Hilbrich <dictionary@myrkr.in-berlin.de>  Wed, 20 Mar 2002 21:27:54 +0100
+
+dictionary (1.7.4-1) unstable; urgency=low
+
+  * dictionary.el (dictionary-do-matching): removed quotes around
+    dictionary name and match strategy
+	
+  * dictionary.el (dictionary-do-search): removed quotes around dictionary
+    name
+	
+  * dictionary.el (dictionary-display-more-info): removed quotes around
+    dictionary name
+
+  This problem (occurring with jdictd) was reported by E C Vijil
+
+ -- Torsten Hilbrich <dictionary@myrkr.in-berlin.de>  Fri, 15 Mar 2002 21:19:23 +0100
+
+dictionary (1.7.3-1) unstable; urgency=low
+
+  * dictionary.el (dictionary-default-popup-strategy): added this
+    variable and changed dictionary-popup-matching-words to use
+    this as matching strategy (suggested by Renaud Pons)
+
+ -- Torsten Hilbrich <dictionary@myrkr.in-berlin.de>  Tue, 29 Jan 2002 10:27:49 +0100
+
+dictionary (1.7.2-1) unstable; urgency=low
+
+  * link.el (link-initialize-keymap): fixed keybinding bug (reported by
+    David A. Panariti)
+
+ -- Torsten Hilbrich <dictionary@myrkr.in-berlin.de>  Fri, 21 Dec 2001 18:50:20 +0100
+
+dictionary (1.7.1-1) unstable; urgency=low
+
+  * Fixed bug in dictionary-coding-system, the detection of non-mule
+    Emacsen was not correct
+
+ -- Torsten Hilbrich <dictionary@myrkr.in-berlin.de>  Sat, 15 Dec 2001 14:29:29 +0100
+
+dictionary (1.7-1) unstable; urgency=low
+
+  * Added first support for dictionaries with different encodings than
+    utf-8.
+
+ -- Torsten Hilbrich <dictionary@myrkr.in-berlin.de>  Sun,  9 Dec 2001 14:21:57 +0100
+
+dictionary (1.6-1) unstable; urgency=low
+
+  * added HTTP proxy support using the CONNECT request type
+
+ -- Torsten Hilbrich <dictionary@myrkr.in-berlin.de>  Tue,  4 Dec 2001 20:22:03 +0100
+
+dictionary (1.5.3-1) unstable; urgency=low
+
+  * changed name of "select dictionary" button
+  * "select dictionary" and "select matching strategie" now has a better
+    feedback (by returning to the previous state)
+  * added support for non-colored display, the links are surrounded by
+    braces
+
+ -- Torsten Hilbrich <Torsten.Hilbrich@gmx.net>  Sun, 14 Oct 2001 16:08:12 +0200
+
+dictionary (1.5.2-1) unstable; urgency=low
+
+  * popup menu now correctly records the selected window
+
+ -- Torsten Hilbrich <Torsten.Hilbrich@gmx.net>  Sun,  2 Sep 2001 10:40:59 +0200
+
+dictionary (1.5.1-1) unstable; urgency=low
+
+  * corrected bug with dictionary-previous (found by Rui Zhu)
+  * corrected key bindings in link.el
+
+ -- Torsten Hilbrich <Torsten.Hilbrich@gmx.net>  Tue, 17 Jul 2001 20:47:58 +0200
+
+dictionary (1.5-1) unstable; urgency=low
+
+  * added tooltip support for emacs
+
+ -- Torsten Hilbrich <Torsten.Hilbrich@gmx.net>  Sun,  8 Jul 2001 21:01:12 +0200
+
+dictionary (1.4.1-1) unstable; urgency=low
+
+  * changed recognition of utf-8 support (suggested by Enrico Scholz)
+
+ -- Torsten Hilbrich <Torsten.Hilbrich@gmx.net>  Fri,  6 Jul 2001 23:08:48 +0200
+
+dictionary (1.4-1) unstable; urgency=low
+
+  * support for popup menus
+
+ -- Torsten Hilbrich <Torsten.Hilbrich@gmx.net>  Fri,  6 Jul 2001 19:54:54 +0200
+
+dictionary (1.3.3-1) unstable; urgency=low
+
+  * added support for xemacs 21 packages (no changes for debian)
+
+ -- Torsten Hilbrich <Torsten.Hilbrich@gmx.net>  Wed, 27 Jun 2001 17:56:44 +0200
+
+dictionary (1.3.2-1) unstable; urgency=low
+
+  * removed use of set-text-properties in link.el
+
+ -- Torsten Hilbrich <Torsten.Hilbrich@gmx.net>  Fri, 22 Jun 2001 21:39:47 +0200
+
+dictionary (1.3.1-1) unstable; urgency=low
+
+  * Initial release.
+
+ -- Torsten Hilbrich <Torsten.Hilbrich@gmx.net>  Sun, 13 May 2001 09:55:20 +0200
+
+
diff --git a/debian/changelog b/deb/changelog~
index 86c3080..86c3080 100644
--- a/debian/changelog
+++ b/deb/changelog~
diff --git a/debian/control b/deb/control
index fed4dd5..fed4dd5 100644
--- a/debian/control
+++ b/deb/control
diff --git a/debian/copyright b/deb/copyright
index b82cc97..b82cc97 100644
--- a/debian/copyright
+++ b/deb/copyright
diff --git a/debian/dirs b/deb/dirs
index 9d129ef..9d129ef 100644
--- a/debian/dirs
+++ b/deb/dirs
diff --git a/debian/files b/deb/files
index e5456d4..e5456d4 100644
--- a/debian/files
+++ b/deb/files
diff --git a/debian/install.debian b/deb/install.debian
index ad76efb..ad76efb 100755
--- a/debian/install.debian
+++ b/deb/install.debian
diff --git a/debian/postinst b/deb/postinst
index 2333df3..2333df3 100755
--- a/debian/postinst
+++ b/deb/postinst
diff --git a/debian/prerm b/deb/prerm
index bc7ec08..bc7ec08 100755
--- a/debian/prerm
+++ b/deb/prerm
diff --git a/debian/remove.debian b/deb/remove.debian
index 991d208..991d208 100755
--- a/debian/remove.debian
+++ b/deb/remove.debian
diff --git a/debian/rules b/deb/rules
index 1a67696..1a67696 100755
--- a/debian/rules
+++ b/deb/rules