The following commit has been merged in the master branch:
commit 9e53fcc54bddbbab53e964f3339bd712e41806e5
Author: Guillem Jover <guil...@debian.org>
Date: Mon Jul 4 18:55:03 2011 +0200
Refer to Sources and Packages files as part of a repository
Instead of as being of exclusive use or owned by APT, which has never
been the case. Those files existed long before APT even existed.
diff --git a/debian/changelog b/debian/changelog
index c3106de..d183637 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -127,6 +127,8 @@ dpkg (1.16.1) UNRELEASED; urgency=low
- Use dashes instead of underscores for variable text.
- Clarify that several front-end fields are not dselect specific in
dpkg-query(1).
+ * Refer to Sources and Packages files as part of a repository instead of
+ as being of exclusive use or owned by APT, which has never been the case.
[ Bill Allombert]
* Add support for Build-Features: build-arch. Closes: #229357
diff --git a/man/dpkg-query.1 b/man/dpkg-query.1
index 0612725..5237166 100644
--- a/man/dpkg-query.1
+++ b/man/dpkg-query.1
@@ -1,4 +1,4 @@
-.TH dpkg\-query 1 "2011-04-28" "Debian Project" "dpkg suite"
+.TH dpkg\-query 1 "2011-07-04" "Debian Project" "dpkg suite"
.SH NAME
dpkg\-query \- a tool to query the dpkg database
.
@@ -175,7 +175,7 @@ fields or fields stored in the binary package end up in it):
\fBSource\fP
\fBStatus\fP (internal)
\fBSuggests\fP
- \fBTag\fP (usually not in the .deb but in APT's Packages files)
+ \fBTag\fP (usually not in the .deb but in the repository Packages files)
\fBTriggers-Awaited\fP (internal)
\fBTriggers-Pending\fP (internal)
\fBVersion\fP
diff --git a/scripts/Dpkg/Control.pm b/scripts/Dpkg/Control.pm
index b3b8939..01d8d28 100644
--- a/scripts/Dpkg/Control.pm
+++ b/scripts/Dpkg/Control.pm
@@ -66,12 +66,12 @@ in a Debian source package.
=item CTRL_INDEX_SRC
-Corresponds to an entry in a Sources file of an APT source package
+Corresponds to an entry in a Sources file of a source package
repository.
=item CTRL_INDEX_PKG
-Corresponds to an entry in a Packages file of an APT binary package
+Corresponds to an entry in a Packages file of a binary package
repository.
=item CTRL_PKG_SRC
@@ -153,9 +153,9 @@ sub set_options {
} elsif ($t == CTRL_CHANGELOG) {
$$self->{'name'} = _g("parsed version of changelog");
} elsif ($t == CTRL_INDEX_SRC) {
- $$self->{'name'} = sprintf(_g("entry of APT's %s file"),
"Sources");
+ $$self->{'name'} = sprintf(_g("entry in repository's %s file"),
"Sources");
} elsif ($t == CTRL_INDEX_PKG) {
- $$self->{'name'} = sprintf(_g("entry of APT's %s file"),
"Packages");
+ $$self->{'name'} = sprintf(_g("entry in repository's %s file"),
"Packages");
} elsif ($t == CTRL_PKG_SRC) {
$$self->{'name'} = sprintf(_g("%s file"), ".dsc");
} elsif ($t == CTRL_PKG_DEB) {
diff --git a/scripts/Dpkg/Control/Types.pm b/scripts/Dpkg/Control/Types.pm
index 56ddeca..a1a6590 100644
--- a/scripts/Dpkg/Control/Types.pm
+++ b/scripts/Dpkg/Control/Types.pm
@@ -38,8 +38,8 @@ use constant {
CTRL_UNKNOWN => 0,
CTRL_INFO_SRC => 1, # First control block in debian/control
CTRL_INFO_PKG => 2, # Subsequent control blocks in debian/control
- CTRL_INDEX_SRC => 4, # Entry in APT's Packages files
- CTRL_INDEX_PKG => 8, # Entry in APT's Sources files
+ CTRL_INDEX_SRC => 4, # Entry in repository's Packages files
+ CTRL_INDEX_PKG => 8, # Entry in repository's Sources files
CTRL_PKG_SRC => 16, # .dsc file of source package
CTRL_PKG_DEB => 32, # DEBIAN/control in binary packages
CTRL_FILE_CHANGES => 64, # .changes file
--
dpkg's main repository
--
To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
