From fc2234f2bcf7a7822334214b8e5a1f274b5947d2 Mon Sep 17 00:00:00 2001 From: Jason Yundt Date: Fri, 17 Sep 2021 15:08:02 -0400 Subject: [PATCH 1/2] Make requirements apply to the same set of files Before this change, the License File requirement applied to all files in a Project, but the Copyright and Licensing Information requirement applied to only some of the files in a Project. This change makes it so that: - If a file needs a License File, then it also needs Copyright and Licensing information. - If a file needs Copyright and Licensing Information, then it also needs a License File. Fixes #84. --- spec.md | 32 ++++++++++++++------------------ 1 file changed, 14 insertions(+), 18 deletions(-) diff --git a/spec.md b/spec.md index 25070ea..45c6cde 100644 --- a/spec.md +++ b/spec.md @@ -32,6 +32,16 @@ These are the definitions for some of the terms used in this specification: copyright holders of a file or work, and describes under which licenses the file or work is made available. +- Covered File --- any file in a Project, except for + - The License Files. + - The files belonging to the Project's version control system (example: + `.git/`). + - The files ignored by the version control system (example: Files listed in + `.gitignore`). + - The files in the `.reuse/` directory in the root of the Project. This + directory MUST contain only files relevant for the operation of the REUSE + Tool. + - SPDX Specification --- SPDX specification, version 2.1; as available on . @@ -55,8 +65,8 @@ These are the definitions for some of the terms used in this specification: ## License files -A Project MUST include a License File for every license under which files in the -Project are licensed. +A Project MUST include a License File for every license under which Covered +Files are licensed. Each License File MUST be placed in the `LICENSES/` directory in the root of the Project. The name of the License File MUST be the SPDX License Identifier of the @@ -75,22 +85,8 @@ exception that does not exist in the SPDX License List. ## Copyright and Licensing Information -Each file in the Project MUST have Copyright and Licensing Information -associated with it, except the following files: - -- The License Files. - -- The files belonging to the Project's version control system (example: - `.git/`). - -- The files ignored by the version control system (example: Files listed in - `.gitignore`). - -- The files in the `.reuse/` directory in the root of the Project. This - directory MUST contain only files relevant for the operation of the REUSE - Tool. - -There are two ways to associate Copyright and Licensing Information with a +Each Covered File MUST have Copyright and Licensing Information associated with +it. There are two ways to associate Copyright and Licensing Information with a file. ### Comment headers From 0452570581c058c39cbcfa9f173eb1710875e3f7 Mon Sep 17 00:00:00 2001 From: Jason Yundt Date: Fri, 17 Sep 2021 15:10:43 -0400 Subject: [PATCH 2/2] Define REUSE Tool before the term is used --- spec.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/spec.md b/spec.md index 45c6cde..906601c 100644 --- a/spec.md +++ b/spec.md @@ -22,6 +22,9 @@ log](https://git.fsfe.org/reuse/docs/src/branch/master/CHANGELOG.md). These are the definitions for some of the terms used in this specification: +- REUSE Tool --- helper tool for compliance with this Specification; available + at . + - Project --- any unit of content that can be associated with a distribution of software. Typically, a Project is composed of one or more files. Also sometimes called a package. @@ -60,9 +63,6 @@ These are the definitions for some of the terms used in this specification: Specification takes precedence. Specifically in the case of the `Copyright` and `License` tags. -- REUSE Tool --- helper tool for compliance with this Specification; available - at . - ## License files A Project MUST include a License File for every license under which Covered