From b2f326123171f77a5a177936714730d0173aef03 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Tue, 9 Jul 2024 09:05:14 +0200 Subject: [PATCH] chore: Migrate REUSE to TOML Signed-off-by: Andy Scherzinger --- .reuse/dep5 | 43 ------------------------- AUTHORS.md | 5 +++ README.md | 5 +++ REUSE.toml | 60 +++++++++++++++++++++++++++++++++++ composer.lock | 8 ++--- docs/admin-notifications.md | 4 +++ docs/notification-workflow.md | 5 +++ docs/ocs-endpoint-v1.md | 5 +++ docs/ocs-endpoint-v2.md | 4 +++ docs/push-v2.md | 4 +++ docs/screenshot.png.license | 2 ++ 11 files changed, 98 insertions(+), 47 deletions(-) delete mode 100644 .reuse/dep5 create mode 100644 REUSE.toml create mode 100644 docs/screenshot.png.license diff --git a/.reuse/dep5 b/.reuse/dep5 deleted file mode 100644 index a119fbb5..00000000 --- a/.reuse/dep5 +++ /dev/null @@ -1,43 +0,0 @@ -Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: notifications -Upstream-Contact: Nextcloud -Source: https://github.com/nextcloud/notifications/ - - -Files: l10n/*.js l10n/*.json -Copyright: 2016 Nextcloud GmbH and Nextcloud and ownCloud contributors -License: AGPL-3.0-or-later - -Files: js/*.js js/*.js.map -Copyright: 2016 Nextcloud GmbH and Nextcloud contributors -License: AGPL-3.0-or-later - -Files: openapi.json openapi-*.json src/types/openapi/*.ts -Copyright: 2023 Nextcloud GmbH and Nextcloud contributors -License: AGPL-3.0-or-later - -Files: .github/CODEOWNERS .github/dependabot.yml tests/Integration/base-query-count.txt -Copyright: none -License: CC0-1.0 - -Files: docs .github/issue_template.md .github/contributing.md AUTHORS.md README.md -Copyright: 2016 Nextcloud GmbH and Nextcloud contributors -License: CC0-1.0 - -Files: tests/Integration/features/*.feature -Copyright: 2016 Nextcloud GmbH and Nextcloud contributors -License: CC0-1.0 - -Files: package.json package-lock.json */package.json */package-lock.json composer.json composer.lock */composer.json */composer.lock .gitignore .l10nignore psalm.xml tests/psalm-baseline.xml vendor-bin/*/composer.json vendor-bin/*/composer.lock .tx/config */phpunit.xml tsconfig.json -Copyright: none -License: CC0-1.0 - -# Icons -Files: img/notifications-dark.svg img/notifications.png img/notifications.svg -Copyright: Nextcloud GmbH and Nextcloud contributors -License: CC0-1.0 - -# Sounds -Files: img/notification.ogg img/talk.ogg -Copyright: 2017 Feandesign https://soundcloud.com/feandesign -License: CC0-1.0 diff --git a/AUTHORS.md b/AUTHORS.md index ab3b20e9..f4767506 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -1,3 +1,7 @@ + # Authors - Daniel Kesselberg @@ -6,4 +10,5 @@ - Kate Döen - Nikita Toponen - Thomas Müller +- Nextcloud GmbH - ownCloud, Inc. diff --git a/README.md b/README.md index d1f89c7d..4a795fe0 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,8 @@ + # Notifications [![REUSE status](https://api.reuse.software/badge/github.com/nextcloud/notifications)](https://api.reuse.software/info/github.com/nextcloud/notifications) diff --git a/REUSE.toml b/REUSE.toml new file mode 100644 index 00000000..7a083b8e --- /dev/null +++ b/REUSE.toml @@ -0,0 +1,60 @@ +# SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors +# SPDX-License-Identifier: AGPL-3.0-or-later +version = 1 +SPDX-PackageName = "notifications" +SPDX-PackageSupplier = "Nextcloud " +SPDX-PackageDownloadLocation = "https://github.com/nextcloud/notifications/" + +[[annotations]] +path = ["l10n/**.js", "l10n/**.json"] +precedence = "aggregate" +SPDX-FileCopyrightText = "2016 Nextcloud GmbH and Nextcloud and ownCloud contributors" +SPDX-License-Identifier = "AGPL-3.0-or-later" + +[[annotations]] +path = ["js/**.js", "js/**.js.map"] +precedence = "aggregate" +SPDX-FileCopyrightText = "2016 Nextcloud GmbH and Nextcloud contributors" +SPDX-License-Identifier = "AGPL-3.0-or-later" + +[[annotations]] +path = ["openapi.json", "openapi-**.json", "src/types/openapi/**.ts"] +precedence = "aggregate" +SPDX-FileCopyrightText = "2023 Nextcloud GmbH and Nextcloud contributors" +SPDX-License-Identifier = "AGPL-3.0-or-later" + +[[annotations]] +path = [".github/CODEOWNERS", ".github/dependabot.yml", "tests/Integration/base-query-count.txt"] +precedence = "aggregate" +SPDX-FileCopyrightText = "none" +SPDX-License-Identifier = "CC0-1.0" + +[[annotations]] +path = ["docs", ".github/issue_template.md", ".github/contributing.md", "AUTHORS.md", "README.md"] +precedence = "aggregate" +SPDX-FileCopyrightText = "2016 Nextcloud GmbH and Nextcloud contributors" +SPDX-License-Identifier = "CC0-1.0" + +[[annotations]] +path = "tests/Integration/features/**.feature" +precedence = "aggregate" +SPDX-FileCopyrightText = "2016 Nextcloud GmbH and Nextcloud contributors" +SPDX-License-Identifier = "CC0-1.0" + +[[annotations]] +path = ["package.json", "package-lock.json", "**/package.json", "**/package-lock.json", "composer.json", "composer.lock", "**/composer.json", "**/composer.lock", ".gitignore", ".l10nignore", "psalm.xml", "tests/psalm-baseline.xml", "vendor-bin/**/composer.json", "vendor-bin/**/composer.lock", ".tx/config", "**/phpunit.xml", "tsconfig.json"] +precedence = "aggregate" +SPDX-FileCopyrightText = "none" +SPDX-License-Identifier = "CC0-1.0" + +[[annotations]] +path = ["img/notifications-dark.svg", "img/notifications.png", "img/notifications.svg"] +precedence = "aggregate" +SPDX-FileCopyrightText = "Nextcloud GmbH and Nextcloud contributors" +SPDX-License-Identifier = "CC0-1.0" + +[[annotations]] +path = ["img/notification.ogg", "img/talk.ogg"] +precedence = "aggregate" +SPDX-FileCopyrightText = "2017 Feandesign https://soundcloud.com/feandesign" +SPDX-License-Identifier = "CC0-1.0" diff --git a/composer.lock b/composer.lock index 9ad9bc02..bd14ec75 100644 --- a/composer.lock +++ b/composer.lock @@ -915,12 +915,12 @@ "source": { "type": "git", "url": "https://github.com/nextcloud-deps/ocp.git", - "reference": "0988e496b6f9c5086e4cf6b9364cba9360b4c808" + "reference": "6a23d33b2cfd8660aa2a23ee377329773451dcf7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nextcloud-deps/ocp/zipball/0988e496b6f9c5086e4cf6b9364cba9360b4c808", - "reference": "0988e496b6f9c5086e4cf6b9364cba9360b4c808", + "url": "https://api.github.com/repos/nextcloud-deps/ocp/zipball/6a23d33b2cfd8660aa2a23ee377329773451dcf7", + "reference": "6a23d33b2cfd8660aa2a23ee377329773451dcf7", "shasum": "" }, "require": { @@ -952,7 +952,7 @@ "issues": "https://github.com/nextcloud-deps/ocp/issues", "source": "https://github.com/nextcloud-deps/ocp/tree/master" }, - "time": "2024-07-06T00:35:19+00:00" + "time": "2024-06-28T00:36:28+00:00" }, { "name": "nikic/php-parser", diff --git a/docs/admin-notifications.md b/docs/admin-notifications.md index 43b4f3e3..8e8e2d21 100644 --- a/docs/admin-notifications.md +++ b/docs/admin-notifications.md @@ -1,3 +1,7 @@ + # Admin notifications Allows admins to generate notifications for users via the console or an HTTP endpoint diff --git a/docs/notification-workflow.md b/docs/notification-workflow.md index b791520d..9056e494 100644 --- a/docs/notification-workflow.md +++ b/docs/notification-workflow.md @@ -1,3 +1,8 @@ + # Notification Workflow for an App that sends Notifications ## Example story diff --git a/docs/ocs-endpoint-v1.md b/docs/ocs-endpoint-v1.md index c851b5f5..018daebd 100644 --- a/docs/ocs-endpoint-v1.md +++ b/docs/ocs-endpoint-v1.md @@ -1,3 +1,8 @@ + # Reading and deleting notifications as a Client v1 ## Checking the capabilities of the server diff --git a/docs/ocs-endpoint-v2.md b/docs/ocs-endpoint-v2.md index 5d347f23..7fc939dd 100644 --- a/docs/ocs-endpoint-v2.md +++ b/docs/ocs-endpoint-v2.md @@ -1,3 +1,7 @@ + # Reading and deleting notifications as a Client v2 ## New in APIv2 diff --git a/docs/push-v2.md b/docs/push-v2.md index 87df6c81..8a38dc99 100644 --- a/docs/push-v2.md +++ b/docs/push-v2.md @@ -1,3 +1,7 @@ + # Push notifications as a Nextcloud client device ## Introduction diff --git a/docs/screenshot.png.license b/docs/screenshot.png.license new file mode 100644 index 00000000..a08772ac --- /dev/null +++ b/docs/screenshot.png.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors +SPDX-License-Identifier: AGPL-3.0-or-later