Bug#609160: debian-policy: include DEP5

[Charles Plessy <plessy@debian.org>]

Le Sat, Apr 09, 2011 at 07:16:17PM +0100, Lars Wirzenius a écrit :
> reopen 609160
> thanks
> 
> Attached please find my changes to the docbook conversion.
> 
> * remove drivers from abstract (we're mentioned in acks, which is
> enough)
> * a couple of missing spaces from markup
> * removal of useless appendix (this was in dep svn already, so better do
> it in the version in policy too)

Dear Lars,

thanks for the corrections.

Would you consider this attached patch as well, that we discussed earlier in
November, and that was waiting for #593909 to be applied to the Policy ?

http://lists.debian.org/20101114035912.GD4949@merveille.plessy.net

Have a nice day,

Charles

-- 
Charles Plessy
Tsurumi, Kanagawa, Japan

>From b39e782304c148820c45a60b730d0f949bab9cad Mon Sep 17 00:00:00 2001
From: Charles Plessy <plessy@debian.org>
Date: Wed, 13 Apr 2011 10:44:28 +0900
Subject: [PATCH] =?UTF-8?q?Indicate=20the=20field=20type=20according=20to=20Policy=20=C2=A75.1.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

First discussed in <20101114035912.GD4949@merveille.plessy.net>.
---
 copyright-format/copyright-format.xml |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/copyright-format/copyright-format.xml b/copyright-format/copyright-format.xml
index cd55699..d4f1bc1 100644
--- a/copyright-format/copyright-format.xml
+++ b/copyright-format/copyright-format.xml
@@ -122,11 +122,13 @@
     </para>
     <para>
       There are four kinds values for fields.  Each field specifies which kind
-      is allowed.
+      is allowed.  The field type is indicated in parenthesis, according to
+      Policy's <ulink
+      url="http://www.debian.org/doc/debian-policy/ch-controlfields#s-controlsyntax";>section 5.1</ulink>.
     </para>
 
     <section id="single-line">
-      <title>Single-line values</title>
+      <title>Single-line values (simple)</title>
       <para>
         A single-line value means that the whole value of a field must fit on a
         single line.  For example, the <varname>Format</varname> field has a
@@ -136,7 +138,7 @@
     </section>
 
     <section id="white-space-lists">
-      <title>White space separated lists</title>
+      <title>White space separated lists (folded)</title>
       <para>
         A white space separated list means that the field value may be on one
         line or many, but values in the list are separated by one or more white
@@ -146,7 +148,7 @@
     </section>
 
     <section id="line-based-lists">
-      <title>Line based lists</title>
+      <title>Line based lists (multiline)</title>
       <para>
         Another kind of list value has one value per line. For example,
         <varname>Copyright</varname> can list many copyright statements, one per
@@ -155,7 +157,7 @@
     </section>
 
     <section id="formatted-text">
-      <title>Text formatted like package long descriptions</title>
+      <title>Text formatted like package long descriptions (multiline)</title>
       <para>
         Formatted text fields use the same rules as the long description in a
         package's <varname>Description</varname> field, possibly also using the
-- 
1.7.2.5