The following commit has been merged in the master branch:
commit b37902119496c2019295dce93def3802c44ed169
Author: Guillem Jover <[email protected]>
Date: Tue Apr 2 16:22:50 2013 +0200
man: Unify references to dpkg project versions for new features
Use the general form of “dpkg VERSION”, w/o any markup, to talk
about the point a feature got introduced in the dpkg project,
regardless of what part of the project was involved, so we use
dpkg in this way as a reference to the entire software project,
and not the dpkg program or the dpkg Debian package.
The name dpkg-dev is a Debian specific packaging layout, which is not
how other downstreams are going to package the software, just avoid
the term. If we need to mention the collection of scripts contained
in the Debian dpkg-dev we use “dpkg build scripts”.
There are still two remaining dpkg-dev references in paths, but those
need to be fixed by substitution at build time, as part of another
commit.
diff --git a/man/deb-src-control.5 b/man/deb-src-control.5
index c41a290..d924985 100644
--- a/man/deb-src-control.5
+++ b/man/deb-src-control.5
@@ -2,7 +2,7 @@
.\"
.\" Copyright © 2010 Oxan van Leeuwen <[email protected]>
.\" Copyright © 2011 Raphaël Hertzog <[email protected]>
-.\" Copyright © 2011-2012 Guillem Jover <[email protected]>
+.\" Copyright © 2011-2013 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
@@ -17,7 +17,7 @@
.\" You should have received a copy of the GNU General Public License
.\" along with this program. If not, see <http://www.gnu.org/licenses/>.
.
-.TH deb\-src\-control 5 "2012-09-22" "Debian Project" "Debian"
+.TH deb\-src\-control 5 "2013-04-02" "Debian Project" "Debian"
.SH NAME
deb\-src\-control \- Debian source packages' master control file format
.
@@ -131,8 +131,8 @@ for source-only builds.
.BI Build\-Depends\-Arch: " package list"
Same as \fBBuild\-Depends\fP, but they are only needed when building the
architecture dependent packages. The \fBBuild\-Depends\fP are also
-installed in this case. This field was introduced in dpkg version
-1.16.4; in order to build with older dpkg versions, \fBBuild\-Depends\fP
+installed in this case. This field is supported since dpkg 1.16.4; in
+order to build with older dpkg versions, \fBBuild\-Depends\fP
should be used instead.
.TP
@@ -153,7 +153,7 @@ used for source-only builds.
.TP
.BI Build\-Conflicts\-Arch: " package list"
Same as \fBBuild\-Conflicts\fP, but only when building the architecture
-dependent packages. This field was introduced in dpkg version 1.16.4; in
+dependent packages. This field is supported since dpkg 1.16.4; in
order to build with older dpkg versions, \fBBuild\-Conflicts\fP should
be used instead.
diff --git a/man/deb-triggers.5 b/man/deb-triggers.5
index 5fabea1..98416a8 100644
--- a/man/deb-triggers.5
+++ b/man/deb-triggers.5
@@ -1,6 +1,6 @@
.\" dpkg manual page - deb-triggers(5)
.\"
-.\" Copyright © 2008 Guillem Jover <[email protected]>
+.\" Copyright © 2008, 2013 Guillem Jover <[email protected]>
.\" Copyright © 2011 Raphaël Hertzog <[email protected]>
.\"
.\" This is free software; you can redistribute it and/or modify
@@ -16,7 +16,7 @@
.\" You should have received a copy of the GNU General Public License
.\" along with this program. If not, see <http://www.gnu.org/licenses/>.
.
-.TH deb\-triggers 5 "2011-08-14" "Debian Project" "dpkg utilities"
+.TH deb\-triggers 5 "2013-04-02" "Debian Project" "dpkg utilities"
.SH NAME
deb\-triggers \- package triggers
.
@@ -77,7 +77,7 @@ versions of the package will be activated.
Unknown directives are an error which will prevent installation of the
package.
.PP
-The "\-noawait" variants are only supported by dpkg 1.16.1 or newer, and
+The "\-noawait" variants are only supported since dpkg 1.16.1, and
will lead to errors if used with an older dpkg. It is thus recommended
to add a "Pre\-Depends: dpkg (>= 1.16.1)" to any package that wish to use
those directives.
diff --git a/man/deb-version.5 b/man/deb-version.5
index 7e76eb7..3bce24c 100644
--- a/man/deb-version.5
+++ b/man/deb-version.5
@@ -17,7 +17,7 @@
.\" You should have received a copy of the GNU General Public License
.\" along with this program. If not, see <http://www.gnu.org/licenses/>.
.
-.TH deb\-version 5 "2011-08-14" "Debian Project" "Debian"
+.TH deb\-version 5 "2013-04-02" "Debian Project" "Debian"
.SH NAME
deb\-version \- Debian package version number format
.
@@ -126,7 +126,7 @@ interpret (such as 'ALPHA' or 'pre\-'), or with
silly orderings.
.SH NOTES
The tilde character and its special sorting properties were introduced
-in dpkg version 1.10 and some parts of dpkg\-dev only gained
+in dpkg 1.10 and some parts of the dpkg build scripts only gained
support for it later in the 1.10.x series.
.SH SEE ALSO
.BR deb\-control (5),
diff --git a/man/deb.5 b/man/deb.5
index 6aa030f..0131bac 100644
--- a/man/deb.5
+++ b/man/deb.5
@@ -3,7 +3,7 @@
.\" Copyright © 1995 Raul Miller
.\" Copyright © 1996 Ian Jackson <[email protected]>
.\" Copyright © 2000 Wichert Akkerman <[email protected]>
-.\" Copyright © 2006-2011 Guillem Jover <[email protected]>
+.\" Copyright © 2006-2013 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
@@ -18,7 +18,7 @@
.\" You should have received a copy of the GNU General Public License
.\" along with this program. If not, see <http://www.gnu.org/licenses/>.
.
-.TH deb 5 "2012-06-16" "Debian Project" "Debian"
+.TH deb 5 "2013-04-02" "Debian Project" "Debian"
.SH NAME
deb \- Debian binary package format
.SH SYNOPSIS
@@ -26,9 +26,9 @@ deb \- Debian binary package format
.SH DESCRIPTION
The
.B .deb
-format is the Debian binary package file format. It is understood by
-dpkg 0.93.76 and later, and is generated by default by all versions
-of dpkg since 1.2.0 and all i386/ELF versions since 1.1.1elf.
+format is the Debian binary package file format. It is understood
+since dpkg 0.93.76, and is generated by default since dpkg 1.2.0 and
+1.1.1elf (i386/ELF builds).
.PP
The format described here is used since Debian 0.93; details of the
old format are described in
diff --git a/man/dpkg-buildpackage.1 b/man/dpkg-buildpackage.1
index 95845a9..48b71e8 100644
--- a/man/dpkg-buildpackage.1
+++ b/man/dpkg-buildpackage.1
@@ -19,7 +19,7 @@
.\" You should have received a copy of the GNU General Public License
.\" along with this program. If not, see <http://www.gnu.org/licenses/>.
.
-.TH dpkg\-buildpackage 1 "2013-03-31" "Debian Project" "dpkg utilities"
+.TH dpkg\-buildpackage 1 "2013-04-02" "Debian Project" "dpkg utilities"
.SH NAME
dpkg\-buildpackage \- build binary or source packages from sources
.
@@ -253,13 +253,13 @@ option is integrated in the build environment.
.
.SH NOTES
.SS Compiler flags are no longer exported
-Between versions 1.14.17 and 1.16.1, \fBdpkg\-buildpackage\fP
+Between dpkg 1.14.17 and 1.16.1, \fBdpkg\-buildpackage\fP
exported compiler flags (\fBCFLAGS\fP, \fBCXXFLAGS\fP, \fBFFLAGS\fP,
\fBCPPFLAGS\fP and \fBLDFLAGS\fP) with values as returned
by \fBdpkg\-buildflags\fP. This is no longer the case.
.SS Default build targets
\fBdpkg\-buildpackage\fP is using the \fBbuild\-arch\fP and
-\fBbuild\-indep\fP targets since version 1.16.2. Those targets are thus
+\fBbuild\-indep\fP targets since dpkg 1.16.2. Those targets are thus
mandatory. But to avoid breakages of existing packages, and ease
the transition, it will fallback to using the \fBbuild\fP target
if \fBmake \-f debian/rules \-qn\fP \fIbuild-target\fP returns 2 as
diff --git a/man/dpkg-gencontrol.1 b/man/dpkg-gencontrol.1
index 9320dd1..1134749 100644
--- a/man/dpkg-gencontrol.1
+++ b/man/dpkg-gencontrol.1
@@ -2,7 +2,7 @@
.\"
.\" Copyright © 1995-1996 Ian Jackson <[email protected]>
.\" Copyright © 2000 Wichert Akkerman <[email protected]>
-.\" Copyright © 2006, 2012 Guillem Jover <[email protected]>
+.\" Copyright © 2006, 2012-2013 Guillem Jover <[email protected]>
.\" Copyright © 2007-2008 Raphaël Hertzog <[email protected]>
.\"
.\" This is free software; you can redistribute it and/or modify
@@ -18,7 +18,7 @@
.\" You should have received a copy of the GNU General Public License
.\" along with this program. If not, see <http://www.gnu.org/licenses/>.
.
-.TH dpkg\-gencontrol 1 "2012-05-04" "Debian Project" "dpkg utilities"
+.TH dpkg\-gencontrol 1 "2013-04-02" "Debian Project" "dpkg utilities"
.SH NAME
dpkg\-gencontrol \- generate Debian control files
.
@@ -108,8 +108,8 @@ Assume the filename of the package will be
instead of the normal package_version_arch.deb filename.
.TP
.BR \-is ", " \-ip ", " \-isp
-These options are ignored for compatibility with older versions of
-dpkg\-dev but are now deprecated. Previously they were used to tell
+These options are ignored for compatibility with older versions of the dpkg
+build scripts but are now deprecated. Previously they were used to tell
\fBdpkg\-gencontrol\fP to include the Section and Priority fields in the
control file. This is now the default behaviour. If you want to
get the old behaviour you can use the
diff --git a/man/dpkg-parsechangelog.1 b/man/dpkg-parsechangelog.1
index 0692b1d..00f96e3 100644
--- a/man/dpkg-parsechangelog.1
+++ b/man/dpkg-parsechangelog.1
@@ -2,7 +2,7 @@
.\"
.\" Copyright © 1995-1996 Ian Jackson <[email protected]>
.\" Copyright © 2000 Wichert Akkerman <[email protected]>
-.\" Copyright © 2006, 2012 Guillem Jover <[email protected]>
+.\" Copyright © 2006, 2012-2013 Guillem Jover <[email protected]>
.\" Copyright © 2007-2008 Frank Lichtenheld <[email protected]>
.\" Copyright © 2009 Raphaël Hertzog <[email protected]>
.\"
@@ -19,7 +19,7 @@
.\" You should have received a copy of the GNU General Public License
.\" along with this program. If not, see <http://www.gnu.org/licenses/>.
.
-.TH dpkg\-parsechangelog 1 "2012-07-18" "Debian Project" "dpkg utilities"
+.TH dpkg\-parsechangelog 1 "2013-04-02" "Debian Project" "dpkg utilities"
.SH NAME
dpkg\-parsechangelog \- parse Debian changelog files
.
@@ -177,8 +177,8 @@ possibly generating incorrect output.
A changelog parser may not interact with the user at all.
.
.SH NOTES
-All \fBParser Options\fP except for \fB\-v\fP are only supported in
-\fBdpkg\fP, version 1.14.16 and later. Third party parsers for
+All \fBParser Options\fP except for \fB\-v\fP are only supported
+since dpkg 1.14.16. Third party parsers for
changelog formats other than \fIdebian\fP might not support
all options.
.
diff --git a/man/dpkg-source.1 b/man/dpkg-source.1
index 4f51db1..47ed69a 100644
--- a/man/dpkg-source.1
+++ b/man/dpkg-source.1
@@ -3,7 +3,7 @@
.\" Copyright © 1995-1996 Ian Jackson <[email protected]>
.\" Copyright © 2000 Wichert Akkerman <[email protected]>
.\" Copyright © 2006-2007 Frank Lichtenheld <[email protected]>
-.\" Copyright © 2006-2012 Guillem Jover <[email protected]>
+.\" Copyright © 2006-2013 Guillem Jover <[email protected]>
.\" Copyright © 2008-2011 Raphaël Hertzog <[email protected]>
.\" Copyright © 2010 Joey Hess <[email protected]>
.\"
@@ -20,7 +20,7 @@
.\" You should have received a copy of the GNU General Public License
.\" along with this program. If not, see <http://www.gnu.org/licenses/>.
.
-.TH dpkg\-source 1 "2012-05-04" "Debian Project" "dpkg utilities"
+.TH dpkg\-source 1 "2013-04-02" "Debian Project" "dpkg utilities"
.SH NAME
dpkg\-source \- Debian source package (.dsc) manipulation tool
.
@@ -168,7 +168,7 @@ Note that this option will not cause existing tarballs to
be recompressed,
it only affects new files. Supported values are:
.IR gzip ", " bzip2 ", " lzma " and " xz .
\fIgzip\fP is the default. \fIxz\fP is only supported since
-dpkg\-dev 1.15.5.
+dpkg 1.15.5.
.TP
.BR \-z "\fIlevel\fP, " \-\-compression\-level =\fIlevel\fP
Compression level to use. As with \fB\-Z\fP it only affects newly created
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
