--- lynx-2.8.5.orig/debian/menu
+++ lynx-2.8.5/debian/menu
@@ -0,0 +1,13 @@
+?package(lynx):\
+  needs=text\
+  section=Apps/Net\
+  title="Lynx"\
+  hints="Web Browsers" \
+  kderemove=1 \
+  command="/usr/bin/lynx"
+?package(lynx):\
+  needs=dwww\
+  section=Apps/Net\
+  title="Lynx Manual"\
+  hints="Web Browser Manual" \
+  command="/usr/share/doc/lynx/lynx_help/lynx_help_main.html"
--- lynx-2.8.5.orig/debian/mime
+++ lynx-2.8.5/debian/mime
@@ -0,0 +1,2 @@
+text/html; /usr/bin/lynx -force_html %s; needsterminal; description=HTML Text; nametemplate=%s.html; priority=3
+text/html; /usr/bin/lynx -dump -force_html %s; copiousoutput; description=HTML Text; nametemplate=%s.html; priority=2
--- lynx-2.8.5.orig/debian/control
+++ lynx-2.8.5/debian/control
@@ -0,0 +1,22 @@
+Source: lynx
+Maintainer: James Troup <james@nocrew.org>
+Standards-Version: 3.6.0
+Section: web
+Priority: optional
+Build-Depends: libncursesw5-dev, zlib1g-dev, libbz2-dev, libgnutls11-dev, gettext, dpatch
+
+Package: lynx
+Architecture: any
+Depends: ${shlibs:Depends}
+Recommends: mime-support
+Conflicts: lynx-ssl
+Replaces: lynx-ssl
+Provides: www-browser, news-reader, lynx-ssl
+Description: Text-mode WWW Browser
+ Lynx is a fully-featured World Wide Web (WWW) client for users
+ running cursor-addressable, character-cell display devices (e.g.,
+ vt100 terminals, vt100 emulators running on PCs or Macs, or any other
+ "curses-oriented" display). It will display hypertext markup language
+ (HTML) documents containing links to files residing on the local
+ system, as well as files residing on remote systems running Gopher,
+ HTTP, FTP, WAIS, and NNTP servers.
--- lynx-2.8.5.orig/debian/desktop
+++ lynx-2.8.5/debian/desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Type=Application
+Exec=/usr/bin/lynx %u
+Name=Lynx
+Terminal=1
+Comment=Lynx
+Icon=html
+MimeType=text/html
+XClassHintResName=Lynx
--- lynx-2.8.5.orig/debian/prerm
+++ lynx-2.8.5/debian/prerm
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+case "$1" in
+    remove|deconfigure)
+        update-alternatives --quiet --remove www-browser /usr/bin/lynx
+	update-alternatives --quiet --remove lynx /usr/bin/lynx.stable
+        ;;
+    *)
+esac
--- lynx-2.8.5.orig/debian/rules
+++ lynx-2.8.5/debian/rules
@@ -0,0 +1,117 @@
+#! /usr/bin/make -f
+# debian/rules file - for lynx (2.8.5)
+# Based on sample debian/rules file - for GNU Hello (1.3).
+# Copyright 1994, 1995 by Ian Jackson.
+# Copyright 2002, 2003, 2004 James Troup
+# I hereby give you perpetual unlimited permission to copy,
+# modify and relicense this file, provided that you do not remove
+# my name from the file itself.  (I assert my moral right of
+# paternity under the Copyright, Designs and Patents Act 1988.)
+# This file may have to be extensively modified
+
+install_dir=install -d -m 755
+install_file=install -m 644
+install_script=install -m 755
+install_binary=install -m 755 -s
+
+include /usr/share/dpatch/dpatch.make
+
+build: patch-stamp
+	$(checkdir)
+	./configure --prefix=/usr \
+		    --libexecdir=/usr/lib --sysconfdir=/etc \
+		    --localstatedir=/var --libdir=/etc \
+		    --enable-warnings \
+		    --with-screen=ncursesw --enable-8bit-toupper \
+		    --enable-externs \
+		    --enable-cgi-links --enable-exec-links \
+		    --enable-exec-scripts \
+		    --enable-persistent-cookies --enable-nls \
+		    --enable-prettysrc --enable-source-cache \
+		    --enable-charset-choice \
+		    --enable-default-colors \
+		    --enable-ipv6 \
+		    --enable-nested-tables --enable-read-eta \
+		    --with-gnutls=/usr \
+		    --with-zlib \
+		    --with-bzlib
+	$(MAKE)
+	touch build
+
+clean: unpatch
+	$(checkdir)
+	-rm -rf build debian/tmp debian/files debian/substvars debian/patched
+	-(find . -type f -name \*~ | xargs rm)
+	-$(MAKE) distclean
+	-rm -f config.cache config.log lynx 
+
+binary-indep:
+
+binary-arch: checkroot build
+	$(checkdir)
+	-rm -rf debian/tmp/
+	$(install_dir) debian/tmp/DEBIAN/
+	$(install_script) debian/preinst debian/postinst debian/prerm debian/postrm debian/tmp/DEBIAN/
+	$(install_file) debian/conffiles debian/tmp/DEBIAN/
+
+	$(install_dir) debian/tmp/usr/bin/
+	$(install_binary) lynx debian/tmp/usr/bin/lynx.stable
+
+	$(install_dir) debian/tmp/etc/
+	$(install_file) lynx.cfg debian/tmp/etc/
+
+	$(install_dir) debian/tmp/usr/share/man/man1/
+	$(install_file) lynx.man debian/tmp/usr/share/man/man1/lynx.1
+	find debian/tmp/usr/share/man/ -type f -print | xargs gzip -9
+
+	$(install_dir) debian/tmp/usr/share/locale/
+	for f in po/*.gmo; do \
+		cat=`basename $$f`; \
+		lang=`echo $$cat | sed 's/\.gmo$$//'`; \
+		$(install_dir) debian/tmp/usr/share/locale/$$lang/LC_MESSAGES; \
+		$(install_file) $$f debian/tmp/usr/share/locale/$$lang/LC_MESSAGES/lynx.mo; \
+	done
+
+	$(install_dir) debian/tmp/usr/share/doc/lynx/
+	cp -R lynx_help debian/tmp/usr/share/doc/lynx/
+	cat CHANGES `ls docs/CHANGES* |sort -t . -rn -k 2,2 -k 3,3` \
+		> debian/tmp/usr/share/doc/lynx/changelog
+	$(install_file) docs/CRAWL.announce docs/FM.announce \
+		docs/README.chartrans PROBLEMS README \
+		samples/jumpsUnix.html samples/cernrules.txt \
+		samples/lynx-keymaps debian/tmp/usr/share/doc/lynx/
+	$(install_dir) debian/tmp/usr/share/doc/lynx/test/
+	$(install_file) test/* debian/tmp/usr/share/doc/lynx/test/
+	$(install_file) debian/changelog debian/tmp/usr/share/doc/lynx/changelog.Debian
+	$(install_file) debian/README.Debian debian/tmp/usr/share/doc/lynx/README.Debian
+	find debian/tmp/usr/share/doc/lynx -type f -maxdepth 1 | xargs gzip -9v
+	$(install_file) debian/copyright debian/tmp/usr/share/doc/lynx/
+
+	$(install_dir) debian/tmp/usr/lib/menu/
+	$(install_file) debian/menu debian/tmp/usr/lib/menu/lynx
+
+	$(install_dir) debian/tmp/usr/share/applnk/Internet
+	$(install_file) debian/desktop debian/tmp/usr/share/applnk/Internet/lynx.desktop
+
+	$(install_dir) debian/tmp/usr/lib/mime/packages/
+	$(install_file) debian/mime debian/tmp/usr/lib/mime/packages/lynx
+
+	dpkg-shlibdeps debian/tmp/usr/bin/lynx.stable
+	dpkg-gencontrol -isp
+	chown -R root.root debian/tmp/
+	chmod -R go=rX debian/tmp/
+	dpkg --build debian/tmp/ ..
+
+define checkdir
+	test -f src/LYMain.c -a -f debian/rules
+endef
+
+# Below here is fairly generic really
+
+binary: 	binary-indep binary-arch
+
+checkroot:
+	$(checkdir)
+	test root = "`whoami`"
+
+.PHONY: binary binary-arch binary-indep clean checkroot patch unpatch
--- lynx-2.8.5.orig/debian/conffiles
+++ lynx-2.8.5/debian/conffiles
@@ -0,0 +1 @@
+/etc/lynx.cfg
--- lynx-2.8.5.orig/debian/changelog
+++ lynx-2.8.5/debian/changelog
@@ -0,0 +1,555 @@
+lynx (2.8.5-2ubuntu0.5.04.1) hoary-security; urgency=low
+
+  * debian/patches/04_nntp-escapes.dpatch: Use the correct variable in the
+    StrAllocCopy() call in HTmmdecode().
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Fri, 28 Oct 2005 17:59:09 -0400
+
+lynx (2.8.5-2ubuntu0.5.04) hoary-security; urgency=low
+
+  * SECURITY UPDATE: Fix arbitrary code execution with malicious NNTP
+    articles.
+  * Add debian/patches/04_nntp-escapes.dpatch:
+    - HTrjis() did not check the buffer size when adding missing ESC
+      characters to certain strings (Asian character support), which lead to a
+      buffer overflow.
+    - Now handle the line buffer dynamically.
+    - Patch from upstream, ported to 2.8.5 by Tom Rini.
+  * CAN-2005-3120
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Thu, 13 Oct 2005 16:00:27 +0200
+
+lynx (2.8.5-2) unstable; urgency=low
+
+  * 03_newer_gnutls.dpatch: new patch from Torbjörn Wassberg to add
+    '-lgnutls-openssl' to LIBS to allow compilation with gnutls11.
+  * debian/control (Build-Depends): s/gnutls7/gnutls11/.  Closes: #264754
+
+ -- James Troup <james@nocrew.org>  Sun, 26 Sep 2004 13:36:41 +0100
+
+lynx (2.8.5-1) unstable; urgency=low
+
+  * New upstream release. Closes: #210948
+   * Should now build on the Hurd. Closes: #140682 
+   * -auth=id:pw no longer ignored when using -source or -dump. Closes: #156498 
+   * Default cookie Path is not correct. Closes: #181614 
+   * Can now switch to bookmarks under 'z'. Closes: #111463 
+   * Fixes only highlighting the first two lines of a hyperlink.  Closes: #114062, #124361
+   * Fixed missing space in german localisation. Closes: #116495 
+   * Fixed problems with wiki-login. Closes: #124025 
+   * No longer ignores Refresh: in HTTP headers. Closes: #126723
+   * Forms now sent using proper encoding. Closes: #156680 
+   * Fixes confusion of whereis query inside of long <select>. Closes: #159215 
+   * Fixes inconsistent rendering of superscript tag. Closes: #191798 
+   * -dump mode now has an option to put "footnote" marks after the hyperlink. Closes: #39905
+   * References can optionally follow text in ASCII output. Closes: #40952 
+   * Changed footnotes to display after links. Closes: #135442 
+   * File uploads are properly supported. Closes: #139948 
+   * config.{guess,sub} have been updated. Closes: #217994
+
+   * 03_euc-jp-blink.dpatch, 04_crlf-security.dpatch,
+     05_config-guess-sub.dpatch, 06_gnutls-support.dpatch: removed, merged
+     upstream.
+   * 01_default-config.dpatch: resynced with new config file.
+  
+  * debian/control (Priority): drop to optional.
+
+  * debian/rules (build): ask configure to use ncursesw instead of
+    ncurses for better UTF-8 support.
+  * debian/control (Build-Depends): likewise, switch to libncursesw5-dev.
+  
+  * debian/rules (build): pass --with-bzlib to enable bzip2 decompression.
+  * debian/control (Build-Depends): add libbz2-dev.
+
+  * debian/preinst: new file.  Undo diversions from old (potato-era)
+    lynx-ssl package.  Closes: #218180, #199755
+  * debian/rules (binary-arch): install it.
+
+  * debian/rules (binary-arch): install lynx as 'lynx.stable'.
+  * debian/postinst, prerm, postrm: use update-alternatives for lynx.
+    Closes: #117347
+
+ -- James Troup <james@nocrew.org>  Thu,  5 Feb 2004 21:27:00 +0000
+
+lynx (2.8.4.1b-6) unstable; urgency=low
+
+  * debian/postrm: don't remove lynx.cfg on purge; noticed by Christoph
+    Martin <martin@verwaltung.uni-mainz.de>.  Closes: #38230, #120775
+
+  * debian/control (Build-Depends): s/libgnutls5-dev/libgnutls7-dev/.
+    Closes: #202577
+
+  * debian/control (Standards-Version): bump to 3.6.0.
+
+  * 01_default-config.dpatch: set NNTPSERVER to 'news' rather than
+    'fania'.  Noticed by Jean Charles Delepine <delepine@u-picardie.fr>.
+    Closes: #162819
+
+  * debian/desktop: new file, provided by Ivan E. Moore II
+    <rkrusty@tdyc.com>.
+  * debian/rules (binary-arch): install debian/desktop.
+  * debian/menu: add 'kderemove=1'.  Closes: #96493
+
+ -- James Troup <james@nocrew.org>  Fri, 25 Jul 2003 15:51:36 -0400
+
+lynx (2.8.4.1b-5) unstable; urgency=low
+
+  * 06_gnutls-support.dpatch: new patch from Thomas Dickey
+    <dickey@invisible-island.net> to add support for GnuTLS's SSL-compat
+    layer.
+  * debian/rules (build): pass "--with-gnutls=/usr" to configure.
+  * debian/control (Build-Depends): add libgnutls5-dev.
+  * debian/control: add Conflicts, Replaces and Provides on lynx-ssl.
+
+  * debian/control (Standards-Version): bump to 3.5.9.0.
+  * debian/control: rewrap extended description at normal length.
+  * debian/build: depend on patch-stamp rather than patch.
+
+ -- James Troup <james@nocrew.org>  Sat,  3 May 2003 01:02:57 +0100
+
+lynx (2.8.4.1b-4) unstable; urgency=low
+
+  * Move to dpatch; existing non-debian/ changes split into
+    01_default-config.dpatch, 02_default-key-bindings.dpatch and
+    03_euc-jp-blink.dpatch.
+  * debian/rules (build): depend on patch.
+  * debian/rules (clean): depend on unpatch.  Remove debian/patched and
+    config.log.
+  * debian/rules (.PHONY): add 'patch' and 'unpatch'.
+
+  * debian/control (Build-Depends): add dpatch.
+  * debian/control (Standards-Version): bump to 3.5.8.0.
+  * debian/postinst, debian/prerm: no longer do /usr/doc symlinks.
+  * debian/copyright: fix 19995 (sic) typo.
+
+  * Patch from Joey Hess <joeyh@debian.org> for www-browser alternative,
+    closes: #169963, #161758.
+  * debian/postinst: provide www-browser alternative at priority 50.
+  * debian/prerm: de-provide www-browser alternative.
+
+  * debian/menu: patch from Ian Maclaine-cross <ian@ilm.mech.unsw.edu.au>
+    to fix path to documentation, closes: #132551.
+
+  * 04_crlf-security.dpatch: new; incorporates Ulf Harnhammar's fix for
+    the CRLF URL injection issue as described in DSA-210.  Closes: #173757
+
+  * 05_config-guess-sub.dpatch: Update config.guess and config.sub (both
+    to 2003-02-22).
+
+ -- James Troup <james@nocrew.org>  Thu, 27 Feb 2003 18:34:29 +0000
+
+lynx (2.8.4.1b-3) unstable; urgency=low
+
+  * Adopted the package, closes: #130830.
+  * debian/control (Standards-Version): bump to 3.5.6.0.
+  * debian/copyright: updated.
+  * debian/README.Debian: likewise.
+  * debian/postinst: remove commented and unused code.
+  * debian/prerm: likewise.
+  * debian/postrm: homogenize the code.
+  * debian/test.html: unused; removed.
+  * debian/dhelp: remove.
+  * debian/rules: rewritten so I can work with it.
+  * src/LYStrings.c, src/HTAlert.c: Apply patch from Hataguchi Takeshi to
+    fix blinking problems for euc-jp charset users, thanks to Atsuhito
+    Kohda.  Closes: #119510.
+
+ -- James Troup <james@nocrew.org>  Sat, 26 Jan 2002 00:12:32 +0000
+
+lynx (2.8.4.1b-2) unstable; urgency=low
+
+  * Orphaned this package.
+
+ -- Adrian Bunk <bunk@fs.tum.de>  Fri, 25 Jan 2002 13:01:16 +0100
+
+lynx (2.8.4.1b-1) unstable; urgency=high
+
+  * New upstream release.
+    - This release fixes some crashes in UTF-8 mode.
+      (closes: #112727)
+    - The CPU loop bug was fixed. (closes: #113298)
+  * Compiled without "--enable-file-upload" (there's a big
+    security hole in the file uploading code).
+  * Changed the default key bindings in src/LYEditmap.c to
+    "Bash-like Bindings". (closes: #43223)
+  * Compiled without "--enable-nsl-fork". (closes: #112081)
+  * Compiled without "--enable-justify-elts".
+    (closes: #109737, #111150, #115825)
+  * s/Web browser/Web browsers/ in debian/menu. (closes: #80048)
+
+ -- Adrian Bunk <bunk@fs.tum.de>  Sun, 21 Oct 2001 22:15:58 +0200
+
+lynx (2.8.4-2) unstable; urgency=low
+
+  * There wre two (commented out) definitions for COLOR:6 in the
+    default lynx.cfg. (closes: #109382)
+
+ -- Adrian Bunk <bunk@fs.tum.de>  Mon, 20 Aug 2001 21:45:53 +0200
+
+lynx (2.8.4-1) unstable; urgency=high
+
+  * New maintainer.
+  * New upstream release. (closes: #80496)
+    This release fixes the following bugs:
+    - %s, %t, %{charset} and %{encoding} substitutions for
+      mailcap commands are now implemented. (closes: #21096)
+    - The "<> in javascript causes premature </script>" problem
+      is fixed. (closes: #65151)
+    - A problem with the length of form fields is fixed.
+      (closes: #68542)
+    - The Japanese message catalog is now included.
+      (closes: #63641)
+    - The CPU-loop seems to be fixed. (closes: #25968)
+  * /etc/lynx.cfg is now a conffile. (closes: #40482)
+  * The default startfile is now the local helpfile (and there's
+    no longer a question in the postinst).
+    (closes: #105559, #83249, #83784)
+  * Disable USE_MOUSE in the default configuration.
+    (closes: #42859)
+  * Set GLOBAL_EXTENSION_MAP and PERSONAL_EXTENSION_MAP in the
+    default lynx.cfg. (closes: #94604)
+  * Compiled with ncurses instead of slang.
+  * Compiled with "--enable-warnings".
+  * Compiled with "--enable-color-style".
+  * Compiled with "--enable-default-colors". (closes: #45803)
+  * Compiled with "--enable-file-upload". (closes: #56639)
+  * Compiled with "--enable-ipv6".
+  * Compiled with "--enable-justify-elts".
+  * Compiled with "--enable-nested-tables".
+  * Compiled with "--enable-read-eta".
+  * Updated debian/copyright. (closes: #63638)
+
+ -- Adrian Bunk <bunk@fs.tum.de>  Sat, 18 Aug 2001 16:22:26 +0200
+
+lynx (2.8.3-1.5) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Update config.{guess,sub} to allow building on SH and others. (Closes: #95763)
+  * Set DEFAULT_EDITOR in lynx.cfg to /usr/bin/sensible-editor. (Closes: #94605)
+
+ -- André Dahlqvist <andre@debian.org>  Wed, 13 Jun 2001 05:45:56 +0200
+
+lynx (2.8.3-1.4) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Recompiled against sid's version of slang1.
+
+ -- Matthew Danish <mdanish@andrew.cmu.edu>  Mon, 23 Apr 2001 00:14:58 -0400
+
+lynx (2.8.3-1.3) unstable; urgency=low
+
+  * NMU
+  * Removed check for already done configuration in debian/config
+    so that dpkg-recofigure will be able to do its work. (Closes: #54237)
+
+ -- Gustavo Noronha Silva <kov@debian.org>  Sat, 21 Apr 2001 17:42:02 -0300
+
+lynx (2.8.3-1.2) unstable; urgency=low
+
+  * NMU
+  * Removed /etc/lynx.cfg from conffiles as it is handled by postinst
+    /etc/lynx-ssl.cfg is not there so: (Closes: #40482, #67836)
+  * Added german and pt_BR translations for the debconf template,
+    thanks to <Joerg.Rieger@informatik.med.uni-giessen.de> and
+    Gustavo Noronha Silva (KoV)" <kov@debian.org> there're 2 other
+    pt_BR and de templates wich I'll discard and close the bug 
+    (Closes: #83925, #83926, #92841, #93227) 
+  * closes french template translation bug as it was already added
+    in a earlier upload (Closes: #64785)
+  * Added hint to lynx in debian/menu (Closes: #80048)
+  * Removed about_wml directory from docdir as it was empty
+    (Closes: #64785)
+  * Updated debian/rules to use debian/lynx instead of debian/tmp
+  * Applied patches to upgrade to version lynx2.8.3rel.1c
+
+ -- Gustavo Noronha Silva <kov@debian.org>  Sat, 21 Apr 2001 15:57:30 -0300
+
+lynx (2.8.3-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fixed bug preventing -dump when TERM=dumb. (Closes: #64632)
+  * Lynx will no longer try to write file on full disk. (Closes: #63391)
+  * Changed deprecated 'isdefault' to 'seen' in debconf config.
+  * Fixed bug in intl/makefile.in, it did not remove libintl.h. (Closes: #63999)
+  * Fixed color scheme. (Closes: #32959)
+  * Added Swedish translation to templates. (Closes: #83482)
+  * Added French translation to templates. (Closes: #83767)
+  * Added Spanish translation to templates. (Closes: #92373)
+  * Fixed original source URL in copyright file. (Closes: #74551)
+  * Upload sponsored by Lenart Janos <ocsi@debian.org>.
+
+ -- Matthew Danish <mdanish@andrew.cmu.edu>  Sat, 14 Apr 2001 14:12:43 -0400
+
+lynx (2.8.3-1) frozen unstable; urgency=medium
+
+  * Upgraded to new upstream release. Buffer overflows fixed. (Closes: #59191)
+  * Disabled PREPEND_BASE_TO_SOURCE in default lynx.cfg. (Closes: #63000)
+  * Probably also fixes a bunch of other bugs, but I'll go through 
+    the bug list in -2.
+
+ -- Christian Hudon <chrish@debian.org>  Mon,  1 May 2000 21:54:42 -0400
+
+lynx (2.8.2-6) frozen unstable; urgency=low
+
+  * Disabled dhelp. (Closes: #55926, #56360)
+
+ -- Christian Hudon <chrish@debian.org>  Thu,  3 Feb 2000 22:03:23 -0500
+
+lynx (2.8.2-5) unstable; urgency=low
+
+  * Updated Source-Depends line. (Closes: #54256)
+  * Applied patch from Joey Hess to work around unknown debconf error.
+    (Closes: #53999, #54257, #54790)
+
+ -- Christian Hudon <chrish@debian.org>  Wed, 12 Jan 2000 20:43:55 -0500
+
+lynx (2.8.2-4) unstable; urgency=low
+
+  * Updated to standards version 3.1.1.1
+  * Added debconf support.
+
+ -- Christian Hudon <chrish@debian.org>  Fri, 31 Dec 1999 14:50:27 -0500
+
+lynx (2.8.2-3) unstable; urgency=medium
+
+  * Removed mailcap processing order patch, since it clashed with
+    upstream patch. (closes: #41199)
+  * Added ja.po Japanese translation of lynx and enabled a few more
+    switches (--enable-nls, --enable-source-cache and --enable-prettysrc).
+    (closes: #40958)
+  * Install more files from samples directory. (closes: #41153)
+  * Applied upstream patch to close telnet: security hole. (closes: #44001)
+  * Removed 'NO_STRING_INLINES' kludge in debian/rules.
+
+ -- Christian Hudon <chrish@debian.org>  Mon,  6 Sep 1999 22:39:47 -0400
+
+lynx (2.8.2-2) unstable; urgency=medium
+
+  * Recompiled with new slang1 to fix dependency bug.
+
+ -- Christian Hudon <chrish@debian.org>  Thu, 26 Aug 1999 00:01:42 -0400
+
+lynx (2.8.2-1) unstable; urgency=low
+
+  * New upstream version. Will fix Debian bugs in next release.
+
+ -- Christian Hudon <chrish@debian.org>  Sun, 13 Jun 1999 22:15:03 -0400
+
+lynx (2.8.1-7) unstable; urgency=low
+
+  * Fixed problem in postinst that caused spurious error message
+    to be printed when /etc/news/server did not exist. 
+    (closes: #37720, 37773)
+
+ -- Christian Hudon <chrish@debian.org>  Sun, 16 May 1999 22:54:48 -0400
+
+lynx (2.8.1-6) unstable; urgency=low
+
+  * Set default editor in lynx.cfg to /usr/bin/sensible-editor. 
+    (closes: #37509, #14728)
+  * Applied patch from Peter Samuelson to fix problems with postinst.
+    (closes: #31638)
+
+ -- Christian Hudon <chrish@debian.org>  Tue, 11 May 1999 21:05:51 -0400
+
+lynx (2.8.1-5) unstable; urgency=low
+
+  * Remove prcs files before packaging lynx for upload. (closes: #36962)
+  * Applied upstream patch to fix multiline <i> bug, etc. (closes #33158)
+
+ -- Christian Hudon <chrish@debian.org>  Mon, 10 May 1999 20:55:30 -0400
+
+lynx (2.8.1-4) unstable; urgency=low
+
+  * Filter out lines that start with a '#' in /etc/news/server
+    (closes: #31638).
+  * Fixed dhelp support (closes: #34479).
+  * Recompiled with glibc 2.1.1
+
+ -- Christian Hudon <chrish@debian.org>  Sun,  4 Apr 1999 22:27:49 -0400
+
+lynx (2.8.1-3) frozen unstable; urgency=medium
+
+  * Applied patch from OpenBSD to prevent lynx captive users from 
+    spawning a shell using rlogin/telnet URLs.
+  * Postinst now checks that the url given is absolute. (Closes bug #29177)
+  * Updated README.Debian file. (Closes bug #30488)
+  * Added dhelp support. (Closes bug #31159)
+  * Included some more files from the lynx source in /usr/doc/lynx
+    (Closes bug #30489)
+  * Applied upstream bugfix patches. (Closes bug #30487)
+  * Version 2.8.1 includes many small security fixes over 2.8 
+    (Closes bug #31985)
+
+ -- Christian Hudon <chrish@debian.org>  Sun, 17 Jan 1999 21:27:04 -0500
+
+lynx (2.8.1-2) unstable; urgency=low
+
+  * Build LYMainLoop.c with -D__NO_STRING_INLINES on powerpc to work around
+    egcs bug. (closes bug #29750)
+  * Modified postint so that lynx can be installed non-interactively.
+    (closes bug #28893).
+  * Removed unnecessary references to VMS in lynx.cfg
+  * Enabled use_mouse option by default.
+  * Lynx now obeys TMPDIR. (closes bug #21878)
+  * Documented how to set colors on a per-user basis in README.Debian
+    (partially solves bug #29469).
+  * Also closed a bunch of other bug reports that were fixed
+    in the 2.8 series.
+  * Added "lynx -dump" entry with copiousoutput in mailcap for mutt autoview.
+
+ -- Christian Hudon <chrish@debian.org>  Sat, 21 Nov 1998 22:00:32 -0500
+
+lynx (2.8.1-1) unstable; urgency=low
+
+  * New upstream version (fixes bug #28964)
+  * Enabled persistent cookies.
+  * Other bugfixes will go into next Debian release.
+
+ -- Christian Hudon <chrish@debian.org>  Wed, 11 Nov 1998 22:16:31 -0500
+
+lynx (2.8-4) frozen unstable; urgency=low
+
+  * Recompiled with slang1.
+
+ -- Christian Hudon <chrish@debian.org>  Sun, 18 Oct 1998 19:37:40 -0400
+
+lynx (2.8-3) unstable; urgency=low
+
+  * Upgraded to latest mime-support (fixes bug #12663, 23740, 24806)
+
+ -- Christian Hudon <chrish@debian.org>  Wed, 14 Oct 1998 20:52:06 -0400
+
+lynx (2.8-2) frozen unstable; urgency=HIGH
+
+  * Applied patch to fix buffer overflows in LYMail.c (fixes bug #22165, 22154)
+  * Removed doscs/CHANGES2-10 files that had been used for testing
+    of debian/rules.  
+  * Added section and priority to control file (fixes bug# 20420).
+  * Includes FSSTND-compliant compiled-in defaults for mime.types
+    and mailcap. (fixes bug #21441).
+  * Lynx now uses the first entry in the mailcap instead of the last one.
+    (fixes bugs #7595, 10247)
+
+ -- Christian Hudon <chrish@debian.org>  Sun, 31 May 1998 00:55:54 -0400
+
+lynx (2.8-1) unstable; urgency=low
+
+  * Upgraded to latest release (Fixes bug #19526)
+
+ -- Christian Hudon <chrish@debian.org>  Thu, 12 Mar 1998 13:57:49 -0500
+
+lynx (2.7.2-1) unstable; urgency=low
+
+  * SECURITY FIX: postinst now avoids using /tmp (Fixes bug #11771)
+  * Upgraded to new upstream release. (Fixes bug #16444)
+  * Recompiled for libc6. (Fixes bug #11704)
+  * Enabled multi-bookmarks support in userders.h
+  * Corrected tar path. (Fixes bug #12005)
+  * Compiled with -DNSL_FORK, so that users can abort hostname lookups
+    with the 'z' key. (Fixes bug #11586)
+  * Modified postinst so that prompting doesn't occur on abort-upgrade, etc.
+    (Fixes bug #12630)
+  * Postinst now handles URL with spaces better.. (Fixes bug #13137)
+  * Lynx now properly resets idle time (Fixes bug #11582)
+
+ -- Christian Hudon <chrish@debian.org>  Fri, 25 Feb 1998 17:22:22 -0500
+
+lynx (2.7.1-3) stable unstable; urgency=HIGH
+
+  * SECURITY FIX: applied patch from Foteos Macrides to prevent captive lynx
+    users from executing arbitrary commands.
+  * Applied one-line libc6 patch. (Fixes bug 8583)
+  * Applied patch from John E. Davis to correct screen redraw problem. 
+    (Fixes bug 6035 and 9406)
+  * Applied patch from Laura Eaves to fix 'underlined links' problem. 
+    (Fixes bug 7846)
+  * Applied patch from John E. Davis to fix "Control-Z on Unix can cause
+    aberrant behavior" bug.
+  * Applied patches from Foteos Macrides to fix bugs 8063 (lynx saves gzipped
+    files as not gzipped) and 7820 (lynx misinperprets ^G on quit 
+    confirmation).
+  * Added /usr/doc/lynx/README.Debian explaining how to fix 'colorless lynx'
+    problem (closes bug 10482) and how to get white background on black 
+    (closes bug 9320).
+  * Added location of upstream source to copyright file (fixes bug 11101)
+
+ -- Christian Hudon <chrish@debian.org>  Mon, 14 Jul 1997 21:15:42 +0000
+
+lynx (2.7.1-2) stable; urgency=medium
+
+  * Oops! Last version that was uploaded to stable depended on slang library
+    available only from frozen/unstable! Recompiled with slang packages
+    from stable.  (Fixes 9958, 9968)
+
+ -- Christian Hudon <chrish@debian.org>  Sun, 25 May 1997 00:04:55 +0000
+
+lynx (2.7.1-1) stable frozen unstable; urgency=HIGH
+
+  * Set TEMP_SPACE to ~/ as a temporary fix for the lynx /tmp 
+    security problem! (Lynx will happily follow symlinks found in /tmp...)
+  * Upgraded to upstream 2.7.1 bugfix release (Lynx 2.7 + upstream bugfix
+    patch + two more bugs fixed).
+  * Fixed typo in install-mime call of postinst (fixes 9213).
+  * Does not prompt user to enter their email address when sending mail
+    anymore.
+  * Applied patch from John E. Davis that fixes a buglet.
+  * Reenabled dired support, which had been disabled by mistake (fixes 8970).
+  * Applied patch from Fotoes Macrides that fixes two buglets discovered by
+    Rick Mallett during a Purify run.
+  * Made sure that lynxprog, lynxexec and lynxcgi are disabled in default 
+    lynx.cfg.
+
+ -- Christian Hudon <chrish@debian.org>  Fri, 16 May 1997 00:02:23 -0400
+
+lynx (2.7-2) frozen unstable; urgency=low
+
+  * Applied upstream bug fix patches for lynx 2.7 (Fixes bug 8090)
+  * Lynx now properly handles %-encoded characters in mailto URLs. (Fixes 4225)
+  * Lynx registers itself in /etc/mailcap for text/html (Fixes 7769, 7919)
+  * Set lynx.cfg default colors to black background. (Fixes 7866)
+  * Fixed bug 6120 (lynx can't find image/jpeg viewer).
+  * Fixed bug 4005 (lynx thinks *.deb is text/plain in ftp).
+  * Set compile-time XLOADIMAGE_COMMAND to "" since 
+    a) there's no garantee that xli/xv/whatever is installed
+    b) Debian's mailcap is populated automatically, so there's not much 
+       of a need for a default image viewer.
+    Closes bug 4909 and 4918
+  * Moved Lynx help files to /usr/doc but left them uncompressed, otherwise 
+    lynx's help function will break. (Fixes 8003)
+  * Lynx manual is now accessible under dwww.
+  * Removed VMS-related documentation from /usr/doc/lynx
+  * Lynx CHANGES* files are now installed as /usr/doc/lynx/changelog.gz
+
+ -- Christian Hudon <chrish@debian.org>  Sun, 30 Mar 1997 23:48:14 -0500
+
+lynx (2.7-1) unstable; urgency=low
+
+  * New upstream version.
+  * Added support for 'menu' package. Lynx menu entry is installed in Apps/Net.
+  * Compiled with slang instead of ncurses to get color support.
+
+ -- Christian Hudon <chrish@debian.org>  Wed, 26 Feb 1997 23:19:28 -0500
+
+lynx (2.6-2) unstable; urgency=low
+
+  * Added install-fvwm2menu support from Lars Wirzenius's patch.
+    (Until a more general 'install-menu' script comes along.)
+  * /etc/lynx.cfg is now removed when the lynx package is purged.
+  * lynx -dump has no problems with proxies now. (2964)
+  * Lynx postinst now attempts to pick a reasonable default for 
+    the default homepage (3469)
+
+ -- Christian Hudon <chrish@debian.org>  Sat, 19 Oct 1996 21:52:14 -0400
+
+lynx (2.6-1) unstable; urgency=medium
+
+  * Upgraded to latest upstream version. (4434, 2295)
+  * Converted to new source package format.
+  * Compiled in lynxexec/lynxprog/lynxcgi extensions. (2965)
+  * Enabled access to dot files. (3105)
+  * Version number such that dselect will not think 
+    we're downgrading. (3386)
+  * Removed extraneous space in extended description. (3606)
+
+ -- Christian Hudon <chrish@debian.org>  Tue, 24 Sep 1996 17:49:30 -0400
--- lynx-2.8.5.orig/debian/postinst
+++ lynx-2.8.5/debian/postinst
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" != configure ]; then exit 0; fi
+
+if [ -x /usr/bin/update-menus ]; then
+    update-menus
+fi
+
+if [ -x /usr/sbin/update-mime ]; then
+    update-mime
+fi
+
+update-alternatives --quiet --install /usr/bin/www-browser www-browser \
+       /usr/bin/lynx 50 \
+       --slave /usr/share/man/man1/www-browser.1.gz www-browser.1.gz \
+       /usr/share/man/man1/lynx.1.gz
+
+update-alternatives --quiet --install /usr/bin/lynx lynx /usr/bin/lynx.stable 20
--- lynx-2.8.5.orig/debian/README.Debian
+++ lynx-2.8.5/debian/README.Debian
@@ -0,0 +1,43 @@
+* Why does Lynx not display things in colour?
+
+ If you find that lynx does display things in colour, you may be using
+ the wrong terminal type. The terminal type "vt100" does not support
+ colour, but "linux" "xterm-color" and "xterm-debian" do.
+
+ Alternatively, you can invoke lynx as 'lynx -color' or set 
+ the COLORTERM environment variable to force the use of colours.
+
+* How do I get a white background on black text?
+
+ Use the following 'COLOR' definitions in your /etc/lynx.cfg file:
+
+ COLOR:0:black:white
+ COLOR:1:blue:white
+ COLOR:2:yellow:blue
+ COLOR:3:green:white
+ COLOR:4:magenta:white
+ COLOR:5:blue:white
+ COLOR:6:red:white
+ COLOR:7:magenta:cyan
+
+* Very nice, but I run a multi-user system and I want to be able to configure
+  colours on a per-user basis.
+
+ Quoting from the /etc/lynx.cfg file:
+
+ Starting with Lynx 2.8.1, the lynx.cfg file has a crude "include"
+ facility.  This means that you can take advantage of the global lynx.cfg
+ while also supplying your own tweaks.
+
+ You can use a command-line argument (-cfg /where/is/lynx.cfg) or an
+ environment variable (LYNX_CFG=/where/is/lynx.cfg).
+ For instance, put in your .profile or .login:
+
+   LYNX_CFG=~/lynx.cfg; export LYNX_CFG   # in .profile for sh/ksh/bash/etc.
+   setenv LYNX_CFG ~/lynx.cfg             # in .login for [t]csh
+
+ Then in ~/lynx.cfg:
+
+ INCLUDE:/etc/lynx.cfg
+ 
+ and now your own tweaks.
--- lynx-2.8.5.orig/debian/postrm
+++ lynx-2.8.5/debian/postrm
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+set -e
+
+if [ -x /usr/bin/update-menus ]; then 
+    update-menus
+fi
+
+if [ -x /usr/sbin/update-mime ]; then
+    update-mime
+fi
+
+if [ "$1" != "upgrade" ]; then
+  update-alternatives --remove lynx /usr/bin/lynx.stable
+fi
--- lynx-2.8.5.orig/debian/patches/03_newer_gnutls.dpatch
+++ lynx-2.8.5/debian/patches/03_newer_gnutls.dpatch
@@ -0,0 +1,46 @@
+#! /bin/sh -e
+## 03_newer_gnutls.dpatch by Torbjörn Wassberg
+##
+## DP: Update configure for libgnutls11.
+## DP: [FIXME: we shouldn't be editing configure directly]
+
+if [ $# -lt 1 ]; then
+    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
+
+case "$1" in
+    -patch) patch -p1 ${patch_opts} < $0;;
+    -unpatch) patch -R -p1 ${patch_opts} < $0;;
+    *)
+        echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+        exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+diff -urNad /home/james/debian/packages/lynx/lynx-2.8.5/configure lynx-2.8.5/configure
+--- /home/james/debian/packages/lynx/lynx-2.8.5/configure	2004-02-04 12:07:09.000000000 +0000
++++ lynx-2.8.5/configure	2004-09-26 13:32:42.614238703 +0100
+@@ -5944,7 +5944,7 @@
+ 
+ elif test "x$cf_cv_use_libgnutls" != xno ; then
+ 	
+-cf_ssl_library="-lgnutls-extra -lgnutls -lcrypt"
++cf_ssl_library="-lgnutls-extra -lgnutls-openssl -lgnutls -lcrypt"
+ case "$cf_cv_use_libgnutls" in #(vi
+ no) #(vi
+   ;;
+@@ -5956,7 +5956,7 @@
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+-LIBS="-lgnutls -lgnutls-extra -lgnutls -lcrypt $LIBS"
++LIBS="-lgnutls -lgnutls-extra -lgnutls-openssl -lgnutls -lcrypt $LIBS"
+ cat > conftest.$ac_ext <<EOF
+ #line 5962 "configure"
+ #include "confdefs.h"
--- lynx-2.8.5.orig/debian/patches/04_nntp-escapes.dpatch
+++ lynx-2.8.5/debian/patches/04_nntp-escapes.dpatch
@@ -0,0 +1,420 @@
+#!/bin/sh -e
+## 04_nntp-escapes.dpatch by  <martin.pitt@ubuntu.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+if [ $# -lt 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+case "$1" in
+       -patch) patch $patch_opts -p1 < $0;;
+       -unpatch) patch $patch_opts -p1 -R < $0;;
+        *)
+                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+                exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+diff -urNad --exclude=CVS --exclude=.svn ./WWW/Library/Implementation/HTMIME.c /tmp/dpep-work.WqOs5W/lynx-2.8.5/WWW/Library/Implementation/HTMIME.c
+--- ./WWW/Library/Implementation/HTMIME.c	2004-01-08 03:03:09.000000000 +0100
++++ /tmp/dpep-work.WqOs5W/lynx-2.8.5/WWW/Library/Implementation/HTMIME.c	2005-10-13 15:44:07.000000000 +0200
+@@ -2062,27 +2062,23 @@
+ **
+ **	Written by S. Ichikawa,
+ **	partially inspired by encdec.c of <jh@efd.lth.se>.
+-**	Assume caller's buffer is LINE_LENGTH bytes, these decode to
+-**	no longer than the input strings.
+ */
+-#define LINE_LENGTH 512		/* Maximum length of line of ARTICLE etc */
+-#ifdef ESC
+-#undef ESC
+-#endif /* ESC */
+ #include <LYCharVals.h>  /* S/390 -- gil -- 0163 */
+-#define ESC	CH_ESC
+ 
+ PRIVATE char HTmm64[] =
+     "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=" ;
+ PRIVATE char HTmmquote[] = "0123456789ABCDEF";
+ PRIVATE int HTmmcont = 0;
+ 
+-PUBLIC void HTmmdec_base64 ARGS2(
+-	char *,		t,
++PRIVATE void HTmmdec_base64 ARGS2(
++	char **,	t,
+ 	char *,		s)
+ {
+     int   d, count, j, val;
+-    char  buf[LINE_LENGTH], *bp, nw[4], *p;
++    char *buf, *bp, nw[4], *p;
++
++    if ((buf = malloc(strlen(s) * 3 + 1)) == 0)
++	outofmem(__FILE__, "HTmmdec_base64");
+ 
+     for (bp = buf; *s; s += 4) {
+ 	val = 0;
+@@ -2113,14 +2109,18 @@
+ 	    *bp++ = nw[2];
+     }
+     *bp = '\0';
+-    strcpy(t, buf);
++    StrAllocCopy(*t, buf);
++    FREE(buf);
+ }
+ 
+-PUBLIC void HTmmdec_quote ARGS2(
+-	char *,		t,
++PRIVATE void HTmmdec_quote ARGS2(
++	char **,	t,
+ 	char *,		s)
+ {
+-    char  buf[LINE_LENGTH], cval, *bp, *p;
++    char *buf, cval, *bp, *p;
++
++    if ((buf = malloc(strlen(s) + 1)) == 0)
++	outofmem(__FILE__, "HTmmdec_quote");
+ 
+     for (bp = buf; *s; ) {
+ 	if (*s == '=') {
+@@ -2147,23 +2147,27 @@
+ 	}
+     }
+     *bp = '\0';
+-    strcpy(t, buf);
++    StrAllocCopy(*t, buf);
++    FREE(buf);
+ }
+ 
+ /*
+ **	HTmmdecode for ISO-2022-JP - FM
+ */
+ PUBLIC void HTmmdecode ARGS2(
+-	char *,		trg,
++	char **,	trg,
+ 	char *,		str)
+ {
+-    char buf[LINE_LENGTH], mmbuf[LINE_LENGTH];
++    char *buf;
++    char *mmbuf = NULL;
++    char *m2buf = NULL;
+     char *s, *t, *u;
+     int  base64, quote;
+ 
+-    buf[0] = '\0';
+-
+-    for (s = str, u = buf; *s; ) {
++    if ((buf = malloc(strlen(str) + 1)) == 0)
++	outofmem(__FILE__, "HTmmdecode");
++  
++    for (s = str, u = buf; *s;) {
+ 	if (!strncasecomp(s, "=?ISO-2022-JP?B?", 16)) {
+ 	    base64 = 1;
+ 	} else {
+@@ -2181,11 +2185,14 @@
+ 			u--;
+ 		}
+ 	    }
++	    if (mmbuf == 0)	/* allocate buffer big enough for source */
++		StrAllocCopy(mmbuf, str);
+ 	    for (s += 16, t = mmbuf; *s; ) {
+ 		if (s[0] == '?' && s[1] == '=') {
+ 		    break;
+ 		} else {
+ 		    *t++ = *s++;
++		    *t = '\0';
+ 		}
+ 	    }
+ 	    if (s[0] != '?' || s[1] != '=') {
+@@ -2195,14 +2202,12 @@
+ 		*t = '\0';
+ 	    }
+ 	    if (base64)
+-		HTmmdec_base64(mmbuf, mmbuf);
++		HTmmdec_base64(&m2buf, mmbuf);
+ 	    if (quote)
+-		HTmmdec_quote(mmbuf, mmbuf);
+-	    for (t = mmbuf; *t; )
++		HTmmdec_quote(&m2buf, mmbuf);
++	    for (t = m2buf; *t; )
+ 		*u++ = *t++;
+ 	    HTmmcont = 1;
+-	    /* if (*s == ' ' || *s == '\t') *u++ = *s; */
+-	    /* for ( ; *s == ' ' || *s == '\t'; s++) ; */
+ 	} else {
+ 	    if (*s != ' ' && *s != '\t')
+ 		HTmmcont = 0;
+@@ -2211,7 +2216,10 @@
+     }
+     *u = '\0';
+ end:
+-    strcpy(trg, buf);
++    StrAllocCopy(*trg, buf);
++    FREE(m2buf);
++    FREE(mmbuf);
++    FREE(buf);
+ }
+ 
+ /*
+@@ -2219,22 +2227,27 @@
+ **  (The author of this function "rjis" is S. Ichikawa.)
+ */
+ PUBLIC int HTrjis ARGS2(
+-	char *,		t,
++	char **,	t,
+ 	char *,		s)
+ {
+-    char *p, buf[LINE_LENGTH];
++    char *p;
++    char *buf = NULL;
+     int kanji = 0;
+ 
+-    if (strchr(s, ESC) || !strchr(s, '$')) {
+-	if (s != t)
+-	    strcpy(t, s);
++    if (strchr(s, CH_ESC) || !strchr(s, '$')) {
++	if (s != *t)
++	    StrAllocCopy(*t, s);
+ 	return 1;
+     }
++
++    if ((buf = malloc(strlen(s) * 2 + 1)) == 0)
++	outofmem(__FILE__, "HTrjis");
++
+     for (p = buf; *s; ) {
+ 	if (!kanji && s[0] == '$' && (s[1] == '@' || s[1] == 'B')) {
+ 	    if (HTmaybekanji((int)s[2], (int)s[3])) {
+ 		kanji = 1;
+-		*p++ = ESC;
++		*p++ = CH_ESC;
+ 		*p++ = *s++;
+ 		*p++ = *s++;
+ 		*p++ = *s++;
+@@ -2246,7 +2259,7 @@
+ 	}
+ 	if (kanji && s[0] == '(' && (s[1] == 'J' || s[1] == 'B')) {
+ 	    kanji = 0;
+-	    *p++ = ESC;
++	    *p++ = CH_ESC;
+ 	    *p++ = *s++;
+ 	    *p++ = *s++;
+ 	    continue;
+@@ -2255,7 +2268,8 @@
+     }
+     *p = *s;	/* terminate string */
+ 
+-    strcpy(t, buf);
++    StrAllocCopy(*t, buf);
++    FREE(buf);
+     return 0;
+ }
+ 
+diff -urNad --exclude=CVS --exclude=.svn ./WWW/Library/Implementation/HTMIME.h /tmp/dpep-work.WqOs5W/lynx-2.8.5/WWW/Library/Implementation/HTMIME.h
+--- ./WWW/Library/Implementation/HTMIME.h	2003-01-22 10:43:13.000000000 +0100
++++ /tmp/dpep-work.WqOs5W/lynx-2.8.5/WWW/Library/Implementation/HTMIME.h	2005-10-13 15:44:07.000000000 +0200
+@@ -67,20 +67,12 @@
+   For handling Japanese headers.
+ 
+ */
+-extern void HTmmdec_base64 PARAMS((
+-	char *	t,
+-	char *	s));
+-
+-extern void HTmmdec_quote PARAMS((
+-	char *	t,
+-	char *	s));
+-
+ extern void HTmmdecode PARAMS((
+-	char *	trg,
++	char **	trg,
+ 	char *	str));
+ 
+ extern int HTrjis PARAMS((
+-	char *	t,
++	char **	t,
+ 	char *	s));
+ 
+ extern int HTmaybekanji PARAMS((
+diff -urNad --exclude=CVS --exclude=.svn ./WWW/Library/Implementation/HTNews.c /tmp/dpep-work.WqOs5W/lynx-2.8.5/WWW/Library/Implementation/HTNews.c
+--- ./WWW/Library/Implementation/HTNews.c	2004-01-08 03:03:09.000000000 +0100
++++ /tmp/dpep-work.WqOs5W/lynx-2.8.5/WWW/Library/Implementation/HTNews.c	2005-10-13 15:44:07.000000000 +0200
+@@ -940,7 +940,6 @@
+     }
+ }
+ 
+-#ifdef SH_EX	/* for MIME */
+ #ifdef NEWS_DEBUG
+ /* for DEBUG 1997/11/07 (Fri) 17:20:16 */
+ void debug_print(unsigned char *p)
+@@ -962,45 +961,15 @@
+ }
+ #endif
+ 
+-static char *decode_mime(char *str)
++static char *decode_mime(char **str)
+ {
+-    char temp[LINE_LENGTH];	/* FIXME: what determines the actual size? */
+-    char *p, *q;
+-
+-    if (str == NULL)
+-	return "";
+-
++#ifdef SH_EX
+     if (HTCJK != JAPANESE)
+-	return str;
+-
+-    LYstrncpy(temp, str, sizeof(temp) - 1);
+-    q = temp;
+-    while ((p = strchr(q, '=')) != 0) {
+-	if (p[1] == '?') {
+-	    HTmmdecode(p, p);
+-	    q = p + 2;
+-	} else {
+-	    q = p + 1;
+-	}
+-    }
+-#ifdef NEWS_DEBUG
+-    printf("new=[");
+-    debug_print(temp);
++	return *str;
+ #endif
+-    HTrjis(temp, temp);
+-    strcpy(str, temp);
+-
+-    return str;
+-}
+-#else /* !SH_EX */
+-static char *decode_mime ARGS1(char *, str)
+-{
+-    HTmmdecode(str, str);
+-    HTrjis(str, str);
+-    return str;
++    HTmmdecode(str, *str);
++    return HTrjis(str, *str) ? *str : "";
+ }
+-#endif
+-
+ 
+ /*	Read in an Article					read_article
+ **	------------------
+@@ -1087,22 +1056,22 @@
+ 
+ 		} else if (match(full_line, "SUBJECT:")) {
+ 		    StrAllocCopy(subject, HTStrip(strchr(full_line,':')+1));
+-		    decode_mime(subject);
++		    decode_mime(&subject);
+ 		} else if (match(full_line, "DATE:")) {
+ 		    StrAllocCopy(date, HTStrip(strchr(full_line,':')+1));
+ 
+ 		} else if (match(full_line, "ORGANIZATION:")) {
+ 		    StrAllocCopy(organization,
+ 				 HTStrip(strchr(full_line,':')+1));
+-		    decode_mime(organization);
++		    decode_mime(&organization);
+ 
+ 		} else if (match(full_line, "FROM:")) {
+ 		    StrAllocCopy(from, HTStrip(strchr(full_line,':')+1));
+-		    decode_mime(from);
++		    decode_mime(&from);
+ 
+ 		} else if (match(full_line, "REPLY-TO:")) {
+ 		    StrAllocCopy(replyto, HTStrip(strchr(full_line,':')+1));
+-		    decode_mime(replyto);
++		    decode_mime(&replyto);
+ 
+ 		} else if (match(full_line, "NEWSGROUPS:")) {
+ 		    StrAllocCopy(newsgroups, HTStrip(strchr(full_line,':')+1));
+@@ -1711,8 +1680,8 @@
+ 	int,		last_required)
+ {
+     char line[LINE_LENGTH+1];
+-    char author[LINE_LENGTH+1];
+-    char subject[LINE_LENGTH+1];
++    char *author = NULL;
++    char *subject = NULL;
+     char *date = NULL;
+     int i;
+     char *p;
+@@ -1725,7 +1694,6 @@
+     int status, count, first, last;	/* Response fields */
+ 					/* count is only an upper limit */
+ 
+-    author[0] = '\0';
+     START(HTML_HEAD);
+     PUTC('\n');
+     START(HTML_TITLE);
+@@ -1946,8 +1914,8 @@
+ 			case 'S':
+ 			case 's':
+ 			    if (match(line, "SUBJECT:")) {
+-				LYstrncpy(subject, line+9, sizeof(subject)-1);/* Save subject */
+-				decode_mime(subject);
++				StrAllocCopy(subject, line + 9);
++				decode_mime(&subject);
+ 			    }
+ 			    break;
+ 
+@@ -1964,10 +1932,8 @@
+ 			case 'F':
+ 			    if (match(line, "FROM:")) {
+ 				char * p2;
+-				LYstrncpy(author,
+-					author_name(strchr(line,':')+1),
+-					sizeof(author)-1);
+-				decode_mime(author);
++				StrAllocCopy(author, strchr(line, ':') + 1);
++				decode_mime(&author);
+ 				p2 = author + strlen(author) - 1;
+ 				if (*p2==LF)
+ 				    *p2 = '\0'; /* Chop off newline */
+@@ -1988,11 +1954,8 @@
+ 
+ 		PUTC('\n');
+ 		START(HTML_LI);
+-#ifdef SH_EX	/* for MIME */
+-		HTSprintf0(&temp, "\"%s\"", decode_mime(subject));
+-#else
+-		HTSprintf0(&temp, "\"%s\"", subject);
+-#endif
++		p = decode_mime(&subject);
++		HTSprintf0(&temp, "\"%s\"", NonNull(p));
+ 		if (reference) {
+ 		    write_anchor(temp, reference);
+ 		    FREE(reference);
+@@ -2001,18 +1964,14 @@
+ 		}
+ 		FREE(temp);
+ 
+-		if (author[0] != '\0') {
++		if (author != NULL) {
+ 		     PUTS(" - ");
+ 		     if (LYListNewsDates)
+ 			 START(HTML_I);
+-#ifdef SH_EX	/* for MIME */
+-		     PUTS(decode_mime(author));
+-#else
+-		     PUTS(author);
+-#endif
++		    PUTS(decode_mime(&author));
+ 		     if (LYListNewsDates)
+ 			 END(HTML_I);
+-		     author[0] = '\0';
++		    FREE(author);
+ 		}
+ 		if (date) {
+ 		    if (!diagnostic) {
+@@ -2055,6 +2014,8 @@
+ 		MAYBE_END(HTML_LI);
+ 	    } /* Handle response to HEAD request */
+ 	} /* Loop over article */
++	FREE(author);
++	FREE(subject);
+     } /* If read headers */
+     PUTC('\n');
+     if (LYListNewsNumbers)
--- lynx-2.8.5.orig/debian/patches/00list
+++ lynx-2.8.5/debian/patches/00list
@@ -0,0 +1,4 @@
+01_default-config
+02_default-key-bindings
+03_newer_gnutls
+04_nntp-escapes
--- lynx-2.8.5.orig/debian/patches/01_default-config.dpatch
+++ lynx-2.8.5/debian/patches/01_default-config.dpatch
@@ -0,0 +1,214 @@
+#!/bin/sh -e
+## 01_default-config.dpatch (originally) by Adrian Bunk <bunk@fs.tum.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix the default config for Debian. 
+
+if [ $# -lt 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+case "$1" in
+       -patch) patch $patch_opts -p1 < $0;;
+       -unpatch) patch $patch_opts -p1 -R < $0;;
+        *)
+                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+                exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+diff -urNad /home/james/debian/packages/lynx/lynx-2.8.5/lynx.cfg lynx-2.8.5/lynx.cfg
+--- /home/james/debian/packages/lynx/lynx-2.8.5/lynx.cfg	2004-01-28 19:30:38.000000000 +0000
++++ lynx-2.8.5/lynx.cfg	2004-02-05 16:38:31.000000000 +0000
+@@ -92,7 +92,7 @@
+ #
+ # Normally we expect you will connect to a remote site, e.g., the Lynx starting
+ # site:
+-STARTFILE:http://lynx.isc.org/
++STARTFILE:file://localhost/usr/share/doc/lynx/lynx_help/lynx_help_main.html
+ #
+ # As an alternative, you may want to use a local URL.  A good choice for this is
+ # the user's home directory:
+@@ -115,7 +115,7 @@
+ # http://www.subir.com/lynx/lynx_help/lynx_help_main.html
+ #   This should be changed to the local path.
+ #
+-HELPFILE:http://www.subir.com/lynx/lynx_help/lynx_help_main.html
++HELPFILE:file://localhost/usr/share/doc/lynx/lynx_help/lynx_help_main.html
+ .ex
+ #HELPFILE:file://localhost/PATH_TO/lynx_help/lynx_help_main.html
+ 
+@@ -489,7 +489,7 @@
+ # compatibility problems with other browsers, see also PREPEND_BASE_TO_SOURCE.
+ # Note that the prepending is not done for -source dumps.
+ #
+-#PREPEND_CHARSET_TO_SOURCE:TRUE
++PREPEND_CHARSET_TO_SOURCE:FALSE
+ 
+ 
+ .h2 NCR_IN_BOOKMARKS
+@@ -932,8 +932,8 @@
+ # executed.  This is much less dangerous than enabling all execution
+ # links, but can still be dangerous.
+ #
+-#LOCAL_EXECUTION_LINKS_ALWAYS_ON:FALSE
+-#LOCAL_EXECUTION_LINKS_ON_BUT_NOT_REMOTE:FALSE
++LOCAL_EXECUTION_LINKS_ALWAYS_ON:FALSE
++LOCAL_EXECUTION_LINKS_ON_BUT_NOT_REMOTE:FALSE
+ 
+ 
+ .h2 TRUSTED_EXEC
+@@ -981,7 +981,7 @@
+ # as well (i.e., they will only be able to access lynxexec or lynxprog
+ # URLs which meet any ALWAYS_TRUSTED_EXEC rules).
+ #
+-#TRUSTED_EXEC:none
++TRUSTED_EXEC:none
+ 
+ 
+ .h2 ALWAYS_TRUSTED_EXEC
+@@ -1003,7 +1003,7 @@
+ #
+ # The default ALWAYS_TRUSTED_EXEC rule is "none".
+ #
+-#ALWAYS_TRUSTED_EXEC:none
++ALWAYS_TRUSTED_EXEC:none
+ 
+ 
+ .h2 TRUSTED_LYNXCGI
+@@ -1023,7 +1023,7 @@
+ # ====
+ # Do not define this.
+ #
+-#TRUSTED_LYNXCGI:none
++TRUSTED_LYNXCGI:none
+ 
+ 
+ .h2 LYNXCGI_ENVIRONMENT
+@@ -1120,7 +1120,7 @@
+ # The news reading facility in Lynx is quite limited.  Lynx does not provide a
+ # full featured news reader with elaborate error checking and safety features.
+ #
+-#NNTPSERVER:news.server.dom
++NNTPSERVER:news
+ 
+ 
+ .h2 LIST_NEWS_NUMBERS
+@@ -1581,7 +1581,7 @@
+ # unless you know EVERY user will know how to use it;
+ # users can easily define their own editor in the Options Menu.
+ #
+-#DEFAULT_EDITOR:
++DEFAULT_EDITOR: /usr/bin/sensible-editor
+ 
+ 
+ .h2 SYSTEM_EDITOR
+@@ -1772,7 +1772,7 @@
+ # and not forced TRUE, the user can regulate it via the 'o'ptions menu (and
+ # may save the preference in the RC file).
+ #
+-#NO_DOT_FILES:TRUE
++NO_DOT_FILES:TRUE
+ 
+ 
+ .h1 Internal Behavior
+@@ -2019,7 +2019,7 @@
+ # the command line, and the latter switch overrides the setting of the
+ # PREPEND_BASE_TO_SOURCE configuration variable.
+ #
+-#PREPEND_BASE_TO_SOURCE:TRUE
++PREPEND_BASE_TO_SOURCE:FALSE
+ 
+ 
+ # MIME types and viewers!
+@@ -2055,13 +2055,13 @@
+ #
+ # Unix:
+ # ====
+-#GLOBAL_EXTENSION_MAP:/usr/local/lib/mosaic/mime.types
++GLOBAL_EXTENSION_MAP:/etc/mime.types
+ # VMS:
+ # ===
+ #GLOBAL_EXTENSION_MAP:Lynx_Dir:mime.types
+ #
+ #	Unix (sought in user's home directory):
+-#PERSONAL_EXTENSION_MAP:.mime.types
++PERSONAL_EXTENSION_MAP:.mime.types
+ #	VMS (sought in user's sys$login directory):
+ #PERSONAL_EXTENSION_MAP:mime.types
+ 
+@@ -2237,7 +2237,7 @@
+ # XLOADIMAGE_COMMAND definition.
+ # If you use xli, you may want to add the -quiet flag.
+ #
+-#XLOADIMAGE_COMMAND:xli %s &
++XLOADIMAGE_COMMAND:
+ 
+ .h2 VIEWER
+ # MIME types may be assigned to external viewers using
+@@ -2301,7 +2301,7 @@
+ #
+ # Unix:
+ # ====
+-#GLOBAL_MAILCAP:/usr/local/lib/mosaic/mailcap
++GLOBAL_MAILCAP:/etc/mailcap
+ # VMS:
+ # ===
+ #GLOBAL_MAILCAP:Lynx_Dir:mailcap
+@@ -2879,9 +2879,8 @@
+ #   blue          magenta        cyan          lightgray
+ #   gray          brightred      brightgreen   yellow
+ #   brightblue    brightmagenta  brightcyan    white
++#   default
+ .fi
+-# or (if you have configured using --enable-default-colors with ncurses or
+-# slang), "default" may be used for foreground and background.
+ #
+ # Note that in most cases a white background is really "lightgray", since
+ # terminals generally do not implement bright backgrounds.
+@@ -2894,8 +2893,7 @@
+ #COLOR:3:green:white
+ #COLOR:4:magenta:white
+ #COLOR:5:blue:white
+-#COLOR:6:red:white
+-COLOR:6:brightred:black
++#COLOR:6:brightred:black
+ #COLOR:7:magenta:cyan
+ 
+ 
+diff -urNad /home/james/debian/packages/lynx/lynx-2.8.5/userdefs.h lynx-2.8.5/userdefs.h
+--- /home/james/debian/packages/lynx/lynx-2.8.5/userdefs.h	2004-02-02 20:02:28.000000000 +0000
++++ lynx-2.8.5/userdefs.h	2004-02-05 16:38:16.000000000 +0000
+@@ -296,7 +296,7 @@
+  * Mappings in these global and personal files override any SUFFIX
+  * definitions in lynx.cfg and built-in defaults from src/HTInit.c.
+  */
+-#define GLOBAL_EXTENSION_MAP "/usr/local/lib/mosaic/mime.types"
++#define GLOBAL_EXTENSION_MAP "/etc/mime.types"
+ #define PERSONAL_EXTENSION_MAP ".mime.types"
+ 
+ /**************************
+@@ -306,7 +306,7 @@
+  * Mappings in these global and personal files override any VIEWER
+  * definitions in lynx.cfg and built-in defaults from src/HTInit.c.
+  */
+-#define GLOBAL_MAILCAP "/usr/local/lib/mosaic/mailcap"
++#define GLOBAL_MAILCAP "/etc/mailcap"
+ #define PERSONAL_MAILCAP ".mailcap"
+ 
+ /**************************
+@@ -324,7 +324,7 @@
+  * use any default viewers for image types.  Note that open is used as
+  * the default for NeXT, instead of the XLOADIMAGE_COMMAND definition.
+  */
+-#define XLOADIMAGE_COMMAND "xli %s &"
++#define XLOADIMAGE_COMMAND NULL
+ 
+ /**************************
+  * For UNIX systems, SYSTEM_MAIL and SYSTEM_MAIL_FLAGS are set by the
--- lynx-2.8.5.orig/debian/patches/02_default-key-bindings.dpatch
+++ lynx-2.8.5/debian/patches/02_default-key-bindings.dpatch
@@ -0,0 +1,53 @@
+#! /bin/sh -e
+## 02-default_key_bindings.dpatch (originally) by Adrian Bunk <bunk@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix the default key bindings to be "Bash-like" for Debian.
+## DP: This fixes the behaviour of the delete key (cf. #43223).
+
+if [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+case "$1" in
+    -patch) patch -f --no-backup-if-mismatch -p0 < $0;;
+    -unpatch) patch -f --no-backup-if-mismatch -R -p0 < $0;;
+    *)
+	echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+	exit 1;;
+esac
+
+exit 0
+--- src/LYEditmap.c~
++++ src/LYEditmap.c
+@@ -929,10 +929,11 @@
+  */
+ 
+ PUBLIC LYEditCode * LYLineEditors[]={
+-        DefaultEditBinding,     /* You can't please everyone, so you ... DW */
+-#ifdef EXP_ALT_BINDINGS
+-	BetterEditBinding,      /* No, you certainly can't ... /ked 10/27/98*/
+-	BashlikeEditBinding,      /* and one more... - kw 1999-02-15 */
++        BashlikeEditBinding,      /* and one more... - kw 1999-02-15 */
++	DefaultEditBinding,     /* You can't please everyone, so you ... DW */
++        BetterEditBinding,      /* No, you certainly can't ... /ked 10/27/98*/
++#ifndef EXP_ALT_BINDINGS
++#error Debian specific: EXP_ALT_BINDINGS must be set
+ #endif
+ };
+ 
+@@ -941,10 +942,11 @@
+  * The order of LYLineEditors and LYLineditNames MUST be the same.
+  */
+ PUBLIC char * LYLineeditNames[]={
++        "Bash-like Bindings",
+ 	"Default Binding",
+-#ifdef EXP_ALT_BINDINGS
+-	"Alternate Bindings",
+-	"Bash-like Bindings",
++        "Alternate Bindings",
++#ifndef EXP_ALT_BINDINGS
++#error Debian specific: EXP_ALT_BINDINGS must be set
+ #endif
+ 	(char *) 0
+ };
--- lynx-2.8.5.orig/debian/copyright
+++ lynx-2.8.5/debian/copyright
@@ -0,0 +1,36 @@
+This is the Debian GNU prepackaged version of the Lynx Hypertext
+navigation system.
+
+This package was put together by Christian Hudon <chrish@debian.org>
+from sources obtained from: 
+
+  http://lynx.isc.org/release/
+
+It was previously maintained by Adrian Bunk <bunk@fs.tum.de> and is
+currently being maintained by James Troup <james@nocrew.org>.
+
+lynx is Copyright (C) 1995 University of Kansas.
+
+  lynx 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; version 2 dated June, 1991.
+
+  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
+  with your Debian GNU system, in /usr/share/common-licenses/GPL, or
+  with the Debian GNU lynx source package as the file COPYING.  If
+  not, write to the Free Software Foundation, Inc., 59 Temple Place,
+  Suite 330, Boston, MA 02111-1307, USA.
+
+  Any licensing or usage questions should be directed to Michael
+  Grobe <grobe@ukans.edu>.
+
+Lynx was built over an early version of the Common Code Library
+developed by the CERN WWW Project. That code is copyrighted by CERN.
+Lynx contains other sections of code that are copyrighted by other
+institutions or individuals. The Lynx copyright does not override or
+invalidate those copyrights.
--- lynx-2.8.5.orig/debian/preinst
+++ lynx-2.8.5/debian/preinst
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+set -e
+
+# Undo diversions by old (potato) lynx-ssl package
+if [ "$1" = upgrade -o "$1" = install ]; then
+  if dpkg-divert --list | grep -q "/usr/bin/lynx.nossl.*lynx-ssl"; then
+        dpkg-divert --package lynx-ssl --remove --rename \
+        --divert /usr/bin/lynx.nossl /usr/bin/lynx
+  fi
+  if dpkg-divert --list | grep -q "/usr/share/man/man1/lynx.nossl.1.gz.*lynx-ssl"; then
+    dpkg-divert --package lynx-ssl --remove --rename \
+        --divert /usr/share/man/man1/lynx.nossl.1.gz /usr/share/man/man1/lynx.1.gz
+  fi
+fi