The following commit has been merged in the master branch:
commit 22049e15c9b844f3ebef480dfebc588fbd5a301e
Author: Raphaël Hertzog <[email protected]>
Date: Sun Aug 16 15:40:11 2009 +0200
deb-extra-override(5): new manual page
Factorize description of the extra override file in a new manual page.
Refer to this manpage in dpkg-scanpackages(1) and dpkg-scansources(1).
diff --git a/debian/changelog b/debian/changelog
index a5c6f73..f712817 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -52,6 +52,8 @@ dpkg (1.15.4) UNRELEASED; urgency=low
* Add support for extra override file in dpkg-scanpackages. Thanks to Robert
Millan for the patch. Closes: #537559
* Add support for extra override file in dpkg-scansources.
+ * Document format of extra override file in a new manual page
+ deb-extra-override(5).
* Update sample in dpkg-gensymbols(1) to give an accurate listing of
64 bit arches. Thanks to Julien Cristau for the patch. Closes: #540382
* Create /etc/cron.daily/dpkg to handle the backup of
diff --git a/man/Makefile.am b/man/Makefile.am
index 11a9831..91235a3 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -79,6 +79,7 @@ dist_man_MANS = \
deb-triggers.5 \
deb-old.5 \
deb-override.5 \
+ deb-extra-override.5 \
deb.5 \
dpkg-architecture.1 \
dpkg-buildpackage.1 \
diff --git a/man/deb-extra-override.5 b/man/deb-extra-override.5
new file mode 100644
index 0000000..a945e0d
--- /dev/null
+++ b/man/deb-extra-override.5
@@ -0,0 +1,40 @@
+.TH deb\-extra\-override 5 "2009-08-16" "Debian Project" "dpkg utilities"
+.SH NAME
+deb\-extra\-override \- Debian archive extra override file
+.
+.SH SYNOPSIS
+override
+.
+.SH DESCRIPTION
+While most information about a binary/source package can be found in the
+control/.dsc file, all of it can be overriden when it's exported to
+Packages/Sources files. The extra override file contains those overrides.
+.PP
+The extra override file has a simple whitespace-delimited format. Comments are
+allowed (denoted with a
+.BR # ).
+.PP
+.in +5
+.I package
+.I field\-name
+.I value
+.in -5
+.PP
+.I package
+is the name of the binary/source package.
+.PP
+.I field\-name
+is the name of the field that is overriden.
+.I value
+is the value to put in the field. It can contain spaces as the line is split
+in no more than 3 columns when it's parsed.
+.PP
+The extra override files used to make the official Packages lists may be found
+in the
+.I indices
+directory on any Debian mirror.
+.
+.SH SEE ALSO
+.BR dpkg\-scanpackages (1),
+.BR dpkg\-scansources (1),
+.BR apt\-ftparchive (1).
diff --git a/man/dpkg-scanpackages.1 b/man/dpkg-scanpackages.1
index 9f7a1d1..f73a5b5 100644
--- a/man/dpkg-scanpackages.1
+++ b/man/dpkg-scanpackages.1
@@ -79,8 +79,9 @@ Scan for *.\fItype\fP packages, instead of *.deb.
\fBObsolete\fP alias for \fB-tudeb\fP.
.TP
.BR \-e ", " \-\-extra\-override " \fIfile\fP"
-Scan \fIfile\fP to find supplementary overrides. Each line contains 3
-space separated fields: package name, field name to override, new field value.
+Scan \fIfile\fP to find supplementary overrides. See
+.BR deb\-extra\-override (5)
+for more information on its format.
.TP
.BR \-a ", " \-\-arch " \fIarch\fP"
Use a pattern consisting of \fI*_all.deb\fP and \fI*_arch.deb\fP instead of
@@ -106,4 +107,5 @@ maintainer substitutions which do not take effect.
.BR dpkg (1),
.BR dselect (1),
.BR deb\-override (5),
+.BR deb\-extra\-override (5),
.BR dpkg\-scansources (1).
diff --git a/man/dpkg-scansources.1 b/man/dpkg-scansources.1
index 4e58428..830f829 100644
--- a/man/dpkg-scansources.1
+++ b/man/dpkg-scansources.1
@@ -48,8 +48,9 @@ Don't sort the index records. Normally they are sorted by
source package
name.
.TP
.IP "\fB\-e\fR, \fB\-\-extra\-override\fR \fIfile\fP" 4
-Scan \fIfile\fP to find supplementary overrides. Each line contains 3
-space separated fields: package name, field name to override, new field value.
+Scan \fIfile\fP to find supplementary overrides. See
+.BR deb\-extra\-override (5)
+for more information on its format.
.IP "\fB\-s\fR, \fB\-\-source\-override\fR \fIfile\fR" 4
Use \fIfile\fR as the source override file. The default is the name of the
override file you specified with \fI.src\fR appended.
@@ -68,6 +69,7 @@ Show the version and exit.
.
.SH "SEE ALSO"
.BR deb\-override (5),
+.BR deb\-extra\-override (5),
.BR dpkg\-scanpackages (1).
.
.SH AUTHOR
diff --git a/man/po/po4a.cfg b/man/po/po4a.cfg
index a9237c1..4ffe1a9 100644
--- a/man/po/po4a.cfg
+++ b/man/po/po4a.cfg
@@ -38,6 +38,11 @@
add_$lang:$(srcdir)/po/$lang.add
+[type:man] $(srcdir)/deb-extra-override.5 \
+ $lang:$lang/deb-extra-override.5 \
+ add_$lang:$(srcdir)/po/$lang.add
+
+
[type:man] $(srcdir)/deb-shlibs.5 \
$lang:$lang/deb-shlibs.5 \
add_$lang:$(srcdir)/po/$lang.add
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
