From a008e8a42391de689b45e0a8d584be3aeba0b73e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Helleu?= Date: Fri, 25 Apr 2025 18:16:02 +0200 Subject: [PATCH] core: move some copyrights and licenses from REUSE config into the files --- .editorconfig | 5 +++++ .gitattributes | 4 ++++ .github/FUNDING.yml | 4 ++++ .github/ISSUE_TEMPLATE/bug_report.yml | 4 ++++ .github/ISSUE_TEMPLATE/config.yml | 4 ++++ .github/ISSUE_TEMPLATE/feature_request.yml | 4 ++++ .github/ISSUE_TEMPLATE/question.yml | 4 ++++ .gitignore | 4 +++- .mailmap | 4 ++++ AUTHORS.md | 6 ++++++ CHANGELOG.md | 6 ++++++ CONTRIBUTING.md | 6 ++++++ README.md | 8 +++++++ REUSE.toml | 25 ++++------------------ UPGRADING.md | 6 ++++++ config.h.cmake | 6 ++++++ 16 files changed, 78 insertions(+), 22 deletions(-) diff --git a/.editorconfig b/.editorconfig index 9254df02c..7381e467e 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,3 +1,8 @@ +# SPDX-FileCopyrightText: 2024 Emil Velikov +# SPDX-FileCopyrightText: 2024-2025 Sébastien Helleu +# +# SPDX-License-Identifier: GPL-3.0-or-later +# # To use this config on you editor, follow the instructions at: # https://editorconfig.org diff --git a/.gitattributes b/.gitattributes index e91a1d0d9..1d99466f0 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,3 +1,7 @@ +# SPDX-FileCopyrightText: 2013-2025 Sébastien Helleu +# +# SPDX-License-Identifier: GPL-3.0-or-later + # files/directories excluded from tarballs .git* export-ignore diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index 1e4ad49eb..daf6252ca 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1 +1,5 @@ +# SPDX-FileCopyrightText: 2019-2025 Sébastien Helleu +# +# SPDX-License-Identifier: GPL-3.0-or-later + custom: https://weechat.org/donate/ diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index 4678a9f8a..323734750 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -1,3 +1,7 @@ +# SPDX-FileCopyrightText: 2023-2025 Sébastien Helleu +# +# SPDX-License-Identifier: GPL-3.0-or-later + name: Bug report description: Create a bug report labels: ["bug"] diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index 3ba13e0ce..f6d7291c5 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -1 +1,5 @@ +# SPDX-FileCopyrightText: 2020-2025 Sébastien Helleu +# +# SPDX-License-Identifier: GPL-3.0-or-later + blank_issues_enabled: false diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml index 8ff694f2b..118a7af33 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.yml +++ b/.github/ISSUE_TEMPLATE/feature_request.yml @@ -1,3 +1,7 @@ +# SPDX-FileCopyrightText: 2023-2025 Sébastien Helleu +# +# SPDX-License-Identifier: GPL-3.0-or-later + name: Feature request description: Request a new feature / enhancement labels: ["feature"] diff --git a/.github/ISSUE_TEMPLATE/question.yml b/.github/ISSUE_TEMPLATE/question.yml index 8beb5e2fe..926bc54b6 100644 --- a/.github/ISSUE_TEMPLATE/question.yml +++ b/.github/ISSUE_TEMPLATE/question.yml @@ -1,3 +1,7 @@ +# SPDX-FileCopyrightText: 2023-2025 Sébastien Helleu +# +# SPDX-License-Identifier: GPL-3.0-or-later + name: Question description: Ask a question labels: ["question"] diff --git a/.gitignore b/.gitignore index 9adc3dc1c..0472eaf5f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,6 @@ -# ignored files for Git +# SPDX-FileCopyrightText: 2007-2025 Sébastien Helleu +# +# SPDX-License-Identifier: GPL-3.0-or-later /build /builddir diff --git a/.mailmap b/.mailmap index d242083e2..8fa0abcca 100644 --- a/.mailmap +++ b/.mailmap @@ -1,3 +1,7 @@ +# SPDX-FileCopyrightText: 2014-2025 Sébastien Helleu +# +# SPDX-License-Identifier: GPL-3.0-or-later +# # Map author and committer names and email addresses to canonical real names # and email addresses. # diff --git a/AUTHORS.md b/AUTHORS.md index d26e68224..9a2716991 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -1,3 +1,9 @@ + + # WeeChat Authors ## Developers diff --git a/CHANGELOG.md b/CHANGELOG.md index 328beb05e..7c80e46a0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ + + # WeeChat ChangeLog ## Version 4.7.0 (under dev) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 3a6e316a1..6d834ee95 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,3 +1,9 @@ + + # Contributing to WeeChat ## Reporting bugs diff --git a/README.md b/README.md index e5529fbc7..47cc65cb8 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,9 @@ + + # WeeChat

@@ -49,6 +55,7 @@ WeeChat is following a "practical" semantic versioning, see file [CONTRIBUTING.m ## Copyright + Copyright © 2003-2025 [Sébastien Helleu](https://github.com/flashcode) This file is part of WeeChat, the extensible chat client. @@ -65,3 +72,4 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with WeeChat. If not, see . + diff --git a/REUSE.toml b/REUSE.toml index 893ab034b..7de2b9743 100644 --- a/REUSE.toml +++ b/REUSE.toml @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2003-2025 Sébastien Helleu +# SPDX-FileCopyrightText: 2025 Sébastien Helleu # # SPDX-License-Identifier: GPL-3.0-or-later @@ -6,27 +6,10 @@ version = 1 [[annotations]] path = [ - ".editorconfig", - ".gitattributes", - ".github/FUNDING.yml", - ".github/ISSUE_TEMPLATE/*.yml", - ".gitignore", - ".mailmap", - "AUTHORS.md", - "CHANGELOG.md", - "CONTRIBUTING.md", - "README.md", - "UPGRADING.md", - "config.h.cmake", "debian-devel/**", "debian-stable/**", - "icons/128x128/weechat.png", - "icons/16x16/weechat.png", - "icons/256x256/weechat.png", - "icons/32x32/weechat.png", - "icons/512x512/weechat.png", - "icons/64x64/weechat.png", - "icons/scalable/weechat.svg", + "icons/**/*.png", + "icons/**/*.svg", "src/plugins/php/weechat-php_arginfo.h", "src/plugins/php/weechat-php_legacy_arginfo.h", "tools/debian/patches/**", @@ -34,5 +17,5 @@ path = [ "weechat.pc.in", ] precedence = "override" -SPDX-FileCopyrightText = "2018-2025 Sébastien Helleu " +SPDX-FileCopyrightText = "2003-2025 Sébastien Helleu " SPDX-License-Identifier = "GPL-3.0-or-later" diff --git a/UPGRADING.md b/UPGRADING.md index 2d84b9315..a58612e6b 100644 --- a/UPGRADING.md +++ b/UPGRADING.md @@ -1,3 +1,9 @@ + + # WeeChat Upgrade guidelines These upgrade guidelines only contain instructions for version upgrades which require manual actions.\ diff --git a/config.h.cmake b/config.h.cmake index b72b2f8d5..8de138062 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -1,3 +1,9 @@ +/* +SPDX-FileCopyrightText: 2007-2025 Sébastien Helleu + +SPDX-License-Identifier: GPL-3.0-or-later +*/ + #cmakedefine01 ENABLE_NCURSES #cmakedefine01 ENABLE_HEADLESS #cmakedefine01 ENABLE_NLS