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

diff --git a/debian/changelog b/debian/changelog
index 6feacbb..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 ]
@@ -6,6 +15,8 @@ xinetd (1:2.3.14-3) unstable; urgency=low
   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.