Update copyright to incorporate AGPL3.0+#3712
Open
pljones wants to merge 1 commit into
Open
Conversation
pljones
added
the
needs documentation
pljones
force-pushed
the
fixes-3711/move-to-agpl3+
branch
2 times, most recently
from
7911255 to
1ce6be3
Compare
ann0see
requested review from
ann0see,
corrados,
dcorson-ticino-com,
dingodoppelt,
gilgongo,
hoffie,
ignotus666,
softins and
trebmuh
Member
|
I've added some more users which are part of the organization and should - if they have thoughts on this respond. |
Collaborator
Author
I am not a lawyer and I hope we never have to test the changes, to be honest. I've also not checked the signing isn't broken... @ann0see -- I'd need to merge this on your tree, I think, before the Auto-Build there will do the signing. Is there any other way? |
Member
Feel free to push it even as the latest release. The repo is safe to experiment with and nobody should be using the binaries from there anyway (except for us copying the signed build) |
softins
reviewed
May 26, 2026
softins
reviewed
May 26, 2026
Comment on lines
18
to
46
| # | ||
| # This program is free software; you can redistribute it and/or modify it under | ||
| # the terms of the GNU General Public License as published by the Free Software | ||
| # Foundation; either version 2 of the License, or (at your option) any later | ||
| # version. | ||
| # This program is free software: you can redistribute it and/or modify | ||
| # it under the terms of the GNU Affero General Public License as published by | ||
| # the Free Software Foundation, either version 3 of the License, or | ||
| # (at your option) any later version. | ||
| # | ||
| # This program is distributed in the hope that it will be useful, | ||
| # but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| # GNU Affero General Public License for more details. | ||
| # | ||
| # You should have received a copy of the GNU Affero General Public License | ||
| # along with this program. If not, see <https://www.gnu.org/licenses/>. | ||
| # | ||
| # --------------------------------------------------------------------------- | ||
| # | ||
| # This program is free software: you can redistribute it and/or modify | ||
| # it under the terms of the GNU General Public License as published by | ||
| # the Free Software Foundation, either version 3 of the License, or | ||
| # (at your option) any later version. | ||
| # | ||
| # This program is distributed in the hope that it will be useful, but WITHOUT | ||
| # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS | ||
| # FOR A PARTICULAR PURPOSE. See the GNU General Public License for more | ||
| # details. | ||
| # This program is distributed in the hope that it will be useful, | ||
| # but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| # GNU General Public License for more details. | ||
| # | ||
| # You should have received a copy of the GNU General Public License along with | ||
| # this program; if not, write to the Free Software Foundation, Inc., | ||
| # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA | ||
| # You should have received a copy of the GNU General Public License | ||
| # along with this program. If not, see <https://www.gnu.org/licenses/>. | ||
| # |
Member
There was a problem hiding this comment.
Is there a reason we need to have both sections, one for AGPL3+ and one for GPL3+? Even if both licences need to be mentioned explicitly (if so, why?), couldn't we refactor to eliminate duplication, e.g. with the disclaimer paragraph, at least?
What about for new files?
Collaborator
Author
There was a problem hiding this comment.
We have three states:
- existing code in existing files -> was GPL2.0+, now GPL3.0+
- new code in existing files -> existing code remains GPL3.0+, new contributions AGPL3.0+
- new code in new files -> new contributions AGPL3.0+
So the explanation at the top is only needed for existing files, as is the copy of the GPL3.0+ notice.
ann0see
requested changes
May 27, 2026
| If you add new (source code) files, please add a header with the license to the file. This clarifies how your work is licensed. Please use the same format as in e.g. the source files in the `src/` directory. A license header must include: | ||
| **As of Jamulus 3.12.1dev:** All new source code contributions must be licensed under AGPL 3.0 or any later version. | ||
|
|
||
| **Existing code:** Code contributed before 3.12.1dev was licensed under GPL 2.0+. |
Member
There was a problem hiding this comment.
The dev version is just a placeholder. There should probably be a commit hash.
Collaborator
Author
There was a problem hiding this comment.
Yep, updated.
CONTRIBUTING.md uses the commit hash for fixing the version mostly now (as well as saying 3.12.1dev):
eb172d47 2026-05-17 Set version to 3.12.1dev [Peter L Jones]
diff --git a/ChangeLog b/ChangeLog
index eedbb098..b2e5ee95 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
### 3.12.1dev <- NOTE: the release version number will be 4.0.0 ###
+### 3.12.1 (2026-05-17) ###
+
- Client: Fix occasional spurious version updated message display (#3691).
(contributed by @softins)
+**As of Jamulus 3.12.1dev commit eb172d47:** All new source code contributions must be licensed under AGPL 3.0 or any later version.
+
+**Existing code:** Code contributed before commit eb172d47 was licensed under GPL 2.0+.
+This code will be licenced under GPL 3.0 (or any later version) from commit eb172d47.
Existing files say
+ * Existing code: Code contributed before 3.12.1dev (commit eb172d47) was licensed under GPL 2.0+.
+ * This code will be licenced under GPL 3.0 (or any later version) from
+ * 3.12.1dev (commit eb172d47). When distributed as part of Jamulus, the AGPL 3.0 terms govern
+ * the combined work, including network use provisions.
a35967e to
5bb6da5
Compare
pljones
force-pushed
the
fixes-3711/move-to-agpl3+
branch
from
5bb6da5 to
6707f04
Compare
pljones
force-pushed
the
fixes-3711/move-to-agpl3+
branch
from
6707f04 to
93585e1
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Short description of changes
Update copyright on all existing files to GPL3.0+ and add a notice that all new contributions must be licensed under AGPL3.0+.
Initial changes made by Cursor Composer 2.5.
CHANGELOG: Update copyright to incorporate AGPL3.0+
Context: Fixes an issue?
Fixes: 3711
Does this change need documentation? What needs to be documented and how?
No - documented by the issue.
Status of this Pull Request
Hopefully there's nothing changed in the code or build here...
What is missing until this pull request can be merged?
Someone needs to read what I wrote in various places until bored...
Checklist
AUTOBUILD: Please build all targets