From 8c1c6de074f639b28a2b2187223a40ca29832d83 Mon Sep 17 00:00:00 2001 From: Ben Collins Date: Sun, 24 Oct 1999 01:48:58 +0000 Subject: [PATCH] * Added 'D' to the list of choices for conffile handling --- ChangeLog | 4 ++++ debian/changelog | 1 + main/configure.c | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index c96d48d7..df754371 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Sat Oct 23 21:23:08 EDT 1999 Ben Collins + + * Added 'D' to the list of choices for conffile handling + Sat Oct 23 16:25:16 EDT 1999 Ben Collins * Implemented a nice fix for multiple conflicts and replaces. Also added diff --git a/debian/changelog b/debian/changelog index 6a9936d7..9537159a 100644 --- 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 UNRELEASED diff --git a/main/configure.c b/main/configure.c index 11ae1aaf..694a8365 100644 --- 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]")); -- 2.39.5