licensing: add to the list of licenses that we grant the added permission for

Added: most of the ones listed on the FSF's "List of Free Software, GPL Incompatible Licenses", plus the Non-Profit Open Software License.

diff --git a/COPYING.GPL b/COPYING.GPL
index 030f78205f30efc08ce364dddd4c6d9a29ba29ca..b7ec0e47ee272513bd2f65db4701dbe62d283ae0 100644 (file)
--- a/COPYING.GPL
+++ b/COPYING.GPL
@@ -42,6 +42,79 @@ requirements of the licences of this work in regard to all of the the
 resulting combined work aside from the work licensed under the Python
 Software Foundation License.
 
+This work also comes with the added permission that you may combine it with a
+work licensed under the Academic Free 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 Academic Free License.
+
+This work also comes with the added permission that you may combine it with a
+work licensed under the Apple Public Source 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 Apple Public
+Source License.
+
+This work also comes with the added permission that you may combine it with a
+work licensed under the BitTorrent Open Source 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 BitTorrent
+Open Source License.
+
+This work also comes with the added permission that you may combine it with a
+work licensed under the Lucent Public 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 Lucent Public License.
+
+This work also comes with the added permission that you may combine it with a
+work licensed under the Jabber Open Source 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 Jabber Open
+Source License.
+
+This work also comes with the added permission that you may combine it with a
+work licensed under the Common Development and Distribution 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 Common
+Development and Distribution License.
+
+This work also comes with the added permission that you may combine it with a
+work licensed under the Microsoft Public 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 Microsoft Public License.
+
+This work also comes with the added permission that you may combine it with a
+work licensed under the Microsoft Reciprocal 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 Microsoft
+Reciprocal License.
+
+This work also comes with the added permission that you may combine it with a
+work licensed under the Sun Industry Standards Source 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 Sun Industry
+Standards Source License.
+
+This work also comes with the added permission that you may combine it with a
+work licensed under the 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 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
                       Version 2, June 1991

diff --git a/COPYING.TGPPL.rst b/COPYING.TGPPL.rst
index 1dcf4c080bb0766dd130a0d002780a7286e399f1..2fa0d6ec6e58788a7bd8df10a6cd0753a37d5344 100644 (file)
--- a/COPYING.TGPPL.rst
+++ b/COPYING.TGPPL.rst
@@ -46,6 +46,79 @@ requirements of the licences of this work in regard to all of the the
 resulting combined work aside from the work licensed under the Python
 Software Foundation License.
 
+This work also comes with the added permission that you may combine it with a
+work licensed under the Academic Free 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 Academic Free License.
+
+This work also comes with the added permission that you may combine it with a
+work licensed under the Apple Public Source 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 Apple Public
+Source License.
+
+This work also comes with the added permission that you may combine it with a
+work licensed under the BitTorrent Open Source 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 BitTorrent
+Open Source License.
+
+This work also comes with the added permission that you may combine it with a
+work licensed under the Lucent Public 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 Lucent Public License.
+
+This work also comes with the added permission that you may combine it with a
+work licensed under the Jabber Open Source 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 Jabber Open
+Source License.
+
+This work also comes with the added permission that you may combine it with a
+work licensed under the Common Development and Distribution 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 Common
+Development and Distribution License.
+
+This work also comes with the added permission that you may combine it with a
+work licensed under the Microsoft Public 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 Microsoft Public License.
+
+This work also comes with the added permission that you may combine it with a
+work licensed under the Microsoft Reciprocal 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 Microsoft
+Reciprocal License.
+
+This work also comes with the added permission that you may combine it with a
+work licensed under the Sun Industry Standards Source 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 Sun Industry
+Standards Source License.
+
+This work also comes with the added permission that you may combine it with a
+work licensed under the 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 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