Skip to content

Commit 5ffc29a

Browse files
Merge pull request #5964 from nextcloud/docs/noid/generalSpdxHeader
Generalize SPDX header
2 parents 857139b + 510e666 commit 5ffc29a

3 files changed

Lines changed: 71 additions & 41 deletions

File tree

.idea/copyright/Nextcloud_Talk___Android_Client.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

AUTHORS.md

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
<!--
2+
- SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
3+
- SPDX-License-Identifier: GPL-3.0-or-later
4+
-->
5+
# Authors
6+
7+
* Abhishek Tiwari <abhitiwari472@gmail.com>
8+
* Adam Serbinski <adam@serbinski.com>
9+
* Allan Nordhøy <epost@anotheragency.no>
10+
* Álvaro Brey <alvaro.brey@nextcloud.com>
11+
* Amanda Rosene <arosene83@gmail.com>
12+
* Andy Scherzinger <info@andy-scherzinger.de>
13+
* Edvard Holst <edvard.holst@gmail.com>
14+
* Bhavesh Kumawat <kumawatbhavesh1000@gmail.com>
15+
* Biswajit Das <biswajitbangalore@gmail.com>
16+
* Christian Reiner <foss@christian-reiner.info>
17+
* Daniel Bailey <daniel.bailey@grappleIT.co.uk>
18+
* Daniel Calviño Sánchez <danxuliu@gmail.com>
19+
* Dariusz Olszewski <starypatyk@users.noreply.github.com>
20+
* David Leibovych <ariedov@gmail.com>
21+
* Dominik Schürmann <dominik@schuermann.eu>
22+
* eho <edvard.holst@gmail.com>
23+
* Enrique López Mañas <eenriquelopez@gmail.com>
24+
* Ezhil Shanmugham <ezhil930@gmail.com>
25+
* fariba khandani <khandani@winworker.de>
26+
* Florian Ludwig <florian.ludwig@uninow.de>
27+
* gavine99 <github@xymail.tk>
28+
* Giacomo Pacini <giacomopacini98@gmail.com>
29+
* Grigorii K. Shartsev <me@shgk.me>
30+
* hidrohase <github@honesz.net>
31+
* Jan-Christoph Borchardt <hey@jancborchardt.net>
32+
* jld3103 <jld3103yt@gmail.com>
33+
* Joas Schilling <coding@schilljs.com>
34+
* John Molakvoæ <skjnldsv@protonmail.com>
35+
* Jos Poortvliet <jos@opensuse.org>
36+
* Josh <josh.t.richards@gmail.com>
37+
* Julius Linus <julius.linus@nextcloud.com>
38+
* Marcel Hibbe <dev@mhibbe.de>
39+
* Mario Danic <mario@lovelyhq.com>
40+
* MichaIng <28480705+MichaIng@users.noreply.github.com>
41+
* Morris Jobke <hey@morrisjobke.de>
42+
* o0lwj0o <373911550@qq.com>
43+
* Parneet Singh <gurayaparneet@gmail.com>
44+
* Poussinou <francoisvincentmail-game@yahoo.fr>
45+
* rakekniven <mark.ziegler@rakekniven.de>
46+
* rapterjet2004 <juliuslinus1@gmail.com>
47+
* sim <git@sgougeon.fr>
48+
* Smarshal21 <samanwith21@gmail.com>
49+
* sokai <sokai@users.noreply.github.com>
50+
* Sowjanya Kota <sowjanya.kch@gmail.com>
51+
* Stefan Niedermann <info@niedermann.it>
52+
* Stephan Ritscher <no3pam@gmail.com>
53+
* Tarek Loubani <tarek@tarek.org>
54+
* Tilo Spannagel <development@tilosp.de>
55+
* Tim Krüger <t@timkrueger.me>
56+
* Tobias Kaminsky <tobias@kaminsky.me>
57+
* Valdnet <47037905+Valdnet@users.noreply.github.com>
58+
* Viktor Balogh <viktor.balogh45@gmail.com>

CONTRIBUTING.md

Lines changed: 12 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -120,11 +120,11 @@ There are three build variants
120120
### Apply a license
121121

122122
Nextcloud doesn't require a CLA (Contributor License Agreement).
123-
The copyright belongs to all the individual contributors.
124-
Therefore we recommend that every contributor adds following line to the header of a file, if they changed it substantially:
123+
The copyright belongs to all the individual contributors.
124+
Therefore we recommend that every contributor adds the following line to the [AUTHORS.md](AUTHORS.md) file if they made substantial changes to the code:
125125

126126
```
127-
Copyright (c) <year> <your name> <your email address>
127+
- <your name> <your email address>
128128
```
129129

130130
See section [Adding new files](#adding-new-files) for templates which can be used in new files.
@@ -189,53 +189,25 @@ If automatic backport fails, it will create a comment.
189189
### Adding new files
190190

191191
If you create a new file it needs to contain a license header. We encourage you to use the same license (GPL3+) as we do.
192-
Copyright of Nextcloud GmbH is optional.
192+
Copyright of Nextcloud GmbH is optional. Individual contributor names shall go into [AUTHORS.md](AUTHORS.md) so headers are kept brief.
193193

194194
Source code of app:
195195
```java/kotlin
196196
/*
197-
* Nextcloud Talk application
197+
* Nextcloud Talk - Android Client
198198
*
199-
* @author Your Name
200-
* Copyright (C) 2021 Your Name
201-
* Copyright (C) 2021 Nextcloud GmbH
202-
*
203-
* This program is free software: you can redistribute it and/or modify
204-
* it under the terms of the GNU General Public License as published by
205-
* the Free Software Foundation, either version 3 of the License, or
206-
* at your option) any later version.
207-
*
208-
* This program is distributed in the hope that it will be useful,
209-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
210-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
211-
* GNU General Public License for more details.
212-
*
213-
* You should have received a copy of the GNU General Public License
214-
* along with this program. If not, see <http://www.gnu.org/licenses/>.
199+
* SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
200+
* SPDX-License-Identifier: GPL-3.0-or-later
215201
*/
216202
```
217203

218-
XML (layout) file:
204+
XML file:
219205
```xml
220206
<!--
221-
Nextcloud Talk application
222-
223-
@author Your Name
224-
Copyright (C) 2021 Your Name
225-
Copyright (C) 2021 Nextcloud GmbH
226-
227-
This program is free software: you can redistribute it and/or modify
228-
it under the terms of the GNU General Public License as published by
229-
the Free Software Foundation, either version 3 of the License, or
230-
at your option) any later version.
231-
232-
This program is distributed in the hope that it will be useful,
233-
but WITHOUT ANY WARRANTY; without even the implied warranty of
234-
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
235-
GNU General Public License for more details.
236-
237-
You should have received a copy of the GNU General Public License
238-
along with this program. If not, see <http://www.gnu.org/licenses/>.
207+
~ Nextcloud Talk - Android Client
208+
~
209+
~ SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
210+
~ SPDX-License-Identifier: GPL-3.0-or-later
239211
-->
240212
```
241213

0 commit comments

Comments
 (0)