X-Git-Url: http://git.madism.org/?p=packages%2Fxinetd.git;a=blobdiff_plain;f=debian%2Fchangelog;fp=debian%2Fchangelog;h=dc64552c1320e8ea6156803511c8d7bd44c0a0ef;hp=cdc817f9080e629bb93416ff455f9bd2e77a3b6d;hb=42a0d84ed2eb4b07c77396298006a1e1d3724470;hpb=814aeca68b2bf22f54b17ca77e3d9a94c2cceccd

diff --git a/debian/changelog b/debian/changelog
index cdc817f..dc64552 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+xinetd (1:2.3.14-4) UNRELEASED; urgency=low
+
+  * 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.
+
+ -- 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 ]