--- e3-2.71.orig/Makefile
+++ e3-2.71/Makefile
@@ -11,6 +11,7 @@
 
 # Set this to gzexe or upx if you want compression
 # COMPRESS=gzexe
+# COMPRESS=upx
 
 # 2. edit dest dir prefix if you want....
 
@@ -27,7 +28,7 @@
 
 BINDIR='$(PREFIX)/bin'
 MANSEC='1'
-MANDIR='$(PREFIX)/man/man$(MANSEC)'
+MANDIR='$(PREFIX)/share/man/man$(MANSEC)'
 
 
 #______________________do not edit below line________________________
@@ -62,11 +63,7 @@
 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 for running in gnu debugger
@@ -157,12 +154,17 @@
 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
 
 
@@ -171,6 +173,6 @@
 
 
 clean:
-	rm -f e3*.o e3*.lst e3 e3em e3pi e3vi e3ws e3ne *~ \
+	-rm -f e3*.o e3*.lst e3 e3em e3pi e3vi e3ws e3ne *~ \
 		PIPE_IN e3test~ e3test e3dync e3dync2 e3statc \
 		armlinux/*.o armlinux/e3arm
--- e3-2.71.orig/e3.asm
+++ e3-2.71/e3.asm
@@ -3663,6 +3663,32 @@
 	mov byte [eax],VI
 	ret
 NoVi:	cmp ecx,'e3ws'
+	jnz NoWs
+	mov byte [eax],WS
+	ret
+NoWs:	cmp ecx,'edit'
+	jnz NoNe2
+	mov byte [eax],NE
+	ret
+NoNe2:	cmp ecx,'macs'
+	jnz NoEm2
+	mov byte [eax],EM
+	ret
+NoEm2:	cmp ecx,'pico'
+	jnz NoPi2
+	mov byte [eax],PI
+	ret
+NoPi2:  push cx
+	mov cx,'__'
+	cmp ecx,'__vi'
+	pop cx
+	jnz NoVi2
+	mov byte [eax],VI
+	ret
+NoVi2:	push cx
+	mov cx,'__'
+	cmp ecx,'__ws'
+	pop cx
 	jnz modeOK
 	mov byte [eax],WS
 modeOK:	ret
--- e3-2.71.orig/debian/docs
+++ e3-2.71/debian/docs
@@ -0,0 +1 @@
+README
--- e3-2.71.orig/debian/watch
+++ e3-2.71/debian/watch
@@ -0,0 +1,4 @@
+version=3
+
+opts=dversionmangle=s/(\d)$/.$1/ \
+  http://mitglied.lycos.de/albkleine/ e3-(.+)\.tar\.gz
--- e3-2.71.orig/debian/compat
+++ e3-2.71/debian/compat
@@ -0,0 +1 @@
+5
--- e3-2.71.orig/debian/dirs
+++ e3-2.71/debian/dirs
@@ -0,0 +1 @@
+usr/bin
--- e3-2.71.orig/debian/prerm
+++ e3-2.71/debian/prerm
@@ -0,0 +1,13 @@
+#!/bin/sh
+#
+
+set -e
+
+if [ $1 != "upgrade" ]; then
+  update-alternatives --quiet --remove editor /usr/bin/e3em
+  update-alternatives --quiet --remove vi /usr/bin/e3vi
+  update-alternatives --quiet --remove emacs /usr/bin/e3em
+fi
+
+#DEBHELPER#
+
--- e3-2.71.orig/debian/menu
+++ e3-2.71/debian/menu
@@ -0,0 +1,14 @@
+?package(e3):needs="text" section="Applications/Editors"\
+  title="e3em" command="/usr/bin/e3em"
+
+?package(e3):needs="text" section="Applications/Editors"\
+  title="e3vi" command="/usr/bin/e3vi"
+
+?package(e3):needs="text" section="Applications/Editors"\
+  title="e3pi" command="/usr/bin/e3pi"
+
+?package(e3):needs="text" section="Applications/Editors"\
+  title="e3ws" command="/usr/bin/e3ws"
+
+?package(e3):needs="text" section="Applications/Editors"\
+  title="e3ne" command="/usr/bin/e3ne"
--- e3-2.71.orig/debian/copyright
+++ e3-2.71/debian/copyright
@@ -0,0 +1,27 @@
+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:
+  e3.asm v2.7.1 Copyright (C) 2000-2007 Albrecht Kleine <kleine@ak.sax.de>
+
+  This program 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 of the License, or
+  (at your option) any later version.
+
+  This program 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 program; if not, write to the Free Software Foundation,
+  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+
+License:
+  A copy of GNU General Public License version 2 may be found in
+  /usr/share/common-licenses/GPL-2
--- e3-2.71.orig/debian/changelog
+++ e3-2.71/debian/changelog
@@ -0,0 +1,223 @@
+e3 (1:2.71-1.4.201403210446) ucs4-0-0-0; urgency=low
+
+  * UCS auto build. No patches were applied to the original source package
+
+ -- Univention builddaemon <buildd@univention.de>  Fri, 21 Mar 2014 04:46:09 +0100
+
+e3 (1:2.71-1) unstable; urgency=low
+
+  * New upstream version
+  * General cleanup (lintian warnings, standards version, etc.)
+
+ -- Paweł Więcek <coven@debian.org>  Sat, 08 Mar 2008 14:31:17 +0100
+
+e3 (1:2.70-3) unstable; urgency=high
+
+  * Workaround upx problem appearing on *some* autobuilders by dropping upx
+    (closes: #383164)
+  * Urgency=high because it's release critical
+
+ -- Paweł Więcek <coven@debian.org>  Thu, 28 Dec 2006 22:15:13 +0100
+
+e3 (1:2.70-2) unstable; urgency=low
+
+  * Added support for calling as 'ws', 'emacs', 'pico', 'vi' or 'nedit'
+    (closes: #345173)
+  * Added kfreebsd-amd64 to arch list (closes: #361628)
+
+ -- Paweł Więcek <coven@debian.org>  Fri, 21 Apr 2006 23:14:02 +0200
+
+e3 (1:2.70-1) unstable; urgency=low
+
+  * New upstream version
+  * Updated to current debhelper
+
+ -- Pawel Wiecek <coven@debian.org>  Wed, 29 Mar 2006 23:32:05 +0200
+
+e3 (1:2.61-2) unstable; urgency=low
+
+  * Added kfreebsd-i386 to arch list (closes: #314337)
+  * Updated standards-version (no changes required)
+  * Updated debian/menu to current preferred format
+  * Fixed prerm (closes: #328284, #301784)
+
+ -- Pawel Wiecek <coven@debian.org>  Thu, 22 Sep 2005 21:33:34 +0200
+
+e3 (1:2.61-1) unstable; urgency=low
+
+  * New upstream version
+
+ -- Pawel Wiecek <coven@debian.org>  Sat,  8 Jan 2005 17:52:59 +0100
+
+e3 (1:2.50-1) unstable; urgency=low
+
+  * New upstream version
+  * Added amd64 support (closes: #249972)
+  * Updated standards version (no changes required)
+
+ -- Pawel Wiecek <coven@debian.org>  Wed,  9 Jun 2004 00:12:26 +0200
+
+e3 (1:2.43-1) unstable; urgency=low
+
+  * New upstream version
+
+ -- Pawel Wiecek <coven@debian.org>  Wed, 23 Apr 2003 15:11:24 +0200
+
+e3 (1:2.40-1) unstable; urgency=low
+
+  * New upstream version
+
+ -- Pawel Wiecek <coven@debian.org>  Mon, 14 Oct 2002 12:14:03 +0200
+
+e3 (1:2.33-1) unstable; urgency=low
+
+  * New upstream version
+
+ -- Pawel Wiecek <coven@debian.org>  Fri, 24 May 2002 13:40:06 +0200
+
+e3 (1:2.31-1) unstable; urgency=low
+
+  * New upstream version
+  * Fixed mistaken version numbering (closes: #144003)
+
+ -- Pawel Wiecek <coven@debian.org>  Tue, 23 Apr 2002 11:28:47 +0200
+
+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:
--- e3-2.71.orig/debian/postinst
+++ e3-2.71/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#
+
--- e3-2.71.orig/debian/control
+++ e3-2.71/debian/control
@@ -0,0 +1,24 @@
+Source: e3
+Section: editors
+Priority: optional
+Maintainer: Paweł Więcek <coven@debian.org>
+Build-Depends: debhelper (>= 5), nasm
+Standards-Version: 3.7.3
+Vcs-Browser: http://hg.svartech.com/debian/e3
+Vcs-Hg: http://hg.svartech.com/debian/e3
+Homepage: http://mitglied.lycos.de/albkleine/
+
+Package: e3
+Architecture: i386 kfreebsd-i386 amd64 kfreebsd-amd64
+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
--- e3-2.71.orig/debian/e3.lintian-overrides
+++ e3-2.71/debian/e3.lintian-overrides
@@ -0,0 +1 @@
+e3: statically-linked-binary ./usr/bin/e3
--- e3-2.71.orig/debian/rules
+++ e3-2.71/debian/rules
@@ -0,0 +1,73 @@
+#!/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
+
+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_lintian
+	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
