fix: Have correct SPDX license header for logo/trademarked items

Signed-off-by: Andy Scherzinger <[email protected]>
nextcloud · Apr 25, 2024 · 3f52b7a · 3f52b7a
1 parent 4ad95bb
commit 3f52b7a
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 10 deletions.
diff --git a/LICENSES/LicenseRef-NextcloudTrademarks.txt b/LICENSES/LicenseRef-NextcloudTrademarks.txt
@@ -0,0 +1,9 @@
+The Nextcloud marks
+Nextcloud and the Nextcloud logo is a registered trademark of Nextcloud GmbH in Germany and/or other countries.
+These guidelines cover the following marks pertaining both to the product names and the logo: “Nextcloud”
+and the blue/white cloud logo with or without the word Nextcloud; the service “Nextcloud Enterprise”;
+and our products: “Nextcloud Files”; “Nextcloud Groupware” and “Nextcloud Talk”.
+This set of marks is collectively referred to as the “Nextcloud marks.”
+
+Use of Nextcloud logos and other marks is only permitted under the guidelines provided by the Nextcloud GmbH.
+A copy can be found at https://nextcloud.com/trademarks/
diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml
@@ -1,9 +1,8 @@
 <!--
   ~ Nextcloud Talk - Android Client
   ~
-  ~ SPDX-FileCopyrightText: 2017-2024 Nextcloud GmbH and Nextcloud contributors~
-  ~ SPDX-FileCopyrightText: 2017-2019 Mario Danic <[email protected]>
-  ~ SPDX-License-Identifier: GPL-3.0-or-later
+  ~ SPDX-FileCopyrightText: 2017-2024 Nextcloud GmbH <https://nextcloud.com/trademarks/>
+  ~ SPDX-License-Identifier: LicenseRef-NextcloudTrademarks
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="108dp"

diff --git a/app/src/main/res/drawable/ic_logo.xml b/app/src/main/res/drawable/ic_logo.xml
@@ -1,8 +1,8 @@
 <!--
   ~ Nextcloud Talk - Android Client
   ~
-  ~ SPDX-FileCopyrightText: 2017-2024 Nextcloud GmbH
-  ~ SPDX-License-Identifier: GPL-3.0-or-later
+  ~ SPDX-FileCopyrightText: 2017-2024 Nextcloud GmbH <https://nextcloud.com/trademarks/>
+  ~ SPDX-License-Identifier: LicenseRef-NextcloudTrademarks
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="128dp"

diff --git a/app/src/main/res/drawable/ic_talk.xml b/app/src/main/res/drawable/ic_talk.xml
@@ -2,8 +2,8 @@
 <!--
   ~ Nextcloud Talk - Android Client
   ~
-  ~ SPDX-FileCopyrightText: Nextcloud GmbH. All rights reserved.
-  ~ SPDX-License-Identifier: GPL-3.0-or-later
+  ~ SPDX-FileCopyrightText: 2017-2024 Nextcloud GmbH <https://nextcloud.com/trademarks/>
+  ~ SPDX-License-Identifier: LicenseRef-NextcloudTrademarks
 -->
 <vector android:autoMirrored="true"
     android:height="24dp"

diff --git a/app/src/qa/res/drawable/ic_launcher_foreground.xml b/app/src/qa/res/drawable/ic_launcher_foreground.xml
@@ -1,9 +1,8 @@
 <!--
   ~ Nextcloud Talk - Android Client
   ~
-  ~ SPDX-FileCopyrightText: 2017-2024 Nextcloud GmbH and Nextcloud contributors~
-  ~ SPDX-FileCopyrightText: 2017-2019 Mario Danic <[email protected]>
-  ~ SPDX-License-Identifier: GPL-3.0-or-later
+  ~ SPDX-FileCopyrightText: 2017-2024 Nextcloud GmbH <https://nextcloud.com/trademarks/>
+  ~ SPDX-License-Identifier: LicenseRef-NextcloudTrademarks
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="108dp"