[dpkg] 98/200: man: Move control member file references from dpkg(1) to deb(5)

[Ximin Luo]

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

infinity0 pushed a commit to branch master
in repository dpkg.

commit 0e6fc91ac25378c040c57b3db2b6fe2d745eeba4
Author: Guillem Jover <guillem at debian.org>
Date:   Wed Dec 28 11:07:53 2016 +0100

    man: Move control member file references from dpkg(1) to deb(5)
    
    The information in dpkg(1) was out of place, and deb(5) already
    contained a skeleton of this information, which is in any case the more
    logical place to be.
---
 debian/changelog |  1 +
 man/deb.man      | 22 +++++++++++++++++++---
 man/dpkg.man     | 16 +---------------
 3 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d4e6f9f..8450475 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ dpkg (1.18.19) UNRELEASED; urgency=medium
   [ Guillem Jover ]
   * Documentation:
     - Cleanup software requirements in README.
+    - Move control member file references from dpkg(1) to deb(5).
 
   [ Updated programs translations ]
   * German (Sven Joachim).
diff --git a/man/deb.man b/man/deb.man
index 92f69c4..3d1754a 100644
--- a/man/deb.man
+++ b/man/deb.man
@@ -76,8 +76,16 @@ gzip (with \fB.gz\fP extension) or
 xz (with \fB.xz\fP extension, supported since 1.17.6),
 as a series of plain files, of which the file
 .B control
-is mandatory and contains the core control information. The control
-tarball may optionally contain an entry for
+is mandatory and contains the core control information, the
+.BR conffiles ", " triggers ", " shlibs
+and
+.B symbols
+files contain optional control information, and the
+.BR preinst ", " postinst ", " prerm
+and
+.B postrm
+files are optional maintainer scripts.
+The control tarball may optionally contain an entry for
 .RB ‘ . ’,
 the current directory.
 .PP
@@ -120,4 +128,12 @@ application/x-deb
 .SH SEE ALSO
 .BR deb\-old (5),
 .BR dpkg\-deb (1),
-.BR deb\-control (5).
+.BR deb\-control (5),
+.BR deb\-conffiles (5)
+.BR deb\-triggers (5),
+.BR deb\-shlibs (5),
+.BR deb\-symbols (5),
+.BR deb\-preinst (5),
+.BR deb\-postinst (5),
+.BR deb\-prerm (5),
+.BR deb\-postrm (5).
diff --git a/man/dpkg.man b/man/dpkg.man
index c11bf2f..38f2fa8 100644
--- a/man/dpkg.man
+++ b/man/dpkg.man
@@ -982,21 +982,7 @@ for more info.
 The status file is backed up daily in \fI/var/backups\fP. It can be
 useful if it's lost or corrupted due to filesystems troubles.
 .P
-The following files are components of a binary package. See \fBdeb\fP(5)
-for more information about them:
-.RS
-.nf
-.IR control " (\fBdeb\-control\fP(5))"
-.IR conffiles " (\fBdeb\-conffiles\fP(5))"
-.IR preinst " (\fBdeb\-preinst\fP(5))"
-.IR postinst " (\fBdeb\-postinst\fP(5))"
-.IR prerm " (\fBdeb\-prerm\fP(5))"
-.IR postrm " (\fBdeb\-postrm\fP(5))"
-.IR triggers " (\fBdeb\-triggers\fP(5))"
-.IR shlibs " (\fBdeb\-shlibs\fP(5))"
-.IR symbols " (\fBdeb\-symbols\fP(5))"
-.fi
-.RE
+The format and contents of a binary package are described in \fBdeb\fP(5).
 .
 .SH BUGS
 \fB\-\-no\-act\fP usually gives less information than might be helpful.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/dpkg.git