From 99723f07afa3a21514fa21241893fc742ae2a65b Mon Sep 17 00:00:00 2001
From: Viktor Szakats <commit@vsz.me>
Date: Fri, 5 Jul 2024 16:41:57 +0200
Subject: [PATCH] REUSE: shorten and improve

Follow-up to 70b8bf314cf4566a7529c5d6eae63097a926abb0 #1419
---
 REUSE.toml | 73 ++++++++++++++++--------------------------------------
 1 file changed, 21 insertions(+), 52 deletions(-)

diff --git a/REUSE.toml b/REUSE.toml
index db25530d..d336f83d 100644
--- a/REUSE.toml
+++ b/REUSE.toml
@@ -2,48 +2,25 @@
 #
 # SPDX-License-Identifier: BSD-3-Clause
 
+# This file describes the licensing and copyright situation for files that
+# cannot be annotated directly, for example because of being simply
+# uncommentable. Unless this is the case, a file should be annotated directly.
+#
+# This follows the REUSE specification: https://reuse.software/spec-3.2/#reusetoml
+
 version = 1
 SPDX-PackageName = "libssh2"
-SPDX-PackageSupplier = "The libssh2 team <libssh2-devel@lists.haxx.se>"
 SPDX-PackageDownloadLocation = "https://libssh2.org/"
 
-# Test data
-[[annotations]]
-path = [
-  "tests/ossfuzz/*",
-  "tests/key_*",
-  "tests/test_read_algos.txt",
-  "ci/spellcheck-words.txt",
-]
-SPDX-FileCopyrightText = "The libssh2 project and its contributors."
-SPDX-License-Identifier = "BSD-3-Clause"
-
-# Test server
-[[annotations]]
-path = [
-  "tests/openssh_server/.gitattributes",
-  "tests/openssh_server/authorized_keys",
-  "tests/openssh_server/ca_*",
-  "tests/openssh_server/ssh_*",
-  "tests/openssh_server/sshd_config",
-]
-SPDX-FileCopyrightText = "The libssh2 project and its contributors."
-SPDX-License-Identifier = "BSD-3-Clause"
-
-# Root files
 [[annotations]]
 path = [
+  ".github/ISSUE_TEMPLATE/bug_report.md",
+  ".github/SECURITY.md",
   "NEWS",
   "README",
   "README.md",
   "RELEASE-NOTES",
-]
-SPDX-FileCopyrightText = "The libssh2 project and its contributors."
-SPDX-License-Identifier = "BSD-3-Clause"
-
-# Docs
-[[annotations]]
-path = [
+  "ci/spellcheck-words.txt",
   "docs/AUTHORS",
   "docs/BINDINGS.md",
   "docs/HACKING-CRYPTO",
@@ -54,31 +31,21 @@ path = [
   "docs/TODO",
   "docs/template.3",
   "os400/README400",
-]
-SPDX-FileCopyrightText = "The libssh2 project and its contributors."
-SPDX-License-Identifier = "BSD-3-Clause"
-
-# VMS
-[[annotations]]
-path = [
+  "tests/key_*",
+  "tests/openssh_server/.gitattributes",
+  "tests/openssh_server/authorized_keys",
+  "tests/openssh_server/ca_*",
+  "tests/openssh_server/ssh_*",
+  "tests/openssh_server/sshd_config",
+  "tests/ossfuzz/*",
+  "tests/test_read_algos.txt",
   "vms/libssh2_config.h",
-  "vms/libssh2_make_example.dcl",
-  "vms/libssh2_make_help.dcl",
-  "vms/libssh2_make_kit.dcl",
-  "vms/libssh2_make_lib.dcl",
+  "vms/libssh2_*.dcl",
   "vms/man2help.c",
   "vms/readme.vms",
-]
-SPDX-FileCopyrightText = "The libssh2 project and its contributors."
-SPDX-License-Identifier = "BSD-3-Clause"
-
-# Dotfiles
-[[annotations]]
-path = [
+  # dotfiles
   ".checksrc",
   ".editorconfig",
-  ".github/ISSUE_TEMPLATE/bug_report.md",
-  ".github/SECURITY.md",
   ".gitignore",
   "docs/.gitignore",
   "example/.gitignore",
@@ -88,3 +55,5 @@ path = [
 ]
 SPDX-FileCopyrightText = "The libssh2 project and its contributors."
 SPDX-License-Identifier = "BSD-3-Clause"
+# If there is licensing/copyright information in or next to these files, perfer that
+precedence = "closest"