DFSG clean, needed changes

Refresh patches. Disable the doc/ dir. Do not Build-Depend on texinfo
anymore, there's not info docs anymore.

7 files changed, 47 insertions, 48 deletions

diff --git a/debian/changelog b/debian/changelog
index dda3fff..5e49961 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,12 @@ inetutils (2:1.5.dfsg.1-1) UNRELEASED; urgency=low
   * New upstream release.
     - Remove non-free RFC. (Closes: #393376)
     - Remove non-free GFDL documentation.
+    - debian/patches/00_build_dfsg.patch: New file. Disable the doc/ dir.
+    - debian/patches/00_no_link_extralibs.patch: Renamed to ...
+    - debian/patches/01_no_link_extralibs.patch: ... this. Partially merged
+      upstream.
+    - debian/patches/11_inetd_doc.patch: Remove. Merged upstream.
+  * Do not Build-Depend on texinfo anymore, there's not info docs anymore.
   * Fix Jeff Bailey's email address.
 
  -- Guillem Jover <guillem@debian.org>  Thu,  5 Oct 2006 01:02:39 +0300
diff --git a/debian/control.in b/debian/control.in
index 43b3d34..da5c86f 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -5,7 +5,7 @@ Maintainer: Guillem Jover <guillem@debian.org>
 Uploaders: Jeff Bailey <jbailey@raspberryginger.com>, Marcus Brinkmann <brinkmd@debian.org>
 Standards-Version: 3.7.2
 Build-Depends: debhelper (>= 5), quilt (>= 0.40), autoconf, automake1.9,
- texinfo, bison, libreadline5-dev | libreadline-dev, libpam0g-dev, libopie-dev,
+ bison, libreadline5-dev | libreadline-dev, libpam0g-dev, libopie-dev,
  libwrap0-dev
 Build-Conflicts: autoconf2.13, automake1.4
 
diff --git a/debian/patches/00_build_dfsg.patch b/debian/patches/00_build_dfsg.patch
new file mode 100644
index 0000000..f23dcba
--- /dev/null
+++ b/debian/patches/00_build_dfsg.patch
@@ -0,0 +1,24 @@
+Index: inetutils-1.5/configure.ac
+===================================================================
+--- inetutils-1.5.orig/configure.ac	2006-10-23 07:55:10.000000000 +0300
++++ inetutils-1.5/configure.ac	2006-10-23 07:55:23.000000000 +0300
+@@ -794,5 +794,5 @@ ifconfig/Makefile
+ ifconfig/system/Makefile
+ confpaths.h:confpaths.h.in
+ headers/Makefile
+-doc/Makefile doc/rfc/Makefile])
++])
+ AC_OUTPUT
+Index: inetutils-1.5/Makefile.am
+===================================================================
+--- inetutils-1.5.orig/Makefile.am	2006-10-23 07:55:27.000000000 +0300
++++ inetutils-1.5/Makefile.am	2006-10-23 07:55:36.000000000 +0300
+@@ -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/patches/00_no_link_extralibs.patch b/debian/patches/00_no_link_extralibs.patch
deleted file mode 100644
index 5d32bf8..0000000
--- a/debian/patches/00_no_link_extralibs.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-#DPATCHLEVEL=0
-Index: configure.ac
-===================================================================
---- configure.ac.orig	2006-04-20 12:53:13.000000000 +0300
-+++ configure.ac	2006-10-03 07:53:32.000000000 +0300
-@@ -131,12 +131,12 @@ AC_PROG_YACC
- gl_INIT
- 
- ### Checks for libraries.
--AC_CHECK_LIB(bsd, revoke)
-+#AC_CHECK_LIB(bsd, revoke)
- AC_CHECK_LIB(nsl, inet_ntoa)
- AC_CHECK_LIB(resolv, gethostname)
- AC_CHECK_LIB(socket, getpeername)
- AC_CHECK_LIB(opie, opiegenerator)
--AC_CHECK_LIB(z, gzdopen)
-+#AC_CHECK_LIB(z, gzdopen)
- 
- # See if a termcap library is available (under one of several names)
- IU_LIB_TERMCAP
diff --git a/debian/patches/01_no_link_extralibs.patch b/debian/patches/01_no_link_extralibs.patch
new file mode 100644
index 0000000..843973c
--- /dev/null
+++ b/debian/patches/01_no_link_extralibs.patch
@@ -0,0 +1,14 @@
+#DPATCHLEVEL=0
+Index: configure.ac
+===================================================================
+--- configure.ac.orig	2006-10-21 14:57:04.000000000 +0300
++++ configure.ac	2006-10-23 07:48:53.000000000 +0300
+@@ -131,7 +131,7 @@ AC_PROG_YACC
+ gl_INIT
+ 
+ ### Checks for libraries.
+-AC_CHECK_LIB(bsd, revoke)
++#AC_CHECK_LIB(bsd, revoke)
+ AC_CHECK_LIB(nsl, inet_ntoa)
+ AC_CHECK_LIB(resolv, gethostname)
+ AC_CHECK_LIB(socket, getpeername)
diff --git a/debian/patches/11_inetd_doc.patch b/debian/patches/11_inetd_doc.patch
deleted file mode 100644
index 802336a..0000000
--- a/debian/patches/11_inetd_doc.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Index: inetd/inetd.8
-===================================================================
---- inetd/inetd.8.orig	2006-10-04 05:05:20.000000000 +0300
-+++ inetd/inetd.8	2006-10-04 05:08:09.000000000 +0300
-@@ -27,7 +27,7 @@
- .\"
- .\"     @(#)inetd.8	8.4 (Berkeley) 6/1/94
- .\"
--.Dd June 1, 1994
-+.Dd 2006-10-04
- .Dt INETD 8
- .Os BSD 4.4
- .Sh NAME
-@@ -78,9 +78,9 @@ Shows the help.
- .Pp
- Upon execution,
- .Nm inetd
--reads its configuration information from a configuration
-+reads its configuration information from configuration
- pathnames on the command line, by default,
--.Pa /etc/inetd.conf and /etc/initd.d .
-+.Pa /etc/inetd.conf and /etc/inetd.d .
- If the configuration pathname is a directory, all the files in the
- directory are read like a configuration file. All of the configuration
- files are read and merged.
diff --git a/debian/patches/series b/debian/patches/series
index 3ea7e4d..d8f1742 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,5 @@
-00_no_link_extralibs.patch -p0
+00_build_dfsg.patch
+01_no_link_extralibs.patch -p0
 10_syslog_klog_doc.patch -p0
-11_inetd_doc.patch -p0
 22_syslogd_conf.patch -p1
 30_ping_suid_perms.patch -p0