Skip to content
This repository was archived by the owner on May 27, 2024. It is now read-only.

Commit 4e16ac2

Browse files
authored
Merge pull request #133 from carmenbianca/prep-3.2
Prepare 3.2 version of specification
2 parents 0913b0a + 72aa8a8 commit 4e16ac2

File tree

2 files changed

+249
-136
lines changed

2 files changed

+249
-136
lines changed

CHANGELOG.md

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -20,58 +20,66 @@ following sections:
2020

2121
The versions follow [semantic versioning](https://semver.org).
2222

23+
<!--
2324
## Unreleased - YYYY-MM-DD
2425
26+
### Added
27+
2528
### Changed
29+
2630
### Deprecated
31+
2732
### Removed
33+
2834
### Fixed
35+
2936
### Security
30-
### Added
37+
-->
3138

32-
## 3.1 - 2023-06-21
39+
## 3.2 - YYYY-MM-DD
3340

3441
### Added
3542

3643
- Definition for Commentable and Uncommentable Files. (#123, thanks @Jayman2000)
37-
3844
- Introduce support of in-line snippet comments using
3945
`SPDX-SnippetBegin`/`SPDX-SnippetEnd`. (#107)
40-
4146
- Specify encoding of `.license` files to UTF-8. (#106, thanks @kirelagin for
4247
the helpful background information)
43-
4448
- Introduce `REUSE-IgnoreStart`/`REUSE-IgnoreEnd` to make the REUSE helper tool
4549
not consider the enclosed content for detecting copyright and licensing
4650
information. (#104)
47-
4851
- Definition for Covered File and clarify for which file copyright and licensing
4952
information is required. (#85, thanks @Jayman2000)
50-
5153
- Remove SPDX documents from list of Covered Files. (#103)
52-
5354
- Remove symlinks and zero-byte files from list of Covered Files. (#101)
54-
5555
- Remove submodules and Meson subprojects from list of Covered Files. (#99)
56-
5756
- Clarify which license text files are needed if a SPDX license expression
5857
contains more than one license and/or exception. (#96)
59-
6058
- URLs to currently applicable SPDX specification. (#49)
59+
- Define an order or precedence. (formerly #131, overhauled in #133)
60+
- REUSE.toml definition added. (#133)
6161

62-
- Define current order or precedence. (#131)
63-
6462
### Changed
6563

6664
- Allow `.license` files for commentable files, but strongly recommend adding
6765
copyright/licensing information in header. (#123, thanks @Jayman2000)
68-
6966
- Bump referenced SPDX version to 2.3, and update links. (#103) (#107)
7067

68+
### Deprecated
69+
70+
- DEP5 deprecated. (#133)
71+
7172
### Fixed
7273

7374
- Minor typos and grammar mistakes. Thanks @jlovejoy and @Jayman2000!
75+
- Improved definition of Copyright Notices. (#133)
76+
- `COPYING` and `LICENSE` are now marked as ignored, when they were already
77+
ignored by the tool since its inception. (#133)
7478

79+
## 3.1 - 2023-06-21 [YANKED]
80+
81+
This version was yanked soon after release after a new definition of the order
82+
of precedence broke compatibility.
7583

7684
## 3.0 - 2019-08-07
7785

@@ -80,15 +88,12 @@ The versions follow [semantic versioning](https://semver.org).
8088
- `SPDX-FileCopyrightText: Jane Doe` is now the recommended way to mark a copyright
8189
notice instead of `Copyright (C) Jane Doe`. `Copyright` and `©` are still
8290
supported as prefixes.
83-
8491
- The specification now makes a recommendation on the format of copyright
8592
notices, but does not mandate anything other than that the copyright notice
8693
contain the name of the copyright holder. The format is roughly:
8794
`SPDX-FileCopyrightText: 2019 Jane Doe <[email protected]>`
88-
8995
- An FAQ and much-needed tutorial are added to help people along, instead of
9096
letting the specification do double duty as a tutorial.
91-
9297
- The tool has been updated to be a lot friendlier to use, and to print more
9398
helpful linting output. In a future release it will automate some tasks (e.g.,
9499
adding copyright and licensing information headers to specified files).
@@ -97,9 +102,7 @@ The versions follow [semantic versioning](https://semver.org).
97102

98103
- The DEP5 file which bulk-licenses directories as a sort of global
99104
configuration file was moved from `debian/copyright` to `.reuse/dep5`.
100-
101105
- The three steps have been changed from
102-
103106
1. Provide the exact text of each license used
104107
2. Include a copyright notice and license in each file
105108
3. Provide an inventory for included software
@@ -115,12 +118,9 @@ The versions follow [semantic versioning](https://semver.org).
115118
- The specification no longer makes a recommendation on how to deal with
116119
licenses such as BSD and MIT that themselves contain editable copyright
117120
notices.
118-
119121
- License files can now only be placed in `LICENSES/[spdx-identifier].[ext]`
120122
files, instead of the default `LICENSE`, `COPYING`, etc.. As a result, the
121123
`Valid-License-Identifier` tag is no longer needed.
122-
123124
- The specification no longer makes any mention of version control systems to
124125
track copyright.
125-
126126
- The specification no longer mentions a bill of materials (SPDX Document).

0 commit comments

Comments
 (0)