summaryrefslogtreecommitdiff
path: root/man/C
diff options
context:
space:
mode:
authorScott James Remnant <scott@netsplit.com>2005-06-06 05:34:21 +0100
committerScott James Remnant <scott@netsplit.com>2005-06-06 05:34:21 +0100
commit051701d1b2721085e2458874e2c29cefb10941b4 (patch)
tree9bf9545cb8494ee0d287ed10bce95feb714b4fc9 /man/C
parentf508767236142541861ece120a5822d77cdb58e5 (diff)
downloaddpkg-051701d1b2721085e2458874e2c29cefb10941b4.tar.gz
dpkg (1.13.5) experimental; urgency=low
The "Flatulent Elm of West Ruislip" Release. * Actions and package states are now logged by default in the /var/log/dpkg.log file. This file is rotated monthly and can be disabled by commenting the line in /etc/dpkg/dpkg.cfg. * User decisions about conffiles are now logged. * dpkg-source no longer complains about Enhances field. Closes: #159642, #159745, #159746. * preinst no longer relies on procps being installed. Closes: #311808. * Architecture Support: - Change DEB_*_GNU_CPU from i386 to i486, to reflect reality. DEB_*_ARCH_CPU remains at i386, you should be checking against that. Closes: #310394. - Fixed order ostable is read to prevent Linux becoming the Hurd. Closes: #309603. * Updated Manpage Translations (Christian Perrier): - Syntax error corrected in Swedish man page for dpkg-deb. Closes: #300980. - Syntax error corrected in Spanish man page for dpkg-scanpackages. Closes: #300981 -- Scott James Remnant <scott@netsplit.com> Mon, 6 Jun 2005 05:34:21 +0100
Diffstat (limited to 'man/C')
-rw-r--r--man/C/dpkg.16
1 files changed, 4 insertions, 2 deletions
diff --git a/man/C/dpkg.1 b/man/C/dpkg.1
index 0730eb9d9..64fbb7ca7 100644
--- a/man/C/dpkg.1
+++ b/man/C/dpkg.1
@@ -480,10 +480,12 @@ Configuration file conflicts are reported as
\fB\-\-log=\fP\fIfilename\fP
Log status change updates and actions to \fIfilename\fP. This can be given
multiple times. Log messages are of the form `YYYY-MM-DD HH:MM:SS status
-<state> <pkg> <installed-version>' for status change updates and
+<state> <pkg> <installed-version>' for status change updates;
`YYYY-MM-DD HH:MM:SS <action> <pkg> <installed-version>
<available-version>' for actions where \fI<action>\fP is one of install,
-upgrade, remove, purge.
+upgrade, remove, purge; and `YYYY-MM-DD HH:MM:SS conffile <filename>
+<decision>' for conffile changes where \fI<decision\fP is either install
+or keep.
.SH FILES
.TP
.I /etc/dpkg/dpkg.cfg