Bug#649679: [copyright-format] Clarify what distinguishes files and stand-alone license paragraphs.

[Charles Plessy <plessy@debian.org>]

X-Debbugs-CC: dod@debian.org
Package: debian-policy
Version: 3.9.2
Severity: minor
User: debian-policy@lists.debian.org
Usertags: normative issue

Dear all,

I forward here Dominique's comment from ‘http://bugs.debian.org/642833#66’;.
(see also the next messages in that thread).

Le Tue, Sep 27, 2011 at 04:21:07PM +0200, Dominique Dumont a écrit :
> 
> Consider the following (admitedly contrived) copyright paragraph:
> 
> Files: this license applies to any of them
> License: GPL-1+
>  GPL-1+ yada yada
> 
> Is it:
> - a "Files" paragraph with a License field ?
> - a "License" paragraph with an extra "Files" field ?

Perhaps we can clarify how to distinguish files and stand-alone license paragraphs.

The attached patch is in line with what lintian and config-model do.

Have a nice day,

-- 
Charles Plessy
Tsurumi, Kanagawa, Japan

>From 09bcf96b6912c877bd48de697cd4147a980462e3 Mon Sep 17 00:00:00 2001
From: Charles Plessy <plessy@debian.org>
Date: Wed, 23 Nov 2011 12:12:23 +0900
Subject: [PATCH] Clarify what distinguishes files and stand-alone license
 paragraphs.

---
 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 d6790aa..b9efe39 100644
--- a/copyright-format/copyright-format.xml
+++ b/copyright-format/copyright-format.xml
@@ -172,11 +172,13 @@
     <title>Paragraphs</title>
     <para>
       There are three kinds of paragraphs: the first one is called the
-      <link linkend="header-paragraph">header paragraph</link>.  Every other
-      paragraph is either a <link linkend="files-paragraph">Files</link>
-      paragraph or a <link linkend="stand-alone-license-paragraph">stand-alone
-      license</link> paragraph.  This is similar to source and binary package
-      paragraphs in <filename>debian/control</filename> files.
+      <link linkend="header-paragraph">header paragraph</link>, similarly
+      to the source package paragraphs in <filename>debian/control</filename>
+      files.  Every other paragraph is either a <link linkend="files-paragraph">Files</link>
+      paragraph, characterised by the presence of a <varname>Files</varname>
+      field, or a <link linkend="stand-alone-license-paragraph">stand-alone license</link>
+      paragraph, characterised by the presence of a <varname>License</varname>
+      field and the absence of a <varname>Files</varname> field.
     </para>
 
     <section id="header-paragraph">
-- 
1.7.5.4