This is an automated email from the git hooks/post-receive script.

guillem pushed a commit to branch master
in repository dpkg.

View the commit online:
https://git.dpkg.org/cgit/dpkg/dpkg.git/commit/?id=48c15b3b17bbc2903899a979c5694b99b1bf1803

commit 48c15b3b17bbc2903899a979c5694b99b1bf1803
Author: Guillem Jover <[email protected]>
AuthorDate: Sun Dec 2 03:33:59 2018 +0100

    man: Clarify dpkg(1) --remove action
    
    Describe when --remove is equivalent to --purge, and what data it will
    cleanup and when.
    
    Closes: #914478
---
 debian/changelog | 2 ++
 man/dpkg.man     | 8 ++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7d91d38cf..345b91a3c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 dpkg (1.19.3) UNRELEASED; urgency=medium
 
   [ Guillem Jover ]
+  * Documentation:
+    - dpkg(1): Clarify --remove action. Closes: #914478
   * Code internals:
     - dpkg-maintscript-helper: Use an explicit escape instead of a literal
       backslash.
diff --git a/man/dpkg.man b/man/dpkg.man
index 62ffceda3..c43b7d512 100644
--- a/man/dpkg.man
+++ b/man/dpkg.man
@@ -183,10 +183,14 @@ improper \fBtriggers\-awaited\fP and 
\fBtriggers\-pending\fP states. This
 can be fixed later by running: \fBdpkg \-\-configure \-\-pending\fP.
 .TP
 \fB\-r\fP, \fB\-\-remove\fP \fIpackage\fP...|\fB\-a\fP|\fB\-\-pending\fP
-Remove an installed package. This removes everything except conffiles,
+Remove an installed package.
+This removes everything except conffiles and other data cleaned up by
+the \fIpostrm\fP script,
 which may avoid having to reconfigure the package if it is reinstalled
 later (conffiles are configuration files that are listed in the
 \fIDEBIAN/conffiles\fP control file).
+If there is no \fIDEBIAN/conffiles\fP control file nor \fIDEBIAN/postrm\fP
+script, this command is equivalent to calling \fB\-\-purge\fP.
 If \fB\-a\fP or \fB\-\-pending\fP is given instead of a package name,
 then all packages unpacked, but marked to be removed in file
 \fI%ADMINDIR%/status\fP, are removed.
@@ -206,7 +210,7 @@ Removing of a package consists of the following steps:
 .TP
 \fB\-P\fP, \fB\-\-purge\fP \fIpackage\fP...|\fB\-a\fP|\fB\-\-pending\fP
 Purge an installed or already removed package. This removes everything,
-including conffiles.
+including conffiles, and anything else cleaned up from \fIpostrm\fP.
 If \fB\-a\fP or \fB\-\-pending\fP is given instead of a package name,
 then all packages unpacked or removed, but marked to be purged in file
 \fI%ADMINDIR%/status\fP, are purged.

-- 
Dpkg.Org's dpkg

Reply via email to