From: Bill Allombert <Bill.Allombert@math.u-bordeaux1.fr>
Date: Mon, 28 Nov 2011 22:49:46 +0000 (+0100)
Subject: copyright-format: Clarify specification of multiple license exception
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=21b04a5dd8f510f167198836d0e8c0acd3d17b3f;p=debian%2Fdebian-policy.git

copyright-format: Clarify specification of multiple license exception

Wording: Steve Langasek <vorlon@debian.org>
Seconded: Craig Small <csmall@debian.org>
Seconded: Gregor Herrmann <gregoa@debian.org>
Seconded: Jakub Wilk <jwilk@debian.org>
Seconded: Jonas Smedegaard <dr@jones.dk>
Closes: #633797
---

diff --git a/copyright-format/copyright-format.xml b/copyright-format/copyright-format.xml
index d6790aa..d03d4db 100644
--- a/copyright-format/copyright-format.xml
+++ b/copyright-format/copyright-format.xml
@@ -885,10 +885,22 @@ License: MPL-1.1
         matches.
       </para>
       <para>
-        Exceptions and clarifications are signaled in plain text, by appending
+        An exception or clarification to a license is signaled in plain text, by appending
         <literal>with <varname><replaceable>keywords</replaceable></varname>
         exception</literal> to the short name.  This document provides a list of
-        keywords that refer to the most frequent exceptions.
+        keywords that must be used when referring to the most frequent
+        exceptions.  When exceptions other than these are in effect that modify
+        a common license by granting additional permissions, you may use an
+        arbitrary keyword not taken from the below list of keywords.  When a
+        license differs from a common license because of added restrictions
+        rather than because of added permissions, a distinct short name should
+        be used instead of <literal>with
+        <varname><replaceable>keywords</replaceable></varname>exception</literal>.
+      </para>
+      <para>
+        Only one exception may be specified for each license within a given
+        license specification.  If more than one exception applies to a single
+        license, an arbitrary short name must be used instead.
       </para>
       <para>
         The GPL <literal>Font</literal> exception refers to the text added to the
diff --git a/debian/changelog b/debian/changelog
index 3d4a291..8248d33 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -47,6 +47,13 @@ debian-policy (3.9.3.0) UNRELEASED; urgency=low
     Seconded: Charles Plessy <plessy@debian.org>
     Seconded: Jakub Wilk <jwilk@debian.org>
     Closes: #640735
+  * copyright-format: Clarify specification of multiple license exception:
+    Wording: Steve Langasek <vorlon@debian.org>
+    Seconded: Craig Small <csmall@debian.org>
+    Seconded: Gregor Herrmann <gregoa@debian.org>
+    Seconded: Jakub Wilk <jwilk@debian.org>
+    Seconded: Jonas Smedegaard <dr@jones.dk>
+    Closes: #633797
   * Perl policy: Document major version upgrade trigger
     Wording: Dominic Hargreaves <dom@debian.org>
     Seconded: Russ Allbery <rra@debian.org>