--- netrik-1.16.1.orig/AUTHORS
+++ netrik-1.16.1/AUTHORS
@@ -25,7 +25,7 @@
    Karol Pietrzak
 
 build system:
-   Sören Schulze
+   S�ren Schulze
 
 other important contributors: (suggestions, discussions, testing etc.)
    Hans-Georg Bork
--- netrik-1.16.1.orig/debian/changelog
+++ netrik-1.16.1/debian/changelog
@@ -1,53 +1,68 @@
-netrik (1.16.1-0) UNRELEASED; urgency=low
+netrik (1.16.1-1) unstable; urgency=low
 
-  * New upstream release
-    + use ncursesw instead of ncurses
+  * new upstream release (Closes: #549095)
+  * ack Rhondas NMU
+  * changed build-dep to automake
+  * bumped standards to 3.8.3 (no changes needed)
+  * debian/control: added {misc:Depends}, bumped dh_compat to 7
 
- -- antrik <antrik@users.sf.net>  Sat, 20 Jun 2009 13:56:19 +0200
+ -- Edelhard Becker <edelhard@debian.org>  Mon, 05 Oct 2009 21:41:04 +0200
 
-netrik (1.16-0) UNRELEASED; urgency=low
+netrik (1.15.7-2.1) unstable; urgency=low
 
-  * New upstream release
-    + add 'l' command
+  * Non-maintainer upload to link against libncursesw5 (closes: #504023):
+    - Build-Depend on libncursesw5-dev instead of libncurses5.dev.
+    - #include <ncursesw/curses.h> instead of <curses.h>.
+    - #include <ncursesw/term.h> instead of <term.h>.
+    - Use -lncursesw instead of -lncurses in configure.ac.
 
- -- antrik <antrik@users.sf.net>  Wed, 15 Oct 2008 20:32:44 +0200
+ -- Gerfried Fuchs <rhonda@debian.at>  Wed, 05 Nov 2008 10:16:58 +0100
 
-netrik (1.15.8-0) UNRELEASED; urgency=low
+netrik (1.15.7-2) unstable; urgency=low
 
-  * New upstream release
-    + fix some redirects (handle HTTP hearders case-insensitively)
+  * aargh: instead of my dumb ad-hoc "solution" use the syntax from
+    http://lintian.debian.org/reports/tags/debian-rules-ignores-make-clean-error.html
+    in make clean (Closes: #476231)
 
- -- antrik <antrik@users.sf.net>  Mon, 18 Dec 2006 08:43:13 +0100
+ -- Edelhard Becker <edelhard@debian.org>  Tue, 15 Apr 2008 11:14:45 +0200
 
-netrik (1.15.7-0) UNRELEASED; urgency=low
-
-  * New upstream release
-    + fix parsing of utf8 documents in iso-8859 locale
-  * Correct version number in previous entry
-
- -- antrik <antrik@users.sf.net>  Mon, 18 Dec 2006 08:43:13 +0100
-
-netrik (1.15.6-0) UNRELEASED; urgency=low
-
-  * New upstream release
-    + fixed a crash, and a bug with link reactivation after text search
+netrik (1.15.7-1) unstable; urgency=low
 
- -- antrik <antrik@users.sf.net>  Mon, 18 Dec 2006 08:43:13 +0100
-
-netrik (1.15.5-0) UNRELEASED; urgency=low
-
-  * New upstream release
-    + Fix security problem with <textarea>
-
- -- antrik <antrik@users.sf.net>  Mon, 18 Dec 2006 08:43:13 +0100
-
-netrik (1.15.4-0) UNRELEASED; urgency=low
-
-  * New upstream release
-    + Added dummy User-Agent: header
-    + fixed a few crashes/bugs
+  * new upstream release
+  * fixed watch file to fetch sources from sf.net properly
+  * debian/rules: added more stuff to the clean target
+  * fixed lintian warnings:
+      - debian-rules-ignores-make-clean-error: remove '-'
+      - bumped standards to 3.7.3: after menu update
+      - moved homepage from description to control field
+      - build-depends-on-1-revision: now b-d on libncurses5-dev (>= 5.4)
+      - manpage-has-errors-from-man: move '&' to end of previous line
+      - package-contains-empty-directory usr/sbin/: no more
+      - doc-base-unknown-section: moved to Network/Web Browsing
+      - old-fsf-address-in-copyright-file: updated
+      - menu-item-uses-apps-section/menu-item-creates-new-section: moved to
+        Applications/Network/Web Browsing
+  * as of 1.15.4 upstream sends a User-Agent: header (Closes: #349364)
+
+ -- Edelhard Becker <edelhard@debian.org>  Mon, 14 Apr 2008 18:18:45 +0200
+
+netrik (1.15.3-1.2) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * debian/rules
+    - fixed FTBFS if built twice in a row (Closes: #424595)
+  * debian/control
+    - updated build-dep on automake1.4 (Closes: #398313)
+
+ -- Sandro Tosi <matrixhasu@gmail.com>  Sun, 13 Apr 2008 23:50:08 +0200
+
+netrik (1.15.3-1.1) unstable; urgency=high
+
+  * NMU by the Security Team:
+  * Sanitise file names to prevent execution of arbitrary shell commands.
+    (CVE-2006-6678, patch by Steve Kemp)
 
- -- antrik <antrik@users.sf.net>  Sat,  7 Oct 2006 21:06:38 +0200
+ -- Moritz Muehlenhoff <jmm@debian.org>  Sun, 24 Dec 2006 18:12:26 +0100
 
 netrik (1.15.3-1) unstable; urgency=low
 
@@ -55,14 +70,14 @@
 
  -- Edelhard Becker <edelhard@debian.org>  Thu, 30 Dec 2004 01:50:34 +0100
 
-netrik (1.15.3_0) UNRELEASED; urgency=low
+netrik (1.15.3_0) unstable; urgency=low
 
   * New upstream release
     + fixed a serious HTML parsing bug
 
  -- antrik <antrik@users.sf.net>  Mon, 20 Dec 2004 23:37:41 +0100
 
-netrik (1.15.2_0) UNRELEASED; urgency=low
+netrik (1.15.2_0) unstable; urgency=low
 
   * New upstream release
     + updated/improved build system
@@ -70,7 +85,7 @@
 
  -- antrik <antrik@users.sf.net>  Mon, 15 Nov 2004 01:14:08 +0100
 
-netrik (1.15.1_0) UNRELEASED; urgency=low
+netrik (1.15.1_0) unstable; urgency=low
 
   * New upstream release
     + fixed handling of <meta>
@@ -83,7 +98,7 @@
 
  -- Edelhard Becker <edelhard@debian.org>  Fri, 30 Apr 2004 19:53:33 +0200
 
-netrik (1.15.0-0) UNRELEASED; urgency=low
+netrik (1.15.0-0) unstable; urgency=low
 
   * New upstream release
     + more parser fixes/improvements
@@ -98,21 +113,21 @@
 
  -- Edelhard Becker <edelhard@debian.org>  Tue, 20 Apr 2004 15:35:05 +0200
 
-netrik (1.14.0-0) UNRELEASED; urgency=low
+netrik (1.14.0-0) unstable; urgency=low
 
   * New upstream release
     + improved/more correct HTML error handling and reporting
 
  -- antrik <antrik@users.sf.net>  Mon, 19 Apr 2004 17:14:23 +0200
 
-netrik (1.13.0-0) UNRELEASED; urgency=low
+netrik (1.13.0-0) unstable; urgency=low
 
   * New upstream release
     + don't print repeated HTML error messages
 
  -- antrik <antrik@users.sf.net>  Fri,  5 Mar 2004 08:24:24 +0100
 
-netrik (1.12.1-0) UNRELEASED; urgency=low
+netrik (1.12.1-0) unstable; urgency=low
 
   * New upstream release
     + fixed two small but critical bugs
@@ -125,7 +140,7 @@
 
  -- Edelhard Becker <edelhard@debian.org>  Mon,  8 Sep 2003 12:26:26 +0200
 
-netrik (1.12.0-0) UNRELEASED; urgency=low
+netrik (1.12.0-0) unstable; urgency=low
 
   * New upstream release
     + add (simple) b/w mode
@@ -163,7 +178,7 @@
 
  -- Edelhard Becker <edelhard@debian.org>  Fri, 30 May 2003 18:06:00 +0200
 
-netrik (1.10.2-0) UNRELEASED; urgency=low
+netrik (1.10.2-0) unstable; urgency=low
 
   * New upstream release
     + fixed link highlighting
@@ -185,7 +200,7 @@
 
  -- Edelhard Becker <becker@edelhard.de>  Thu,  8 May 2003 16:47:13 +0200
 
-netrik (1.10.1-0) UNRELEASED; urgency=low
+netrik (1.10.1-0) unstable; urgency=low
 
   * New upstream release
     + include debian control files in upstream tarball
--- netrik-1.16.1.orig/debian/compat
+++ netrik-1.16.1/debian/compat
@@ -1 +1 @@
-4
+7
--- netrik-1.16.1.orig/debian/control
+++ netrik-1.16.1/debian/control
@@ -2,13 +2,14 @@
 Section: web
 Priority: optional
 Maintainer: Edelhard Becker <edelhard@debian.org>
-Build-Depends: debhelper (>= 4), libncurses5-dev (>= 5.3.20030510-1), automake
-Standards-Version: 3.6.1
+Build-Depends: debhelper (>= 7), libncursesw5-dev (>= 5.4), automake
+Standards-Version: 3.8.3
+Homepage: http://netrik.sourceforge.net/
 
 Package: netrik
 Architecture: any
 Provides: www-browser
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: text mode WWW browser with vi like keybindings
  Netrik is an advanced text mode WWW browser. Its purpose is to give access to
  as much of the Web as possible in text mode, without forsaking any comfort.
@@ -22,4 +23,3 @@
    Command prompt, menus and online help
  .
   Author: Olaf D. Buddenhagen AKA antrik <antrik@users.sourceforge.net>
-  Homepage: http://netrik.sourceforge.net/
--- netrik-1.16.1.orig/debian/copyright
+++ netrik-1.16.1/debian/copyright
@@ -8,7 +8,7 @@
 
 Upstream Author: Olaf D. Buddenhagen AKA antrik <antrik@users.sourceforge.net>
 
-Copyright (C) Olaf D. Buddenhagen AKA antrik, et al (see AUTHORS)
+Copyright: 2001 - 2009 Olaf D. Buddenhagen AKA antrik, et al (see AUTHORS)
 
 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
@@ -21,8 +21,9 @@
 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+along with this program; if not, write to the
+  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+  MA 02110-1301, USA.
 
 On Debian systems, the complete text of the GNU General Public License can be
 found in the file `/usr/share/common-licenses/GPL'.
--- netrik-1.16.1.orig/debian/dirs
+++ netrik-1.16.1/debian/dirs
@@ -1,2 +1 @@
 usr/bin
-usr/sbin
--- netrik-1.16.1.orig/debian/netrik.doc-base
+++ netrik-1.16.1/debian/netrik.doc-base
@@ -5,7 +5,7 @@
  access to as much of the Web as possible in text mode, without forsaking any
  comfort.  The user interface is looking roughly like a combination of gVim and
  PINE.
-Section: web
+Section: Network/Web Browsing
 
 Format: HTML
 Index: /usr/share/doc/netrik/index.html
--- netrik-1.16.1.orig/debian/netrik.menu
+++ netrik-1.16.1/debian/netrik.menu
@@ -1,4 +1,4 @@
-?package(netrik):needs="text" section="Apps/Net" title="netrik" \
+?package(netrik):needs="text" section="Applications/Network/Web Browsing" title="netrik" \
 	longtitle="netrik - the Antrik Internet browser" \
 	description="A text mode browser" \
 	command="/usr/bin/netrik http://netrik.sourceforge.net/"
--- netrik-1.16.1.orig/debian/rules
+++ netrik-1.16.1/debian/rules
@@ -56,21 +56,18 @@
 	# rm -f configure install-sh mkinstalldirs missing Makefile.in aclocal.m4 build-stamp confdefs.h config.guess config.sub 
 
 	# Add here commands to clean up after the build process.
-	-$(MAKE) distclean
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
-	cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
-	cp -f /usr/share/misc/config.guess config.guess
-endif
+	[ ! -f Makefile ] || $(MAKE) distclean
 
+	rm -f doc/README Makefile.in aclocal.m4 config.h.in configure \
+		debian/Makefile.in depcomp doc/Makefile.in \
+		doc/*.html doc/*.txt install-sh missing config.guess config.sub 
 
 	dh_clean
 
 install: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k
+	dh_prep
 	dh_installdirs
 	mkdir -p $(DESTDIR)/usr/share/lintian/overrides
 	cp -p debian/netrik.overrides $(DESTDIR)/usr/share/lintian/overrides/netrik
--- netrik-1.16.1.orig/debian/watch
+++ netrik-1.16.1/debian/watch
@@ -1,6 +1,3 @@
-# Example watch control file for uscan
-# Rename this file to "watch" and then you can run the "uscan" command
-# to check for upstream updates and more.
 # Site/Directory/Pattern							Version	Script
-version=2
-http://switch.dl.sourceforge.net/sourceforge/sourceforge/netrik/netrik-(.*)\.tar\.gz	debian	uupdate
+version=3
+http://sf.net/netrik/netrik-(.*).tar.gz
--- netrik-1.16.1.orig/debian/netrik.overrides
+++ netrik-1.16.1/debian/netrik.overrides
@@ -0,0 +1,3 @@
+# for test purpose, netrik includes an empty file
+
+netrik: zero-byte-file-in-doc-directory usr/share/doc/netrik/test/empty.html
--- netrik-1.16.1.orig/doc/netrik.1
+++ netrik-1.16.1/doc/netrik.1
@@ -67,8 +67,8 @@
 .B --clean-html
 Do not abort on HTML syntax errors. Error descriptions are printed for every
 syntax error (or warning), but \fBnetrik\fP tries to parse the page anyhow.
-Workarounds are used for some typical syntax errors (e.g. unescaped '<' or
-'&' characters); other errors are ignored. After the whole page is loaded,
+Workarounds are used for some typical syntax errors (e.g. unescaped '<' or '&'
+characters); other errors are ignored. After the whole page is loaded,
 if some error(s) were found, a warning message is printed (according to the
 severity of the worst encountered bug), and the pager starts after a
 keypress.
--- netrik-1.16.1.orig/doc/netrikrc.5
+++ netrik-1.16.1/doc/netrikrc.5
@@ -47,8 +47,8 @@
 .B --clean-html
 Do not abort on HTML syntax errors. Error descriptions are printed for every
 syntax error (or warning), but \fBnetrik\fP tries to parse the page anyhow.
-Workarounds are used for some typical syntax errors (e.g. unescaped '<' or
-'&' characters); other errors are ignored. After the whole page is loaded,
+Workarounds are used for some typical syntax errors (e.g. unescaped '<' or '&'
+characters); other errors are ignored. After the whole page is loaded,
 if some error(s) were found, a warning message is printed (according to the
 severity of the worst encountered bug), and the pager starts after a
 keypress.