summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2019-09-21 13:58:09 +0200
committerwm4 <wm4@nowhere>2019-09-21 13:58:09 +0200
commit74b4760aa81222de32147e16fa7605ce55db9922 (patch)
treea6229085e0d8243e1be6d22d1c22c8e5cdfebd37
parentcf620235a54a9736d3ab24863d268eb270335e93 (diff)
downloadmpv-74b4760aa81222de32147e16fa7605ce55db9922.tar.bz2
mpv-74b4760aa81222de32147e16fa7605ce55db9922.tar.xz
DOCS/contribute.md: license clarifications
Basically, both the license of the file and the preferred license of the project (LGPLv2.1+) counts. I'm doing that so that files with more liberal licenses don't get infected by LGPL, but allow copy & pasting to LGPL source files without jumping through lawyer bullshit hoops. Mention this in Copyright too.
-rw-r--r--Copyright2
-rw-r--r--DOCS/contribute.md4
2 files changed, 6 insertions, 0 deletions
diff --git a/Copyright b/Copyright
index b9b1e5c209..20f14c6f70 100644
--- a/Copyright
+++ b/Copyright
@@ -21,6 +21,8 @@ project can relicense the changes to LGPLv2.1+ at a later point without asking
the contributor. This is a safeguard for making potential relicensing of
remaining GPL code to LGPLv2.1+ easier.
+See DOCS/contribute.md for binding rules wrt. licensing for contributions.
+
For information about authors and contributors, consult the git log, which
contains the complete SVN and CVS history as well.
diff --git a/DOCS/contribute.md b/DOCS/contribute.md
index a11b2982a8..5f514b06d6 100644
--- a/DOCS/contribute.md
+++ b/DOCS/contribute.md
@@ -17,10 +17,14 @@ Sending patches
- All new code must be LGPLv2.1+ licensed, or come with the implicit agreement
that it will be relicensed to LGPLv2.1+ later (see ``Copyright`` in the
repository root directory).
+ Changes in files with more liberal licenses (such as BSD, MIT, or ISC) are
+ assumed to be dual-licensed under LGPLv2.1+ and the license indicated in the
+ file header.
- You must be either the exclusive author of the patch, or acknowledge all
authors involved in the commit message. If you take 3rd party code, authorship
and copyright must be properly acknowledged. If the license of the code is not
LGPLv2.1+, this must be mentioned.
+- These license statements are legally binding.
- Don't use fake names (something that looks like an actual names, and may be
someone else's name, but is not your legal name). Using a pseudonyms is
allowed if it can be used to identify or contact you, even if whatever