From b1f540d2677b0e86ff16ecd42e2861d7a26201b7 Mon Sep 17 00:00:00 2001 From: Philip Withnall Date: Wed, 7 Feb 2024 12:08:46 +0000 Subject: [PATCH 1/2] reuse: Add dep5 lines for gnulib and libcharset MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Since they are copylibs, we don’t want to diverge from upstream by adding SPDX lines to all the files, so add them to the dep5 file instead. gnulib discussed adding them upstream a couple of years ago but the discussion seemed to peter out: https://lists.gnu.org/archive/html/bug-gnulib/2021-06/msg00004.html. Signed-off-by: Philip Withnall --- .reuse/dep5 | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/.reuse/dep5 b/.reuse/dep5 index 40fa0f81d..72a4790ab 100644 --- a/.reuse/dep5 +++ b/.reuse/dep5 @@ -47,4 +47,16 @@ License: CC-BY-SA-3.0 # girepository/cmph/README-CMPH-IMPORT.txt. Files: girepository/cmph/* Copyright: CMPH contributors -License: LGPL-2.1-only or MPL-1.1 \ No newline at end of file +License: LGPL-2.1-only or MPL-1.1 + +# gnulib is a copylib. Adding copyright/license data to the files there would +# cause divergence from upstream. See glib/gnulib/README. +Files: glib/gnulib/* +Copyright: gnulib contributors +License: LGPL-2.1-or-later + +# libcharset is a copylib. Adding copyright/license data to the files there +# would cause divergence from upstream. See glib/libcharset/README. +Files: glib/libcharset/* +Copyright: libcharset contributors +License: LGPL-2.1-or-later \ No newline at end of file From 722805fd096041dc2988475f0feabc61c59afbde Mon Sep 17 00:00:00 2001 From: Philip Withnall Date: Wed, 7 Feb 2024 12:10:04 +0000 Subject: [PATCH 2/2] reuse: Update CI limits on files missing SPDX data One more monotonic step on the way to full REUSE compliance. Signed-off-by: Philip Withnall Helps: #1415 --- .gitlab-ci/run-reuse.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci/run-reuse.sh b/.gitlab-ci/run-reuse.sh index 6d0a44c56..224545302 100755 --- a/.gitlab-ci/run-reuse.sh +++ b/.gitlab-ci/run-reuse.sh @@ -16,8 +16,8 @@ git submodule update --init # suitable copyright/licensing information has increased from a baseline # FIXME: Eventually this script can check whether *any* files are missing # information. But for now, let’s slowly improve the baseline. -files_without_copyright_information_max=407 -files_without_license_information_max=559 +files_without_copyright_information_max=346 +files_without_license_information_max=417 # The || true is because `reuse lint` will exit with status 1 if the project is not compliant # FIXME: Once https://github.com/fsfe/reuse-tool/issues/512 or