Import Debian changes e3-2.30-1

e3 (e3-2.30-1) unstable; urgency=low

  * New upstream version

e3 (2.21-1) unstable; urgency=low

  * New upstream version

e3 (2.20-1) unstable; urgency=low

  * New upstream version
  * Renumbered from upstream version number 2.2 to 2.20

e3 (2.11-1) unstable; urgency=low

  * New upstream version
  * Fixed prerm to remove the *correct* links (closes: #135496)

e3 (2.1-1) unstable; urgency=low

  * New upstream version (closes: #133879)
  * Two short jumps converted to long ones -- new nasm generates some
    additional bytes of code (!!!)

e3 (2.0-3) unstable; urgency=low

  * New maintainer (closes: #130820)
  * Refreshed package a bit -- new debhelper, updated standards-version
  * I had to convert one short jump to a long one -- otherwise nasm produced
    error. I'd have to examine it further...

e3 (2.0-2) unstable; urgency=low

  * Orphaned this package.

e3 (2.0-1) unstable; urgency=high

  * New upstream release.

e3 (1.9-1) unstable; urgency=high

  * New upstream release.
    - It's now possible to suspend e3 using ^Z. (closes: #119363)

e3 (1.8.2-1) unstable; urgency=high

  * New upstream release.

e3 (1.8.1-1) unstable; urgency=low

  * New upstream release.
  * Lower the priorities at the update-alternatives calls from
    20 to 10 in debian/postinst.

e3 (1.7-1) unstable; urgency=low

  * New upstream release.

e3 (1.6.2-1) unstable; urgency=low

  * New upstream release.

e3 (1.5-1) unstable; urgency=low

  * New upstream release.
  * Added a patch sent by Chad C. Walstrom <chewie@wookimus.net>
    to add some alternatives. (closes: #90152)
  * Standards-Version: 3.5.4 (no changes)

e3 (1.4-3) unstable; urgency=low

  * Use upx instead of gzexe. (closes: #92340)

e3 (1.4-2) unstable; urgency=low

  * Use gzexe to make e3 smaller. (closes: #75807)
  * Standards-Version: 3.5.2 (no changes)

e3 (1.4-1) unstable; urgency=low

  * New upstream release.
  * Corrected the symlinks for e3?? . (closes: #79787)

e3 (1.1.0-1) unstable; urgency=low

  * New upstream release.

e3 (1.01-1) unstable; urgency=low

  * New upstream release.

e3 (0.9-1) unstable; urgency=low

  * Initial Release. (closes: #75424)
  * Upload sponsored by Tony Mancill <tmancill@debian.org>.

11 files changed, 309 insertions, 13 deletions

diff --git a/Makefile b/Makefile
index bb2f6e7..d5efd98 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,8 @@ OS=LINUX
 #OS=W32 	** please use a separate make.bat for W9x **
 
 # Set this to gzexe or upx if you want compression
-COMPRESS=gzexe
+#COMPRESS=gzexe
+COMPRESS=upx
 
 # 2. edit dest dir prefix if you want....
 
@@ -25,7 +26,7 @@ EXMODE=SED
 
 BINDIR='$(PREFIX)/bin'
 MANSEC='1'
-MANDIR='$(PREFIX)/man/man$(MANSEC)'
+MANDIR='$(PREFIX)/share/man/man$(MANSEC)'
 
 
 #______________________do not edit below line________________________
@@ -71,11 +72,7 @@ else
 endif
 	strip --remove-section .comment e3
 endif
-	ln -sf e3 e3ws
-	ln -sf e3 e3em
-	ln -sf e3 e3pi
-	ln -sf e3 e3vi
-	ln -sf e3 e3ne
+
 
 # next three are for testing purpose: linking w libc
 statc:
@@ -156,12 +153,17 @@ ifeq	($(OS),QNX)
 else
 	install -d $(PREFIX) $(BINDIR) $(MANDIR)
 	install -m 755 e3 $(BINDIR)
-	ln -sf $(BINDIR)/e3 $(BINDIR)/e3ws
-	ln -sf $(BINDIR)/e3 $(BINDIR)/e3em
-	ln -sf $(BINDIR)/e3 $(BINDIR)/e3pi
-	ln -sf $(BINDIR)/e3 $(BINDIR)/e3vi
-	ln -sf $(BINDIR)/e3 $(BINDIR)/e3ne
+	cd $(BINDIR) && ln -s e3 e3ws
+	cd $(BINDIR) && ln -s e3 e3em
+	cd $(BINDIR) && ln -s e3 e3pi
+	cd $(BINDIR) && ln -s e3 e3vi
+	cd $(BINDIR) && ln -s e3 e3ne
 	install -m 644 e3.man $(MANDIR)/e3.$(MANSEC)
+	cd $(MANDIR) && ln -s e3.1 e3ws.1
+	cd $(MANDIR) && ln -s e3.1 e3em.1
+	cd $(MANDIR) && ln -s e3.1 e3pi.1
+	cd $(MANDIR) && ln -s e3.1 e3vi.1
+	cd $(MANDIR) && ln -s e3.1 e3ne.1
 endif
 
 clean:
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..17cde78
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,139 @@
+e3 (e3-2.30-1) unstable; urgency=low
+
+  * New upstream version
+
+ -- Pawel Wiecek <coven@debian.org>  Mon,  8 Apr 2002 20:38:38 +0200
+
+e3 (2.21-1) unstable; urgency=low
+
+  * New upstream version
+
+ -- Pawel Wiecek <coven@debian.org>  Mon, 18 Mar 2002 21:26:14 +0100
+
+e3 (2.20-1) unstable; urgency=low
+
+  * New upstream version
+  * Renumbered from upstream version number 2.2 to 2.20
+
+ -- Pawel Wiecek <coven@debian.org>  Tue, 12 Mar 2002 15:07:06 +0100
+
+e3 (2.11-1) unstable; urgency=low
+
+  * New upstream version
+  * Fixed prerm to remove the *correct* links (closes: #135496)
+
+ -- Pawel Wiecek <coven@debian.org>  Tue,  5 Mar 2002 13:59:26 +0100
+
+e3 (2.1-1) unstable; urgency=low
+
+  * New upstream version (closes: #133879)
+  * Two short jumps converted to long ones -- new nasm generates some
+    additional bytes of code (!!!)
+
+ -- Pawel Wiecek <coven@debian.org>  Thu, 14 Feb 2002 12:58:36 +0100
+
+e3 (2.0-3) unstable; urgency=low
+
+  * New maintainer (closes: #130820)
+  * Refreshed package a bit -- new debhelper, updated standards-version
+  * I had to convert one short jump to a long one -- otherwise nasm produced
+    error. I'd have to examine it further...
+
+ -- Pawel Wiecek <coven@debian.org>  Fri,  1 Feb 2002 14:11:04 +0100
+
+e3 (2.0-2) unstable; urgency=low
+
+  * Orphaned this package.
+
+ -- Adrian Bunk <bunk@fs.tum.de>  Fri, 25 Jan 2002 12:46:05 +0100
+
+e3 (2.0-1) unstable; urgency=high
+
+  * New upstream release.
+
+ -- Adrian Bunk <bunk@fs.tum.de>  Thu,  3 Jan 2002 12:14:41 +0100
+
+e3 (1.9-1) unstable; urgency=high
+
+  * New upstream release.
+    - It's now possible to suspend e3 using ^Z. (closes: #119363)
+
+ -- Adrian Bunk <bunk@fs.tum.de>  Fri,  7 Dec 2001 09:12:10 +0100
+
+e3 (1.8.2-1) unstable; urgency=high
+
+  * New upstream release.
+
+ -- Adrian Bunk <bunk@fs.tum.de>  Fri, 30 Nov 2001 17:07:57 +0100
+
+e3 (1.8.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Lower the priorities at the update-alternatives calls from
+    20 to 10 in debian/postinst.
+
+ -- Adrian Bunk <bunk@fs.tum.de>  Sat, 17 Nov 2001 18:09:23 +0100
+
+e3 (1.7-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Adrian Bunk <bunk@fs.tum.de>  Wed, 11 Jul 2001 11:30:47 +0200
+
+e3 (1.6.2-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Adrian Bunk <bunk@fs.tum.de>  Sun,  1 Jul 2001 18:46:16 +0200
+
+e3 (1.5-1) unstable; urgency=low
+
+  * New upstream release.
+  * Added a patch sent by Chad C. Walstrom <chewie@wookimus.net>
+    to add some alternatives. (closes: #90152)
+  * Standards-Version: 3.5.4 (no changes)
+  
+ -- Adrian Bunk <bunk@fs.tum.de>  Sat,  5 May 2001 21:03:19 +0200
+
+e3 (1.4-3) unstable; urgency=low
+
+  * Use upx instead of gzexe. (closes: #92340)
+
+ -- Adrian Bunk <bunk@fs.tum.de>  Fri, 13 Apr 2001 01:14:46 +0200
+
+e3 (1.4-2) unstable; urgency=low
+
+  * Use gzexe to make e3 smaller. (closes: #75807)
+  * Standards-Version: 3.5.2 (no changes)
+
+ -- Adrian Bunk <bunk@fs.tum.de>  Fri, 16 Mar 2001 00:52:04 +0100
+
+e3 (1.4-1) unstable; urgency=low
+
+  * New upstream release.
+  * Corrected the symlinks for e3?? . (closes: #79787)
+
+ -- Adrian Bunk <bunk@fs.tum.de>  Tue, 23 Jan 2001 02:41:33 +0100
+
+e3 (1.1.0-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Adrian Bunk <bunk@fs.tum.de>  Mon, 11 Dec 2000 12:27:57 +0100
+
+e3 (1.01-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Adrian Bunk <bunk@fs.tum.de>  Sun, 12 Nov 2000 18:08:45 +0100
+
+e3 (0.9-1) unstable; urgency=low
+
+  * Initial Release. (closes: #75424)
+  * Upload sponsored by Tony Mancill <tmancill@debian.org>.
+
+ -- Adrian Bunk <bunk@fs.tum.de>  Tue, 24 Oct 2000 20:47:19 +0200
+
+Local variables:
+mode: debian-changelog
+End:
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..8a85995
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,21 @@
+Source: e3
+Section: editors
+Priority: optional
+Maintainer: Pawel Wiecek <coven@debian.org>
+Build-Depends: debhelper (>> 3.0.0), nasm, upx-ucl
+Standards-Version: 3.5.6
+
+Package: e3
+Architecture: i386
+Depends: ${shlibs:Depends}
+Description: A very small editor
+ This package contains an editor you can call via the following links:
+   - e3em: Emacs-like key bindings
+   - e3vi: Vi-like key bindings
+   - e3pi: Pico-like key bindings
+   - e3ne: Nedit-like key bindings
+   - e3ws: Wordstar-like key bindings
+ .
+ e3 has the following advantages over other editors:
+   - it has no library dependencies
+   - one very small binary (only 10 kB) that gives you 5 editors
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..d8383f5
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,11 @@
+This package was debianized by Adrian Bunk <bunk@fs.tum.de> on
+Tue, 24 Oct 2000 20:47:19 +0200.
+
+It was downloaded from http://www.sax.de/~adlibit/
+
+Upstream Author: Albrecht Kleine <kleine@ak.sax.de>
+
+Copyright:
+
+This source code is copyright under the GNU Public License (GPL), a copy
+of which may be found in /usr/share/common-licenses/GPL
diff --git a/debian/dirs b/debian/dirs
new file mode 100644
index 0000000..e772481
--- /dev/null
+++ b/debian/dirs
@@ -0,0 +1 @@
+usr/bin
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/menu b/debian/menu
new file mode 100644
index 0000000..ca70f2c
--- /dev/null
+++ b/debian/menu
@@ -0,0 +1,14 @@
+?package(e3):needs=text section=Apps/Editors\
+  title="e3em" command="/usr/bin/e3em"
+
+?package(e3):needs=text section=Apps/Editors\
+  title="e3vi" command="/usr/bin/e3vi"
+
+?package(e3):needs=text section=Apps/Editors\
+  title="e3pi" command="/usr/bin/e3pi"
+
+?package(e3):needs=text section=Apps/Editors\
+  title="e3ws" command="/usr/bin/e3ws"
+
+?package(e3):needs=text section=Apps/Editors\
+  title="e3ne" command="/usr/bin/e3ne"
\ No newline at end of file
diff --git a/debian/postinst b/debian/postinst
new file mode 100644
index 0000000..e37d579
--- /dev/null
+++ b/debian/postinst
@@ -0,0 +1,19 @@
+#!/bin/sh 
+
+set -e
+
+if [ "$1" = "configure" -o "$1" = "abort-upgrade" ] ; then
+
+    update-alternatives --install /usr/bin/editor editor /usr/bin/e3em 10 \
+        --slave /usr/share/man/man1/editor.1.gz editor.1.gz \
+                /usr/share/man/man1/e3em.1.gz
+    update-alternatives --install /usr/bin/emacs emacs /usr/bin/e3em 10 \
+        --slave /usr/share/man/man1/emacs.1.gz emacs.1.gz \
+                /usr/share/man/man1/e3em.1.gz
+    update-alternatives --install /usr/bin/vi vi /usr/bin/e3vi 10 \
+        --slave /usr/share/man/man1/vi.1.gz vi.1.gz \
+                /usr/share/man/man1/e3vi.1.gz
+fi
+
+#DEBHELPER#
+
diff --git a/debian/prerm b/debian/prerm
new file mode 100644
index 0000000..7e195b6
--- /dev/null
+++ b/debian/prerm
@@ -0,0 +1,13 @@
+#!/bin/sh
+#
+
+set -e
+
+if [ $1 != "upgrade" ]; then
+  update-alternatives --quiet --remove editor /bin/e3em
+  update-alternatives --quiet --remove vi /bin/e3vi
+  update-alternatives --quiet --remove emacs /bin/e3em
+fi
+
+#DEBHELPER#
+
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..c46b350
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,75 @@
+#!/usr/bin/make -f
+# Sample debian/rules that uses debhelper.
+# GNU copyright 1997 to 1999 by Joey Hess.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+# This is the debhelper compatability version to use.
+export DH_COMPAT=3
+
+configure: configure-stamp
+configure-stamp:
+	dh_testdir
+	# Add here commands to configure the package.
+
+	touch configure-stamp
+
+build: configure-stamp build-stamp
+build-stamp:
+	dh_testdir
+
+	# Add here commands to compile the package.
+	$(MAKE) PREFIX=/usr
+	#/usr/bin/docbook-to-man debian/e3.sgml > e3.1
+
+	touch build-stamp
+
+clean:
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp configure-stamp
+
+	# Add here commands to clean up after the build process.
+	-$(MAKE) clean
+
+	dh_clean
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+
+	# Add here commands to install the package into debian/tmp.
+	$(MAKE) install PREFIX=$(CURDIR)/debian/e3/usr
+
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build install
+#	dh_testversion
+	dh_testdir
+	dh_testroot
+#	dh_installdebconf	
+	dh_installdocs
+	dh_installexamples
+	dh_installmenu
+	dh_installman
+#	dh_installinfo
+#	dh_undocumented
+	dh_installchangelogs ChangeLog
+	dh_link
+#	dh_strip
+	dh_compress
+	dh_fixperms
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure
diff --git a/e3.asm b/e3.asm
index ef6f31e..9bb790a 100644
--- a/e3.asm
+++ b/e3.asm
@@ -811,7 +811,7 @@ CtrlTEnd1:call CheckEof
 KeyEmaCtrlW:mov ecx,[showblock]
 	cmp byte[mode],PI
 	jne NOPI1
-KECW:	jecxz KeyCtrlY
+KECW:	jecxz KeyCtrlY ; changed by cov
 	mov ecx,[EmaMark]
 	jecxz KECW
 	jmp short NOPI2