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=1db28b2019bb80529484a6f02276e37956289023 commit 1db28b2019bb80529484a6f02276e37956289023 Author: Guillem Jover <[email protected]> AuthorDate: Tue May 12 03:15:50 2020 +0200 man: Surround markup within verbatim blocks with .nf/.fi When converting to POD we will use the markup inside verbatim blocks hack to represent these. --- debian/changelog | 1 + man/deb-symbols.man | 6 ++---- man/dpkg-maintscript-helper.man | 42 ++++++++++++++++++++++++++++++----------- 3 files changed, 34 insertions(+), 15 deletions(-) diff --git a/debian/changelog b/debian/changelog index 02bf94d3a..778458c57 100644 --- a/debian/changelog +++ b/debian/changelog @@ -78,6 +78,7 @@ dpkg (1.20.1) UNRELEASED; urgency=medium - man: Fix dpkg-gencontrol -P description to not refer to dpkg-source. Reported by Jakub Wilk <[email protected]>. - man: Place description of override value column on its own paragraph. + - man: Surround markup within verbatim blocks with .nf/.fi. * Code internals: - Use $() in shell or qx() in perl instead of ``. - dpkg-split: Switch part number variables from unsigned int to int. diff --git a/man/deb-symbols.man b/man/deb-symbols.man index 67a57be11..9200674d4 100644 --- a/man/deb-symbols.man +++ b/man/deb-symbols.man @@ -33,16 +33,14 @@ in Debian source packages. The format for an extended shared library dependency information entry in these files is: .PP +.nf .I library-soname main-dependency-template -.br [| \fIalternative-dependency-template\fP] -.br [...] -.br [* \fIfield-name\fP: \fIfield-value\fP] -.br [...] \fIsymbol\fP \fIminimal-version\fP [\fIid-of-dependency-template\fP] +.fi .P The \fIlibrary-soname\fR is exactly the value of the SONAME field as exported by \fBobjdump\fR(1). A \fIdependency-template\fR is a diff --git a/man/dpkg-maintscript-helper.man b/man/dpkg-maintscript-helper.man index 9606d29be..7fe5bf0f3 100644 --- a/man/dpkg-maintscript-helper.man +++ b/man/dpkg-maintscript-helper.man @@ -117,8 +117,12 @@ conffile should not disappear. All of this is implemented by putting the following shell snippet in the \fBpreinst\fP, \fBpostinst\fP and \fBpostrm\fP maintainer scripts: .P - dpkg\-maintscript\-helper rm_conffile \\ - \fIconffile\fP \fIprior-version\fP \fIpackage\fP \-\- "$@" +.RS +.nf +dpkg\-maintscript\-helper rm_conffile \\ + \fIconffile\fP \fIprior-version\fP \fIpackage\fP \-\- "$@" +.fi +.RE .P \fIconffile\fP is the filename of the conffile to remove. .P @@ -143,8 +147,12 @@ Graceful renaming can be implemented by putting the following shell snippet in the \fBpreinst\fP, \fBpostinst\fP and \fBpostrm\fP maintainer scripts: .P - dpkg\-maintscript\-helper mv_conffile \\ - \fIold-conffile\fP \fInew-conffile\fP \fIprior-version\fP \fIpackage\fP \-\- "$@" +.RS +.nf +dpkg\-maintscript\-helper mv_conffile \\ + \fIold-conffile\fP \fInew-conffile\fP \fIprior-version\fP \fIpackage\fP \-\- "$@" +.fi +.RE .P \fIold-conffile\fP and \fInew-conffile\fP are the old and new name of the conffile to rename. @@ -175,8 +183,12 @@ Graceful renaming can be implemented by putting the following shell snippet in the \fBpreinst\fP, \fBpostinst\fP and \fBpostrm\fP maintainer scripts: .P - dpkg\-maintscript\-helper symlink_to_dir \\ - \fIpathname\fP \fIold-target\fP \fIprior-version\fP \fIpackage\fP \-\- "$@" +.RS +.nf +dpkg\-maintscript\-helper symlink_to_dir \\ + \fIpathname\fP \fIold-target\fP \fIprior-version\fP \fIpackage\fP \-\- "$@" +.fi +.RE .P \fIpathname\fP is the absolute name of the old symlink (the path will be a directory at the end of the installation) and \fIold-target\fP is @@ -204,8 +216,12 @@ Graceful switching can be implemented by putting the following shell snippet in the \fBpreinst\fP, \fBpostinst\fP and \fBpostrm\fP maintainer scripts: .P - dpkg\-maintscript\-helper dir_to_symlink \\ - \fIpathname\fP \fInew-target\fP \fIprior-version\fP \fIpackage\fP \-\- "$@" +.RS +.nf +dpkg\-maintscript\-helper dir_to_symlink \\ + \fIpathname\fP \fInew-target\fP \fIprior-version\fP \fIpackage\fP \-\- "$@" +.fi +.RE .P \fIpathname\fP is the absolute name of the old directory (the path will be a symlink at the end of the installation) and \fInew-target\fP is @@ -251,9 +267,13 @@ the package, and instead of using a pre-dependency we can call the program only if we know that the required command is supported by the currently installed \fBdpkg\fP: .P - if dpkg\-maintscript\-helper supports \fIcommand\fP; then - dpkg\-maintscript\-helper \fIcommand\fP ... - fi +.RS +.nf +if dpkg\-maintscript\-helper supports \fIcommand\fP; then + dpkg\-maintscript\-helper \fIcommand\fP ... +fi +.fi +.RE .P The command \fBsupports\fP will return 0 on success, 1 otherwise. The \fBsupports\fP command will check if the environment variables as set -- Dpkg.Org's dpkg
