setup: update authorship, datestamp, licensing, and add special exceptions to allow...

[tahoe-lafs/tahoe-lafs.git] / COPYING.GPL

diff --git a/COPYING.GPL b/COPYING.GPL
index 094beb64502d81e0c7f937dee36c692d291466f4..8701ff473542924f6de272400d2038aba2259603 100644 (file)
--- a/COPYING.GPL
+++ b/COPYING.GPL
@@ -1,7 +1,29 @@
-This licence also comes with the added permission that you may combine this
-work with OpenSSL and distribute the resulting combined work, as long as you
-follow the requirements of this licence in regard to all of the software in the
-combined work aside from OpenSSL.
+This work also comes with the added permission that you may combine it
+with the OpenSSL library 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 software in the resulting combined work aside
+from OpenSSL.
+
+This work also comes with the added permission that you may combine it
+with software licensed under the Eclipse Public Licence (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 software in the
+resulting combined work aside from the software licensed under the
+Eclipse Public Licence.
+
+This work also comes with the added permission that you may combine it
+with software licensed under the Q Public Licence (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 software in the
+resulting combined work aside from the software licensed under the
+Q Public Licence.
+
+This work also comes with the added permission that you may combine it
+with software licensed under the Apache Licence (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 software in the
+resulting combined work aside from the software licensed under the
+Apache Licence.
 
 
                    GNU GENERAL PUBLIC LICENSE