From 2185e5d5e4d921bf2697d86a80c3cf1d91e8d398 Mon Sep 17 00:00:00 2001 From: Charles Plessy Date: Tue, 21 Feb 2012 10:19:05 -0800 Subject: [PATCH] DEP-5 updates from further debian-project discussion Clarify that this document does not supersede or modify the requirements in Policy and that use of the specification is optional. Note that a single Files paragraph can apply to the whole package (rather than using the "all files" wording) and that only the license and copyright information required by the Debian archive has to be listed. Clarify the wording of stand-alone license paragraphs to be clear that they can be used with exceptions. Some wording improvements, including making the attributes listed after the fields lowercase. Fix a few links and the official keyword of the BSD-3-clause license in some examples. Add a Version 1.0 subtitle. --- copyright-format/copyright-format.xml | 87 ++++++++++++++------------- 1 file changed, 46 insertions(+), 41 deletions(-) diff --git a/copyright-format/copyright-format.xml b/copyright-format/copyright-format.xml index 2420631..36265a4 100644 --- a/copyright-format/copyright-format.xml +++ b/copyright-format/copyright-format.xml @@ -15,6 +15,7 @@ Machine-readable <filename>debian/copyright</filename> file. + Version 1.0 Copying and distribution of this file, with or without modification, are @@ -42,8 +43,10 @@ automatically extract licensing information. - This is not a proposal to change the policy in the short term. In - particular, nothing in this proposal supersedes or modifies any of the + Use of this specification is optional. + + + Nothing in this proposal supersedes or modifies any of the requirements specified in Debian Policy regarding the appropriate detail or granularity to use when documenting copyright and license status in debian/copyright. @@ -78,9 +81,9 @@ no way to know how much of Debian should be stripped from such a system. - A user might want to have a way to avoid software with certain licenses - they have a problem with, even if the licenses are DFSG-free. For example, - the Affero GPL. + Even where licenses are DFSG-free and mutually compatible, users might want + a way to avoid software with certain licenses, for example if they have a + problem with the Affero GPL. @@ -124,9 +127,8 @@ paragraph. - The value of each field is of one of the four types listed below. The - definition for each field in this document indicates which type of - value it takes. + There are four types of fields. The definition for each field in this + document indicates which type of value it takes.
@@ -153,8 +155,8 @@
Line-based lists - Another kind of list value has one value per line. For example, - Copyright can list many copyright statements, one per + This means that the field has one value per line. For example, + Upstream-Contact can list contact addresses, one per line.
@@ -186,7 +188,7 @@
- Header paragraph (Once) + Header paragraph (once) The following fields may be present in a header paragraph. @@ -258,12 +260,13 @@ Source: http://www.example.com/software/project
- Files paragraph (Repeatable) + Files paragraph (repeatable) - The declaration of copyright and license for files is done in one or + The declaration of copyright and license for files may consist of one or more paragraphs. In the simplest case, a single paragraph can be used - which applies to all files and lists all applicable copyrights and - licenses. + which applies to the whole package. Only the license and copyright + information required by the Debian archive is required to be listed + here. The following fields may be present in a Files paragraph. @@ -277,7 +280,7 @@ Source: http://www.example.com/software/project - Copyright: required. + Copyright: required. @@ -321,12 +324,14 @@ License: GPL-2+
- Stand-alone License Paragraph (Optional, Repeatable) + Stand-alone License Paragraph (optional, repeatable) - Where a set of files are dual (tri, etc) licensed, or when the same - license occurs multiple times, you can use a single-line - License field and stand-alone - License paragraphs to expand the license short names. + Stand-alone License paragraphs can be used to + provide the full license text for a given license once, instead of + repeating it in each Files paragraph that refers to + it. The first line of the License field must be a + single license short name or a short name followed by a license + exception. The following fields may be present in a stand-alone License @@ -413,7 +418,7 @@ License: MPL-1.1
<varname>Source</varname> - Formatted text, no synopsis: an explanation from where the upstream + Formatted text, no synopsis: an explanation of where the upstream source came from. Typically this would be a URL, but it might be a free-form explanation. The Debian Policy section 12.5 @@ -466,12 +471,11 @@ License: MPL-1.1 single copyright file. - Remaining lines: if left blank here, the file - must include a stand-alone License - paragraph matching each license short - name listed on the first line. - Otherwise, this field should either + paragraphs. Otherwise, this field should either include the full text of the license(s) or include a pointer to the license file under /usr/share/common-licenses. This field should include all text needed in order to fulfill both @@ -508,8 +512,8 @@ License: MPL-1.1 Copyright 2009 Angela Watts and file B has: Copyright 2010 Angela Watts - the Copyright field for a stanza covering both - file A and file B need contain only: + then the Copyright field for a paragraph covering both + file A and file B only needs to contain: Copyright 2008 John Smith Copyright 2009, 2010 Angela Watts @@ -588,8 +592,8 @@ Copyright 2009, 2010 Angela Watts paragraph that matches a particular file applies to it. - Exclusions are done by having multiple Files - paragraphs. + Exclusions are only supported by adding Files + paragraphs to override the previous match.
@@ -635,9 +639,9 @@ Copyright 2009, 2010 Angela Watts added, using a dash as a separator. If omitted, the lowest version number is implied. When the license grant permits using the terms of any later version of that license, the short name is finished with a plus - sign. For SPDX compatibility, trailing - dot-zeroes are considered to be equal to plainer - version (e.g., 2.0.0 is considered equal to + sign. For SPDX compatibility, versions with trailing + dot-zeroes are considered to be equivalent to + versions without (e.g., 2.0.0 is considered equal to 2.0 and 2). @@ -1077,22 +1081,23 @@ also delete it here. This is a dual-licensed GPL/Artistic work such as Perl: License: GPL-1+ or Artistic This is for a file that has both GPL and classic BSD code in it: -License: GPL-2+ and BSD - For the most complex cases, the comma is used to disambiguate the - priority of ors and ands - and has the priority over or, - unless preceded by a comma. For instance: +License: GPL-2+ and BSD-3-clause + For the most complex cases, a comma is used to disambiguate the + priority of ors and ands. + The conjunction and has priority over + or unless preceded by a comma. For + instance: A or B and C means A or (B and C). - A or B, and C means (A or B), and + A or B, and C means (A or B) and C. This is for a file that has Perl code and classic BSD code in it: -License: GPL-2+ or Artistic-2.0, and BSD +License: GPL-2+ or Artistic-2.0, and BSD-3-clause A GPL-2+ work with the OpenSSL exception is in effect a dual-licensed work that can be redistributed either under the GPL-2+, or under the -- 2.39.2