Don't force inetd_compat for upgrades.

[packages/xinetd.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 244982b..0f43d68 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,15 +1,44 @@
-xinetd (1:2.3.14-3) UNRELEASED; urgency=low
+xinetd (1:2.3.14-4) 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).
+  * Add Disable-services-with-a-duplicated-id.patch: if a service has the same
+    id and is configured in both xinetd configuration directories _and_ in
+    /etc/inetd.conf, the configuration (even if disabled) from xinetd
+    directories takes precedence.
+  * /etc/default/xinetd wasn't installed anymore because of a typo:
+    debian/xinetd.defaults -> debian/xinetd.default.
+  * debian/xinetd.postrm: don't purge configuration that isn't ours on purge
+    anymore.
+  * Don't force inetd_compat for upgrades.
 
- -- Pierre Habouzit <madcoder@debian.org>  Mon, 26 Nov 2007 18:08:16 +0100
+ -- Pierre Habouzit <madcoder@debian.org>  Wed, 28 Nov 2007 10:14:47 +0100
+
+xinetd (1:2.3.14-3) unstable; urgency=low
+
+  [ The let's try to provide inet-superserver upload ]
+
+  xinetd has an -inetd_compat mode that renders it suitable for being an
+  inet-superserver, instead of clumsily divert netkit-inetd. Enabling this
+  closes: 134955, 188232, 326975, 355417, 373157, 406190, 406660, 448617.
+
+  * debian/NEWS: explain the transition.
+
+  * debian/control:
+     + add Provides/Conflicts on inet-superserver.
+     + add dependency on update-inetd.
+     + add dependency on lsb-base.
+
+  * maintainer scripts:
+     + preinst: remove diversion of /etc/init.d/inetd.
+     + other: don't touch /etc/init.d/inetd anymore.
+
+  * debian/xinetd.defaults: enable inetd_compat mode, so that we can
+    legitimately provide inet-superserver.
+
+  * debian/xinetd.init:
+     + support the new INETD_COMPAT option.
+     + be lsb.
+
+ -- Pierre Habouzit <madcoder@debian.org>  Mon, 26 Nov 2007 22:24:09 +0100
 
 xinetd (1:2.3.14-2) unstable; urgency=low
 
@@ -22,8 +51,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