Bug#626796: debian-policy: Ambigous use of ‘Source package control file’.
Package: debian-policy
Version: 3.9.2.0
Severity: normal
Dear all,
while reviewing Raphaël's patch about the Architecture field in .dsc files,
(#626779), I realised that the Policy uses ambigously the term ‘Source package
control file’. However, at the beginning of Chapter 5, it gives that name to
the debian/control files of unpacked source packages, and introduces .dsc files
as ‘Debian source control files’, which may give the impression that it will
use these names consistently in the document.
I propose with the attached patch to consistently use each name for
debian/control and .dsc files.
This patch is to be applied after the one from #626779.
Have a nice day,
--
Charles
>From b9d972e775c3d093bdfc59c1278afd95013d4c13 Mon Sep 17 00:00:00 2001
From: Charles Plessy <plessy@debian.org>
Date: Sun, 15 May 2011 19:43:16 +0900
Subject: [PATCH 2/2] =?UTF-8?q?Normalise=20the=20how=20=E2=80=98debian/control=E2=80=99=20and=20=E2=80=98.dsc=E2=80=99=20files=20are=20called.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
§5.2 names debian/control files ‘Source package control files’,
and §5.4 names .dsc files ‘Debian source control files’. This patch
ensures that the name ‘Source package control file’ is used only
for debian/control files.
---
policy.sgml | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/policy.sgml b/policy.sgml
index cbc8049..13377dd 100644
--- a/policy.sgml
+++ b/policy.sgml
@@ -2717,7 +2717,7 @@ Package: libc6
</p>
<p>
- The source package control file is generated by
+ The Debian source control file is generated by
<prgn>dpkg-source</prgn> when it builds the source
archive, from other files in the source package,
described above. When unpacking, it is checked against
@@ -2974,7 +2974,7 @@ Package: libc6
</p>
<p>
- In the source package control file <file>.dsc</file>, this
+ In the Debian source control file <file>.dsc</file>, this
field contains a list of architectures and architecture
wildcards separated by spaces. When the list contains the
architecture wildcard <tt>any</tt>, the only other value
@@ -2986,7 +2986,7 @@ Package: libc6
value <tt>all</tt>. In other words, in <file>.dsc</file>
files unlike the <file>debian/control</file>, <tt>all</tt> may
occur in combination with specific architectures.
- The <tt>Architecture</tt> field in the source package control
+ The <tt>Architecture</tt> field in the Debian source control
file <file>.dsc</file> is generally constructed from
the <tt>Architecture</tt> fields in
the <file>debian/control</file> in the source package.
@@ -3727,7 +3727,7 @@ Checksums-Sha256:
Additional user-defined fields may be added to the
source package control file. Such fields will be
ignored, and not copied to (for example) binary or
- source package control files or upload control files.
+ Debian source control files or upload control files.
</p>
<p>
@@ -3744,7 +3744,7 @@ Checksums-Sha256:
field name after the hyphen will be used in the output
file. Where the letter <tt>B</tt> is used the field
will appear in binary package control files, where the
- letter <tt>S</tt> is used in source package control
+ letter <tt>S</tt> is used in Debian source control
files and where <tt>C</tt> is used in upload control
(<tt>.changes</tt>) files.
</p>
@@ -3755,7 +3755,7 @@ Checksums-Sha256:
<example>
XBS-Comment: I stand between the candle and the star.
</example>
- then the binary and source package control files will contain the
+ then the binary and Debian source control files will contain the
field
<example>
Comment: I stand between the candle and the star.
--
1.7.2.5
Reply to: