diff --git a/csnn/LICENSE b/LICENSE
similarity index 87%
rename from csnn/LICENSE
rename to LICENSE
index d0e2d904a0963239d44bfcf893659c31f8fc8f6f..bb6acd7d0b3c8582d8ec0d40b317972090cea95d 100644
--- a/csnn/LICENSE
+++ b/LICENSE
@@ -1,5 +1,4 @@
-
-CeCILL-B FREE SOFTWARE LICENSE AGREEMENT
+CeCILL FREE SOFTWARE LICENSE AGREEMENT
Notice
@@ -16,8 +15,8 @@ the two main principles guiding its drafting:
intellectual property law, and the protection that it offers to
both authors and holders of the economic rights over software.
-The authors of the CeCILL-B (for Ce[a] C[nrs] I[nria] L[ogiciel] L[ibre])
-license are:
+The authors of the CeCILL (for Ce[a] C[nrs] I[nria] L[ogiciel] L[ibre])
+license are:
Commissariat à l'Energie Atomique - CEA, a public scientific, technical
and industrial research establishment, having its principal place of
@@ -35,14 +34,12 @@ principal place of business at Domaine de Voluceau, Rocquencourt, BP
Preamble
-This Agreement is an open source software license intended to give users
-significant freedom to modify and redistribute the software licensed
-hereunder.
+The purpose of this Free Software license agreement is to grant users
+the right to modify and redistribute the software governed by this
+license within the framework of an open source distribution model.
-The exercising of this freedom is conditional upon a strong obligation
-of giving credits for everybody that distributes a software
-incorporating a software ruled by the current license so as all
-contributions to be properly identified and acknowledged.
+The exercising of these rights is conditional upon certain obligations
+for users so as to preserve this status for all subsequent redistributions.
In consideration of access to the source code and the rights to copy,
modify and redistribute granted by the license, users are provided only
@@ -116,6 +113,9 @@ spaces, with one calling the other when they are run.
Internal Module: means any or all Module, connected to the Software so
that they both execute in the same address space.
+GNU GPL: means the GNU General Public License version 2 or any
+subsequent version, as published by the Free Software Foundation Inc.
+
Parties: mean both the Licensee and the Licensor.
These expressions may be used both in singular and plural form.
@@ -126,7 +126,7 @@ These expressions may be used both in singular and plural form.
The purpose of the Agreement is the grant by the Licensor to the
Licensee of a non-exclusive, transferable and worldwide license for the
Software as set forth in Article 5 hereinafter for the whole term of the
-protection granted by the rights over said Software.
+protection granted by the rights over said Software.
Article 3 - ACCEPTANCE
@@ -235,63 +235,53 @@ complies with all the provisions of the Agreement and is accompanied by:
warranty and liability as set forth in Articles 8 and 9,
and that, in the event that only the Object Code of the Software is
-redistributed, the Licensee allows effective access to the full Source
-Code of the Software at a minimum during the entire period of its
-distribution of the Software, it being understood that the additional
-cost of acquiring the Source Code shall not exceed the cost of
-transferring the data.
+redistributed, the Licensee allows future Licensees unhindered access to
+the full Source Code of the Software by indicating how to access it, it
+being understood that the additional cost of acquiring the Source Code
+shall not exceed the cost of transferring the data.
5.3.2 DISTRIBUTION OF MODIFIED SOFTWARE
-If the Licensee makes any Contribution to the Software, the resulting
-Modified Software may be distributed under a license agreement other
-than this Agreement subject to compliance with the provisions of Article
-5.3.4.
-
-
- 5.3.3 DISTRIBUTION OF EXTERNAL MODULES
-
-When the Licensee has developed an External Module, the terms and
-conditions of this Agreement do not apply to said External Module, that
-may be distributed under a separate license agreement.
-
+When the Licensee makes a Contribution to the Software, the terms and
+conditions for the distribution of the resulting Modified Software
+become subject to all the provisions of this Agreement.
- 5.3.4 CREDITS
+The Licensee is authorized to distribute the Modified Software, in
+source code or object code form, provided that said distribution
+complies with all the provisions of the Agreement and is accompanied by:
-Any Licensee who may distribute a Modified Software hereby expressly
-agrees to:
+ 1. a copy of the Agreement,
- 1. indicate in the related documentation that it is based on the
- Software licensed hereunder, and reproduce the intellectual
- property notice for the Software,
+ 2. a notice relating to the limitation of both the Licensor's
+ warranty and liability as set forth in Articles 8 and 9,
- 2. ensure that written indications of the Software intended use,
- intellectual property notice and license hereunder are included in
- easily accessible format from the Modified Software interface,
+and that, in the event that only the object code of the Modified
+Software is redistributed, the Licensee allows future Licensees
+unhindered access to the full source code of the Modified Software by
+indicating how to access it, it being understood that the additional
+cost of acquiring the source code shall not exceed the cost of
+transferring the data.
- 3. mention, on a freely accessible website describing the Modified
- Software, at least throughout the distribution term thereof, that
- it is based on the Software licensed hereunder, and reproduce the
- Software intellectual property notice,
- 4. where it is distributed to a third party that may distribute a
- Modified Software without having to make its source code
- available, make its best efforts to ensure that said third party
- agrees to comply with the obligations set forth in this Article .
+ 5.3.3 DISTRIBUTION OF EXTERNAL MODULES
-If the Software, whether or not modified, is distributed with an
-External Module designed for use in connection with the Software, the
-Licensee shall submit said External Module to the foregoing obligations.
+When the Licensee has developed an External Module, the terms and
+conditions of this Agreement do not apply to said External Module, that
+may be distributed under a separate license agreement.
- 5.3.5 COMPATIBILITY WITH THE CeCILL AND CeCILL-C LICENSES
+ 5.3.4 COMPATIBILITY WITH THE GNU GPL
-Where a Modified Software contains a Contribution subject to the CeCILL
-license, the provisions set forth in Article 5.3.4 shall be optional.
+The Licensee can include a code that is subject to the provisions of one
+of the versions of the GNU GPL in the Modified or unmodified Software,
+and distribute that entire code under the terms of the same version of
+the GNU GPL.
-A Modified Software may be distributed under the CeCILL-C license. In
-such a case the provisions set forth in Article 5.3.4 shall be optional.
+The Licensee can include the Modified or unmodified Software in a code
+that is subject to the provisions of one of the versions of the GNU GPL,
+and distribute that entire code under the terms of the same version of
+the GNU GPL.
Article 6 - INTELLECTUAL PROPERTY
@@ -404,7 +394,7 @@ rights set forth in Article 5).
9.3 The Licensee acknowledges that the Software is supplied "as is" by
the Licensor without any other express or tacit warranty, other than
that provided for in Article 9.2 and, in particular, without any warranty
-as to its commercial value, its secured, safe, innovative or relevant
+as to its commercial value, its secured, safe, innovative or relevant
nature.
Specifically, the Licensor does not warrant that the Software is free
@@ -497,7 +487,7 @@ address new issues encountered by Free Software.
12.3 Any Software distributed under a given version of the Agreement may
only be subsequently distributed under the same version of the Agreement
-or a subsequent version.
+or a subsequent version, subject to the provisions of Article 5.3.4.
Article 13 - GOVERNING LAW AND JURISDICTION
@@ -512,4 +502,4 @@ disagreements or disputes shall be referred to the Paris Courts having
jurisdiction, by the more diligent Party.
-Version 1.0 dated 2006-09-05.
\ No newline at end of file
+Version 2.0 dated 2006-09-05.
\ No newline at end of file