* Added 'D' to the list of choices for conffile handling

diff --git a/ChangeLog b/ChangeLog
index c96d48d7f53d22739e9ecf888d901e332fc803b7..df7543718434a3f047aef370b5db9614568d91a9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Oct 23 21:23:08 EDT 1999 Ben Collins <bcollins.debian.org>
+
+  * Added 'D' to the list of choices for conffile handling
+
 Sat Oct 23 16:25:16 EDT 1999 Ben Collins <bcollins.debian.org>
 
   * Implemented a nice fix for multiple conflicts and replaces. Also added

diff --git a/debian/changelog b/debian/changelog
index 6a9936d7441a560799a6625eb0ec8227d5490cd7..9537159a67db7c2b5bf71c581adfacc072c72ab2 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,6 +26,7 @@ dpkg (1.4.1.19) unstable; urgency=low
   * Added armv4l to archtable
   * Implemented a nice fix for multiple conflicts and replaces. Also added
     --assert-multi-conrep.
+  * Added 'D' to the list of choices for conffile handling, closes: #48137
 
  -- Wichert Akkerman <wakkerma@debian.org>  UNRELEASED
 

diff --git a/main/configure.c b/main/configure.c
index 11ae1aaf19d419ff1e6dbd99663aef11a71f6977..694a8365c960d79f46c15ee1d9c740b1552160d0 100644 (file)
--- a/main/configure.c
+++ b/main/configure.c
@@ -286,7 +286,7 @@ void deferred_configure(struct pkginfo *pkg) {
 
           s= strrchr(conff->name,'/');
           if (!s || !*++s) s= conff->name;
-          fprintf(stderr, "*** %s (Y/I/N/O/Z) %s ? ",
+          fprintf(stderr, "*** %s (Y/I/N/O/D/Z) %s ? ",
                   s,
                   (what & cfof_keep) ? _("[default=N]") :
                   (what & cfof_install) ? _("[default=Y]") : _("[no default]"));