New upstream release 1.6

The documentation is free now, add texinfo back to Build-Depends.
The non-free RFC got removed upstream.
debian/patches/00_build_dfsg.patch: Remove.
debian/tarball.sh: No need to strip documentation anymore.
Update debian/copyright file.

5 files changed, 45 insertions, 72 deletions

diff --git a/debian/changelog b/debian/changelog
index d69b32d..cf78f83 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,11 @@
-inetutils (2:1.5.dfsg.1-10) UNRELEASED; urgency=low
+inetutils (2:1.6-1) UNRELEASED; urgency=low
 
+  * New upstream release.
+    - The documentation is free now, add texinfo back to Build-Depends.
+    - The non-free RFC got removed upstream.
+    - debian/patches/00_build_dfsg.patch: Remove.
+    - debian/tarball.sh: No need to strip documentation anymore.
+    - Update debian/copyright file.
   * Switch to debhelper compatibility level 7.
   * Use dh_prep instead of “dh_clean -k”.
   * Remove RCS keywords from packaging files.
diff --git a/debian/control.in b/debian/control.in
index 311ce7e..c8ee88a 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -7,7 +7,7 @@ Standards-Version: 3.8.0
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-inetutils/
 Vcs-Svn: svn://svn.debian.org/pkg-inetutils/trunk/
 Homepage: http://www.gnu.org/software/inetutils/
-Build-Depends: debhelper (>= 7), quilt (>= 0.40), autoconf, automake,
+Build-Depends: debhelper (>= 7), quilt (>= 0.40), autoconf, automake, texinfo,
  bison, libreadline5-dev | libreadline-dev, libpam0g-dev, libopie-dev,
  libwrap0-dev, libshishi-dev
 Build-Conflicts: autoconf2.13, automake1.4
diff --git a/debian/copyright b/debian/copyright
index e127bc3..5ffedb5 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -9,70 +9,64 @@ from sources obtained from:
 
 The source code is covered by the following copyrights and licenses:
 
-* The doc/ directory was removed from the original tarball, and the
-  tarball repacked as it contained GFDL'd material, and a non-free RFC.
+* Documentation under doc/ copyrighted by:
 
-* Files utmp_{login,init}.{c,h} under libinetutils:
-
-    Copyright © 1995 Wietse Venema
+    Copyright © 1994-1996, 2000-2001, 2007-2008 Free Software Foundation, Inc.
 
   under the following license:
 
-    This material was originally written and compiled by Wietse Venema at
-    Eindhoven University of Technology, The Netherlands, in 1990, 1991,
-    1992, 1993, 1994 and 1995.
-
-    Redistribution and use in source and binary forms are permitted
-    provided that this entire copyright notice is duplicated in all such
-    copies.
+    Permission is granted to copy, distribute and/or modify this
+    document under the terms of the GNU Free Documentation License,
+    Version 1.2 or any later version published by the Free Software
+    Foundation; with no Invariant Sections, with no Front-Cover Texts,
+    and with no Back-Cover Texts.  A copy of the license is included
+    in the section entitled "GNU Free Documentation License".
 
-    This software is provided "as is" and without any expressed or implied
-    warranties, including, without limitation, the implied warranties of
-    merchantibility and fitness for any particular purpose.
+  On Debian systems, the complete text of the GNU Free Documentation
+  License can be found in '/usr/share/common-licenses/GFDL'.
 
-* Files under gwhois/ directory:
+* Some additional files (esp. Makefiles, gwhois/, hostname/, ifconfig/
+  libicmp/, libinetutils/, ping/, etc), are copyrigthed by:
 
-    Copyright © 1999 Marco d'Itri
+    Copyright © 1985-2008 Free Software Foundation, Inc.
 
   under the following license:
 
-    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; version 2.
+    GNU Inetutils 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 3 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.
+    GNU Inetutils 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
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+    02110-1301 USA.
 
-* Some additional files (esp. Makefiles), are copyrigthed by:
+  On Debian systems, the complete text of the GNU General Public
+  License can be found in '/usr/share/common-licenses/GPL-3'.
 
-    Copyright © 1985-2008 Free Software Foundation, Inc.
-    Copyright © 2002, 2003, 2007 Simon Josefsson
+* Files utmp_{login,init}.{c,h} under libinetutils/:
 
-  under the following license:
+    Copyright © 1995 Wietse Venema
 
-    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.
+  under the following license:
 
-    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.
+    This material was originally written and compiled by Wietse Venema at
+    Eindhoven University of Technology, The Netherlands, in 1990, 1991,
+    1992, 1993, 1994 and 1995.
 
-    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 Street, Fifth Floor, Boston,
-    MA 02110-1301 USA.
+    Redistribution and use in source and binary forms are permitted
+    provided that this entire copyright notice is duplicated in all such
+    copies.
 
-  On Debian systems, the complete text of the GNU General
-  Public License can be found in '/usr/share/common-licenses/GPL-2'.
+    This software is provided "as is" and without any expressed or implied
+    warranties, including, without limitation, the implied warranties of
+    merchantibility and fitness for any particular purpose.
 
 * Most source files:
 
diff --git a/debian/patches/00_build_dfsg.patch b/debian/patches/00_build_dfsg.patch
deleted file mode 100644
index 554ad8c..0000000
--- a/debian/patches/00_build_dfsg.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: b/configure.ac
-===================================================================
---- a/configure.ac
-+++ b/configure.ac
-@@ -794,5 +794,5 @@ ifconfig/Makefile
- ifconfig/system/Makefile
- confpaths.h:confpaths.h.in
- headers/Makefile
--doc/Makefile doc/rfc/Makefile])
-+])
- AC_OUTPUT
-Index: b/Makefile.am
-===================================================================
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -25,7 +25,7 @@ EXTRA_DIST = README-alpha paths ChangeLo
- SUBDIRS = lib headers libinetutils libtelnet glob \
- 	inetd telnetd libls ftpd rshd rlogind uucpd rexecd syslogd tftpd \
- 	talkd telnet ftp rsh rcp rlogin tftp logger gwhois talk \
--	libicmp ping doc ifconfig
-+	libicmp ping ifconfig
- 
- DISTCLEANFILES = pathdefs.make paths.defs include/*.h include/*/*.h \
- 	include/stamp-h
diff --git a/debian/tarball.sh b/debian/tarball.sh
index 4f3d026..6fdcc22 100755
--- a/debian/tarball.sh
+++ b/debian/tarball.sh
@@ -41,9 +41,6 @@ TARBALLDIR="$PKG-$SNAPSHOTVERSION"
 cp -al $SRCDIR $TARBALLDIR
 
 echo "-> cleaning snapshot."
-# Clean non-free stuff
-rm -rf $TARBALLDIR/doc/
-
 # Clean cvs stuff
 find $TARBALLDIR -name 'CVS' -o -name '.cvsignore' | xargs rm -rf