Explorar o código

deb-origin(5): New man page

Closes: #608884

[guillem@debian.org:
 - Hook into po4a and build infrastructure.
 - Place Vendor-URL just after Vendor field.
 - Add SEE ALSO reference in dpkg-vendor.5. ]

Signed-off-by: Guillem Jover <guillem@debian.org>
Matt Kraai %!s(int64=14) %!d(string=hai) anos
pai
achega
4007271e13
Modificáronse 5 ficheiros con 48 adicións e 1 borrados
  1. 2 0
      debian/changelog
  2. 1 0
      man/Makefile.am
  3. 39 0
      man/deb-origin.5
  4. 3 1
      man/dpkg-vendor.1
  5. 3 0
      man/po/po4a.cfg

+ 2 - 0
debian/changelog

@@ -31,6 +31,8 @@ dpkg (1.16.2) UNRELEASED; urgency=low
     Reported by Steve Langasek <vorlon@debian.org>.
     Reported by Steve Langasek <vorlon@debian.org>.
   * Mark dpkg-dev and libdpkg-perl as Multi-Arch foreign. Closes: #648217
   * Mark dpkg-dev and libdpkg-perl as Multi-Arch foreign. Closes: #648217
     Thanks to Colin Watson <cjwatson@ubuntu.com>.
     Thanks to Colin Watson <cjwatson@ubuntu.com>.
+  * Add new deb-origin.5 man page. Closes: #608884
+    Thanks to Matt Kraai <kraai@ftbfs.org>.
 
 
   [ Raphaël Hertzog ]
   [ Raphaël Hertzog ]
   * Update Dpkg::Shlibs to look into multiarch paths when cross-building
   * Update Dpkg::Shlibs to look into multiarch paths when cross-building

+ 1 - 0
man/Makefile.am

@@ -10,6 +10,7 @@ dist_man_MANS = \
 	deb-symbols.5 \
 	deb-symbols.5 \
 	deb-triggers.5 \
 	deb-triggers.5 \
 	deb-old.5 \
 	deb-old.5 \
+	deb-origin.5 \
 	deb-override.5 \
 	deb-override.5 \
 	deb-extra-override.5 \
 	deb-extra-override.5 \
 	deb.5 \
 	deb.5 \

+ 39 - 0
man/deb-origin.5

@@ -0,0 +1,39 @@
+.TH deb\-origin 5 "2011-11-10" "Debian Project" "Debian"
+.SH NAME
+deb\-origin \- Vendor-specific information files
+.SH SYNOPSIS
+.BI /etc/dpkg/origins/ filename
+.SH DESCRIPTION
+The files in \fB/etc/dpkg/origins\fP can provide information about
+various vendors who are providing Debian packages. They contain a
+number of fields, or comments when the line starts with \fB'#'\fP.
+Each field begins with a tag, such as \fBVendor\fP or \fBParent\fP,
+followed by a colon and the body of the field. Fields are delimited
+only by field tags. In other words, field text may be multiple lines
+in length, but the tools will join lines when processing the body of
+the field.
+.SH REQUIRED FIELDS
+.TP
+.BI Vendor: " vendor-name"
+The value of this field determines the vendor name.
+.SH OPTIONAL FIELDS
+.TP
+.BI Vendor\-URL: " vendor-url"
+The value of this field determines the vendor URL.
+.TP
+.BI Bugs: " bug-url"
+The value of this field determines the type and address of the bug
+tracking system used by this vendor. It can be a mailto URL or a
+debbugs URL (e.g., debbugs://bugs.debian.org/).
+.TP
+.BI Parent: " vendor-name"
+The value of this field determines the vendor name of the vendor that
+this vendor derives from.
+.SH EXAMPLE
+.nf
+Vendor: Debian
+Vendor\-URL: http://www.debian.org/
+Bugs: debbugs://bugs.debian.org
+.fi
+.SH SEE ALSO
+.BR dpkg\-vendor (1)

+ 3 - 1
man/dpkg-vendor.1

@@ -1,4 +1,4 @@
-.TH dpkg\-vendor 1 "2011-07-04" "Debian Project" "dpkg suite"
+.TH dpkg\-vendor 1 "2011-11-10" "Debian Project" "dpkg suite"
 .SH NAME
 .SH NAME
 dpkg\-vendor \- queries information about distribution vendors
 dpkg\-vendor \- queries information about distribution vendors
 .
 .
@@ -45,6 +45,8 @@ with the \fBDEB_VENDOR\fP environment variable or
 This setting defines the current vendor. If not set, it will discover the
 This setting defines the current vendor. If not set, it will discover the
 current vendor by reading \fB/etc/dpkg/origins/default\fP.
 current vendor by reading \fB/etc/dpkg/origins/default\fP.
 .
 .
+.SH SEE ALSO
+.BR deb\-origin (5).
 .SH AUTHOR
 .SH AUTHOR
 Copyright \(co 2009 Rapha\[:e]l Hertzog
 Copyright \(co 2009 Rapha\[:e]l Hertzog
 .sp
 .sp

+ 3 - 0
man/po/po4a.cfg

@@ -31,6 +31,9 @@
 [type:man] deb-old.5 $lang:$lang/deb-old.5 \
 [type:man] deb-old.5 $lang:$lang/deb-old.5 \
            add_$lang:po/$lang.add
            add_$lang:po/$lang.add
 
 
+[type:man] deb-origin.5 $lang:$lang/deb-origin.5 \
+           add_$lang:po/$lang.add
+
 [type:man] deb-override.5 $lang:$lang/deb-override.5 \
 [type:man] deb-override.5 $lang:$lang/deb-override.5 \
            add_$lang:po/$lang.add
            add_$lang:po/$lang.add