From: david-sarah Date: Fri, 19 Aug 2011 20:47:42 +0000 (-0700) Subject: Remove Non-Profit Open Software License from the set of 'added permission' licenses... X-Git-Tag: pre-393~1 X-Git-Url: https://git.rkrishnan.org/%5B/%5D%20/uri/frontends?a=commitdiff_plain;h=37278f4b5d10da921902a06db6b281f130cccb7e;p=tahoe-lafs%2Ftahoe-lafs.git Remove Non-Profit Open Software License from the set of 'added permission' licenses. Although it actually does qualify as an Open Source license (because it allows relicensing under plain OSL), its wording is unclear and could easily be misunderstood, and it contributes to incompatible license proliferation. --- diff --git a/COPYING.GPL b/COPYING.GPL index b7ec0e47..0b57987e 100644 --- a/COPYING.GPL +++ b/COPYING.GPL @@ -108,12 +108,6 @@ the resulting combined work, as long as you follow the requirements of the licences of this work in regard to all of the the resulting combined work aside from the work licensed under the Open Software License. -This work also comes with the added permission that you may combine it with a -work licensed under the Non-Profit Open Software License (any version) and -distribute the resulting combined work, as long as you follow the -requirements of the licences of this work in regard to all of the the -resulting combined work aside from the work licensed under the Non-Profit -Open Software License. GNU GENERAL PUBLIC LICENSE diff --git a/COPYING.TGPPL.rst b/COPYING.TGPPL.rst index 2fa0d6ec..f0766f65 100644 --- a/COPYING.TGPPL.rst +++ b/COPYING.TGPPL.rst @@ -112,13 +112,6 @@ the resulting combined work, as long as you follow the requirements of the licences of this work in regard to all of the the resulting combined work aside from the work licensed under the Open Software License. -This work also comes with the added permission that you may combine it with a -work licensed under the Non-Profit Open Software License (any version) and -distribute the resulting combined work, as long as you follow the -requirements of the licences of this work in regard to all of the the -resulting combined work aside from the work licensed under the Non-Profit -Open Software License. - This Transitive Grace Period Public Licence (the "License") applies to any