This is an automated email from the git hooks/post-receive script. guillem pushed a commit to branch master in repository dpkg.
commit 90e33b3495cb60c2008673aedf467a796ff85a41 Author: Guillem Jover <[email protected]> Date: Thu Jul 7 19:55:10 2016 +0200 man: Add new deb-conffiles(5) man page --- debian/changelog | 1 + man/Makefile.am | 1 + man/deb-conffiles.5 | 41 +++++++++++++++++++++++++++++++++++++++++ man/dpkg.1 | 2 +- man/po/po4a.cfg | 3 +++ 5 files changed, 47 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 2995bf0..8ae94cc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ dpkg (1.18.10) UNRELEASED; urgency=medium - Fix deb-changes(5) description to talk about .changes instead of .dsc. Reported by HW42 <[email protected]>. - Use debian/control as the SYNOPSIS in deb-src-control(5). + - Add new deb-conffiles(5) man page. [ Updated scripts translations ] * German (Helge Kreutzmann). diff --git a/man/Makefile.am b/man/Makefile.am index f656b6b..fb4167c 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -3,6 +3,7 @@ dist_man_MANS = \ deb-changelog.5 \ deb-changes.5 \ + deb-conffiles.5 \ deb-control.5 \ deb-src-control.5 \ deb-version.5 \ diff --git a/man/deb-conffiles.5 b/man/deb-conffiles.5 new file mode 100644 index 0000000..31eaef9 --- /dev/null +++ b/man/deb-conffiles.5 @@ -0,0 +1,41 @@ +.\" dpkg manual page - deb-conffiles(5) +.\" +.\" Copyright © 2016 Guillem Jover <[email protected]> +.\" +.\" This is free software; you can redistribute it and/or modify +.\" it under the terms of the GNU General Public License as published by +.\" the Free Software Foundation; either version 2 of the License, or +.\" (at your option) any later version. +.\" +.\" This is distributed in the hope that it will be useful, +.\" but WITHOUT ANY WARRANTY; without even the implied warranty of +.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +.\" GNU General Public License for more details. +.\" +.\" You should have received a copy of the GNU General Public License +.\" along with this program. If not, see <https://www.gnu.org/licenses/>. +. +.TH deb\-conffiles 5 "2016-07-07" "Debian Project" "dpkg utilities" +.SH NAME +deb\-conffiles \- package conffiles +. +.SH SYNOPSIS +conffiles +. +.SH DESCRIPTION +A package declares its list of conffiles by including a \fIconffiles\fP file +in its control archive (i.e. \fIDEBIAN/conffiles\fP during package creation). +.PP +This file contains a list of files, one per line. +Trailing whitespace will be trimmed, and empty lines will be ignored. +. +.SH EXAMPLE +.nf +/etc/alternatives/README +/etc/cron.daily/dpkg +/etc/dpkg/dpkg.cfg +/etc/logrotate.d/dpkg +.fi +. +.SH SEE ALSO +.BR dpkg (1). diff --git a/man/dpkg.1 b/man/dpkg.1 index 2db8c55..28d8319 100644 --- a/man/dpkg.1 +++ b/man/dpkg.1 @@ -955,7 +955,7 @@ for more information about them: .RS .nf .I control -.I conffiles +.IR conffiles " (\fBdeb\-conffiles\fP(5))" .I preinst .I postinst .I prerm diff --git a/man/po/po4a.cfg b/man/po/po4a.cfg index 63f95e7..4f92836 100644 --- a/man/po/po4a.cfg +++ b/man/po/po4a.cfg @@ -19,6 +19,9 @@ [type:man] deb-control.5 $lang:$lang/deb-control.5 \ add_$lang:po/$lang.add +[type:man] deb-conffiles.5 $lang:$lang/deb-conffiles.5 \ + add_$lang:po/$lang.add + [type:man] deb-src-control.5 $lang:$lang/deb-src-control.5 \ add_$lang:po/$lang.add -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/dpkg/dpkg.git
