Merge all in -2 after all, since I b0rked my upload.

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

diff --git a/debian/changelog b/debian/changelog
index 244982b..a543f6c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,16 +1,3 @@
-xinetd (1:2.3.14-3) UNRELEASED; urgency=low
-
-  * Always use up2date config.{sub,guess}:
-      + add autotools-dev to the Depends;
-      + copy config.{guess,sub} from /usr/share/misc/;
-      + 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
-
 xinetd (1:2.3.14-2) unstable; urgency=low
 
   * Adopt package (Closes: 434357), thanks Thomas for your past work.
@@ -22,8 +9,15 @@ xinetd (1:2.3.14-2) unstable; urgency=low
       + make it slightly more modern.
       + use pristine-tar.
       + use debian/patches.
+  * Always use up2date config.{sub,guess}:
+      + add autotools-dev to the Depends;
+      + copy config.{guess,sub} from /usr/share/misc/;
+  * 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 16:40:07 +0100
+ -- Pierre Habouzit <madcoder@debian.org>  Mon, 26 Nov 2007 18:08:16 +0100
 
 xinetd (1:2.3.14-1.1) unstable; urgency=low