Bladeren bron

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).
Raphaël Hertzog 17 jaren geleden
bovenliggende
commit
22049e15c9
6 gewijzigde bestanden met toevoegingen van 56 en 4 verwijderingen
  1. 2 0
      debian/changelog
  2. 1 0
      man/Makefile.am
  3. 40 0
      man/deb-extra-override.5
  4. 4 2
      man/dpkg-scanpackages.1
  5. 4 2
      man/dpkg-scansources.1
  6. 5 0
      man/po/po4a.cfg

+ 2 - 0
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
   * Add support for extra override file in dpkg-scanpackages. Thanks to Robert
     Millan for the patch. Closes: #537559
     Millan for the patch. Closes: #537559
   * Add support for extra override file in dpkg-scansources.
   * 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
   * Update sample in dpkg-gensymbols(1) to give an accurate listing of
     64 bit arches. Thanks to Julien Cristau for the patch. Closes: #540382
     64 bit arches. Thanks to Julien Cristau for the patch. Closes: #540382
   * Create /etc/cron.daily/dpkg to handle the backup of
   * Create /etc/cron.daily/dpkg to handle the backup of

+ 1 - 0
man/Makefile.am

@@ -79,6 +79,7 @@ dist_man_MANS = \
 	deb-triggers.5 \
 	deb-triggers.5 \
 	deb-old.5 \
 	deb-old.5 \
 	deb-override.5 \
 	deb-override.5 \
+	deb-extra-override.5 \
 	deb.5 \
 	deb.5 \
 	dpkg-architecture.1 \
 	dpkg-architecture.1 \
 	dpkg-buildpackage.1 \
 	dpkg-buildpackage.1 \

+ 40 - 0
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).

+ 4 - 2
man/dpkg-scanpackages.1

@@ -79,8 +79,9 @@ Scan for *.\fItype\fP packages, instead of *.deb.
 \fBObsolete\fP alias for \fB-tudeb\fP.
 \fBObsolete\fP alias for \fB-tudeb\fP.
 .TP
 .TP
 .BR \-e ", " \-\-extra\-override " \fIfile\fP"
 .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
 .TP
 .BR \-a ", " \-\-arch " \fIarch\fP"
 .BR \-a ", " \-\-arch " \fIarch\fP"
 Use a pattern consisting of \fI*_all.deb\fP and \fI*_arch.deb\fP instead of
 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 dpkg (1),
 .BR dselect (1),
 .BR dselect (1),
 .BR deb\-override (5),
 .BR deb\-override (5),
+.BR deb\-extra\-override (5),
 .BR dpkg\-scansources (1).
 .BR dpkg\-scansources (1).

+ 4 - 2
man/dpkg-scansources.1

@@ -48,8 +48,9 @@ Don't sort the index records. Normally they are sorted by source package
 name.
 name.
 .TP
 .TP
 .IP "\fB\-e\fR, \fB\-\-extra\-override\fR \fIfile\fP" 4
 .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
 .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
 Use \fIfile\fR as the source override file. The default is the name of the
 override file you specified with \fI.src\fR appended.
 override file you specified with \fI.src\fR appended.
@@ -68,6 +69,7 @@ Show the version and exit.
 .
 .
 .SH "SEE ALSO"
 .SH "SEE ALSO"
 .BR deb\-override (5),
 .BR deb\-override (5),
+.BR deb\-extra\-override (5),
 .BR dpkg\-scanpackages (1).
 .BR dpkg\-scanpackages (1).
 .
 .
 .SH AUTHOR
 .SH AUTHOR

+ 5 - 0
man/po/po4a.cfg

@@ -38,6 +38,11 @@
            add_$lang:$(srcdir)/po/$lang.add
            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               \
 [type:man] $(srcdir)/deb-shlibs.5               \
            $lang:$lang/deb-shlibs.5             \
            $lang:$lang/deb-shlibs.5             \
            add_$lang:$(srcdir)/po/$lang.add
            add_$lang:$(srcdir)/po/$lang.add