From d4e4c4f7e324933b9caf87d6c49484fe0aa7b2e6 Mon Sep 17 00:00:00 2001 From: Ibrahn Sahir Date: Sat, 1 Sep 2018 12:45:13 +0100 Subject: [PATCH] Fixed up a couple of license names in COPYRIGHT.txt A couple of entries were using SPDX name over the Debian standard ones. Switched these over and noted this policy at the top of the file to avoid confusion. (cherry picked from commit 6f2977f9c394d3489a1377f0a3d63caa15bddab1) --- COPYRIGHT.txt | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/COPYRIGHT.txt b/COPYRIGHT.txt index e59641b196b..a6ac5d069b2 100644 --- a/COPYRIGHT.txt +++ b/COPYRIGHT.txt @@ -10,8 +10,9 @@ # all corresponding files (also recursively in subfolders), apart from those # with a more explicit copyright statement. # -# Licenses are given with their SPDX identifier, and are all included in -# plain text at the end of this file (in alphabetical order). +# Licenses are given with their debian/copyright short name (or SPDX identifier +# if no standard short name exists) and are all included in plain text at the +# end of this file (in alphabetical order). # # Disclaimer for thirdparty libraries: # ------------------------------------ @@ -351,7 +352,7 @@ Files: ./thirdparty/tinyexr/ Comment: TinyEXR Copyright: 2014-2017, Syoyo Fujita 2002, Industrial Light & Magic, a division of Lucas Digital Ltd. LLC -License: BSD-3-Clause +License: BSD-3-clause Files: ./thirdparty/zlib/ Comment: zlib @@ -361,7 +362,7 @@ License: Zlib Files: ./thirdparty/zstd/ Comment: Zstandard Copyright: 2016-2018, Facebook, Inc. -License: BSD-3-Clause +License: BSD-3-clause