Closes #413997

Signed-off-by: Pierre Habouzit <madcoder@debian.org>

diff --git a/debian/changelog b/debian/changelog
index ee11168..244982b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ xinetd (1:2.3.14-3) UNRELEASED; urgency=low
       + remove the diff touching the config.* from Update-build-system.patch.
   * Unset TMPDIR in the initscript (Closes: 379400).
   * Capitalize IP in the package Description (Closes: 414288).
+  * Fix typo in xinetd.conf(5), spurious `+': update
+    Documentation-fixes.patch (Closes: 413997).
 
  -- Pierre Habouzit <madcoder@debian.org>  Mon, 26 Nov 2007 18:08:16 +0100
 

diff --git a/debian/patches/0001-Documentation-fixes.patch b/debian/patches/0001-Documentation-fixes.patch
index 3960584..fff43e5 100644 (file)
--- a/debian/patches/0001-Documentation-fixes.patch
+++ b/debian/patches/0001-Documentation-fixes.patch
@@ -1,12 +1,14 @@
-From 42c52da8f077dcbe17fda272eef03b393c0a5309 Mon Sep 17 00:00:00 2001
+From d6198f79903fad189118abcd1edc860c4c98a404 Mon Sep 17 00:00:00 2001
 From: Pierre Habouzit <madcoder@debian.org>
 Date: Mon, 26 Nov 2007 16:01:01 +0100
 Subject: [PATCH] Documentation fixes.
 
+Signed-off-by: Pierre Habouzit <madcoder@debian.org>
 ---
- xinetd/itox.8     |   15 +++++++++------
- xinetd/xinetd.man |    2 +-
- 2 files changed, 10 insertions(+), 7 deletions(-)
+ xinetd/itox.8          |   15 +++++++++------
+ xinetd/xinetd.conf.man |    2 +-
+ xinetd/xinetd.man      |    2 +-
+ 3 files changed, 11 insertions(+), 8 deletions(-)
 
 diff --git a/xinetd/itox.8 b/xinetd/itox.8
 index de109db..89a68fb 100644
@@ -41,6 +43,19 @@ index de109db..89a68fb 100644
 -This man page was written by Norbert Veber <nveber@debian.org>.
 +This man page was written by Norbert Veber <nveber@debian.org> and Thomas Seyrat
 +<tomasera@debian.org>
+diff --git a/xinetd/xinetd.conf.man b/xinetd/xinetd.conf.man
+index a006e48..2fa4656 100644
+--- a/xinetd/xinetd.conf.man
++++ b/xinetd/xinetd.conf.man
+@@ -228,7 +228,7 @@ determines the program to execute for this service.
+ determines the arguments passed to the server. In contrast to \fBinetd\fP,
+ the server name should \fInot\fP be included in \fIserver_args\fP.
+ .TP
+-+.B libwrap
++.B libwrap
+ overrides the service name passed to libwrap (which defaults to the
+ server name, the first server_args component with NAMEINARGS, the id
+ for internal services and the service name for redirected services).
 diff --git a/xinetd/xinetd.man b/xinetd/xinetd.man
 index d52c2cc..c76c3c6 100644
 --- a/xinetd/xinetd.man

diff --git a/debian/patches/0002-xconv.pl-updates.patch b/debian/patches/0002-xconv.pl-updates.patch
index d6e42e2..94e1a15 100644 (file)
--- a/debian/patches/0002-xconv.pl-updates.patch
+++ b/debian/patches/0002-xconv.pl-updates.patch
@@ -1,4 +1,4 @@
-From 1e92829a8af089abb422d97a83b0ad99503e9c1a Mon Sep 17 00:00:00 2001
+From 230b222e62166df16f21aff3859dafab3cd3cae7 Mon Sep 17 00:00:00 2001
 From: Pierre Habouzit <madcoder@debian.org>
 Date: Mon, 26 Nov 2007 16:01:43 +0100
 Subject: [PATCH] xconv.pl updates

diff --git a/debian/patches/0003-Various-fixes-from-the-previous-maintainer.patch b/debian/patches/0003-Various-fixes-from-the-previous-maintainer.patch
index afb4e44..238bdb6 100644 (file)
--- a/debian/patches/0003-Various-fixes-from-the-previous-maintainer.patch
+++ b/debian/patches/0003-Various-fixes-from-the-previous-maintainer.patch
@@ -1,4 +1,4 @@
-From e468ccd6bf1e313406e51f54c2c7ca69f60c02f7 Mon Sep 17 00:00:00 2001
+From a3410b0bc81ab03a889d9ffc14e351badf8372f1 Mon Sep 17 00:00:00 2001
 From: Pierre Habouzit <madcoder@debian.org>
 Date: Mon, 26 Nov 2007 16:02:04 +0100
 Subject: [PATCH] Various fixes from the previous maintainer.

diff --git a/debian/patches/0004-Fix-xinetd.log.man-installation-path.patch b/debian/patches/0004-Fix-xinetd.log.man-installation-path.patch
index bafb455..fdbf0e5 100644 (file)
--- a/debian/patches/0004-Fix-xinetd.log.man-installation-path.patch
+++ b/debian/patches/0004-Fix-xinetd.log.man-installation-path.patch
@@ -1,4 +1,4 @@
-From ff8c520feb89b4f36bdf6f29e6acd10e99d4d8a5 Mon Sep 17 00:00:00 2001
+From f98b6a9dd2ad4b8e82d34470139174e1331c90b8 Mon Sep 17 00:00:00 2001
 From: Pierre Habouzit <madcoder@debian.org>
 Date: Mon, 26 Nov 2007 16:02:48 +0100
 Subject: [PATCH] Fix xinetd.log.man installation path.

diff --git a/debian/patches/0005-Update-build-system.patch b/debian/patches/0005-Update-build-system.patch
index 6381283..054a602 100644 (file)
--- a/debian/patches/0005-Update-build-system.patch
+++ b/debian/patches/0005-Update-build-system.patch
@@ -1,4 +1,4 @@
-From c3c4e696d998c178845ce33551b51998cb75d16c Mon Sep 17 00:00:00 2001
+From fac6391dfbfb82dc0ea3c5d3822faff7ad57d307 Mon Sep 17 00:00:00 2001
 From: Pierre Habouzit <madcoder@debian.org>
 Date: Mon, 26 Nov 2007 16:03:37 +0100
 Subject: [PATCH] Update build system.