This MR was approved by a vote of the membership of KDE e.V.
Adriaan de Groot (add6eaf2) at 20 Jun 20:34
This introduces the FLA 2.0, while preserving the 1.3 documents that were in use until 2021.
The FLA 2.0:
Note that all the already-signed FLA documents (1.3 era) remain valid and unchanged. If you signed a 1.3 document, then the corresponding 1.3 FRP applies. Only new signatures on a 2.0 document use the expanded (I'd say "more realistic") relicensing language.
There's an upcoming FLA 2.1 from the same upstream, which we could import in largely the same way.
Adriaan de Groot (cf2d7379) at 20 Jun 20:34
Merge branch 'work/adridg/fla-two' into 'master'
... and 1 more commit
It's a derpy form of Markdown-trickery, but the full sentence is "Fiduciary License Agreement 2.0 based on the Entity Contributor Exclusive License Agreement (including the Traditional Patent License OPTION)", just mixed between headings and plain text. In the PDF, visually it is a bit clearer.
(Note that comments on a MR that is the subject of an e.V. vote don't get relfected to the membership .. something to learn for next time).
Based on what? It looks like the most important part is missing after the word "the"
There's GitLab CI for the LaTeX version (1.3/
) but nothing that will build a nice PDF from the Markdown version. We need something in the update-2021 branch that can build PDFs that are nicely styled, from the .md files that are in the 2.0/
directory.
This is fixed in !5 (merged), closing in advance of that merge.
Adriaan de Groot (add6eaf2) at 11 May 14:34
CI: update paths for artifacts
If all the other issues are resolved and we have a workable FLA and FRP text, then
The FRP is very out-of-touch, with broken URLs and a mismatch between it and the currently-accepted licenses for KDE code.
I'm not going to bother updating the FRP. The FLA 2.0 doesn't use a FRP, so we can preserve this text as content-of-the-legacy-agreement.
This is a large-scale re-do of the MR:
If this is merged, then I'll update the e.V. website with the latest FLA documentaton and the new distinction (old 1.3 versions, new 2.0)
Adriaan de Groot (eb54842b) at 29 Mar 15:46
PDF versions of FLA (individual and entity)
... and 7 more commits
Adriaan de Groot (276267f3) at 29 Mar 14:24
Adriaan de Groot (55796f27) at 29 Mar 14:22
The individual and the entity documents are identical (modulo the title). Seems to be a problem with the generator (https://github.com/contributoragreements/ca-cla-chooser/issues/41).
The MR is full of changes and build-infrastructure, but the important bits are:
The existing 1.3 documents are moved into a subdirectory.
This introduces the FLA 2.0, while preserving the 1.3 documents that were in use until 2021.
The FLA 2.0:
Note that all the already-signed FLA documents (1.3 era) remain valid and unchanged. If you signed a 1.3 document, then the corresponding 1.3 FRP applies. Only new signatures on a 2.0 document use the expanded (I'd say "more realistic") relicensing language.
There's an upcoming FLA 2.1 from the same upstream, which we could import in largely the same way.