Le Sat, Feb 11, 2012 at 03:23:42AM -0600, Jonathan Nieder a écrit :
>
> Now based on your response, I suspect you misread "each" to mean
> "all". Can you suggest an alternate wording? For example, maybe
> something in this spirit would work:
>
> If there are no remaining lines, then all of the short names
> or short names followed by license exceptions making up the
> first line must be described in standalone license paragraphs.
Very good ! I committed this plus your other suggestion, where I replaced
"instead of once for each" by "instead of repeating it in each".
Here is the full patch.
--- copyright-format.xml (révision 273)
+++ copyright-format.xml (copie de travail)
@@ -325,10 +325,12 @@
<section id="stand-alone-license-paragraph">
<title>Stand-alone License Paragraph (optional, repeatable)</title>
<para>
- Where a set of files are covered by multiple licenses, or one
- license occurs multiple times, you can use a single-line
- <varname>License</varname> field and standalone
- <varname>License</varname> paragraphs to expand the license short
names.
+ Stand-alone <varname>License</varname> paragraphs can be used to
+ provide the full license text for a given license once, instead of
+ repeating it in each <varname>Files</varname> paragraph that refers to
+ it. The first line of the <varname>License</varname> field must be a
+ single license short name or a short name followed by a license
+ exception.
</para>
<para>
The following fields may be present in a standalone License
@@ -468,12 +470,11 @@
single copyright file.
</para>
<para>
- Remaining lines: if these are omitted, the file
- <emphasis>must</emphasis> include a <link
+ If there are no remaining lines, then all of the short names
+ or short names followed by license exceptions making up the
+ first line must be described in <link
linkend="stand-alone-license-paragraph">standalone License
- paragraph</link> matching each license short
- name listed on the first line.
- Otherwise, this field should either
+ paragraphs</link>. Otherwise, this field should either
include the full text of the license(s) or include a pointer to the
license file under <filename>/usr/share/common-licenses</filename>.
This field should include all text needed in order to fulfill both
I will keep this bug open because this patch does not address the core of
Ximin's question.
Cheers,
--
Charles
--
To UNSUBSCRIBE, email to debian-policy-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/20120211124524.ga20...@falafel.plessy.net
