New and improved license data including some for #54

aboutcode-org · Aug 15, 2015 · 5416d35 · 5416d35
1 parent e994569
commit 5416d35
Show file tree

Hide file tree

Showing 115 changed files with 8,418 additions and 106 deletions.
diff --git a/src/licensedcode/data/licenses/bsd-original-1990.LICENSE b/src/licensedcode/data/licenses/bsd-original-1990.LICENSE
@@ -0,0 +1,11 @@
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley.  The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
diff --git a/src/licensedcode/data/licenses/bsd-original-1990.yml b/src/licensedcode/data/licenses/bsd-original-1990.yml
@@ -0,0 +1,6 @@
+key: bsd-original-1990
+short_name: BSD-Original-1990
+name: BSD-Original-1990
+category: Attribution
+owner: Regents of the University of California
+notes: this is the same as bsd-original-1990 but without the UC copyright notice 
diff --git a/src/licensedcode/data/licenses/cc-by-3.0.SPDX b/src/licensedcode/data/licenses/cc-by-3.0.SPDX
@@ -64,5 +64,3 @@ Creative Commons is not a party to this License, and makes no warranty whatsoeve
 Except for the limited purpose of indicating to the public that the Work is licensed under the CCPL, Creative Commons does not authorize the use by either party of the trademark "Creative Commons" or any related trademark or logo of Creative Commons without the prior written consent of Creative Commons. Any permitted use will be in compliance with Creative Commons' then-current trademark usage guidelines, as may be published on its website or otherwise made available upon request from time to time. For the avoidance of doubt, this trademark restriction does not form part of this License.
 
 Creative Commons may be contacted at http://creativecommons.org/.
-
-ﾫ Back to Commons Deed
diff --git a/src/licensedcode/data/licenses/cecill-1.0.LICENSE b/src/licensedcode/data/licenses/cecill-1.0.LICENSE
@@ -1,4 +1,4 @@
-"CONTRAT DE LICENCE DE LOGICIEL LIBRE CeCILL
+CONTRAT DE LICENCE DE LOGICIEL LIBRE CeCILL
 
 Avertissement
 
@@ -237,4 +237,4 @@ Article 13 - LOI APPLICABLE ET COMPETENCE TERRITORIALE
 1 Ce: CEA, C: CNRS, I: INRIA, LL: Logiciel Libre
 
 
-Version 1 du 21/06/2004"
+Version 1 du 21/06/2004
diff --git a/src/licensedcode/data/licenses/cecill-1.0.SPDX b/src/licensedcode/data/licenses/cecill-1.0.SPDX
@@ -1,4 +1,4 @@
-"CONTRAT DE LICENCE DE LOGICIEL LIBRE CeCILL
+CONTRAT DE LICENCE DE LOGICIEL LIBRE CeCILL
 
 Avertissement
 
@@ -237,4 +237,4 @@ Article 13 - LOI APPLICABLE ET COMPETENCE TERRITORIALE
 1 Ce: CEA, C: CNRS, I: INRIA, LL: Logiciel Libre
 
 
-Version 1 du 21/06/2004"
+Version 1 du 21/06/2004
diff --git a/src/licensedcode/data/licenses/cecill-1.0.yml b/src/licensedcode/data/licenses/cecill-1.0.yml
@@ -1,13 +1,14 @@
 key: cecill-1.0
 short_name: CeCILL 1.0
-name: >-
-    CeCILL Free Software License Agreement v1.0
+name: CeCILL Free Software License Agreement v1.0
 category: Copyleft
 owner: CeCILL
 homepage_url: http://www.cecill.info/licences/Licence_CeCILL_V1-fr.html
 spdx_license_key: CECILL-1.0
-spdx_full_name: >-
-    CeCILL Free Software License Agreement v1.0
+spdx_full_name: CeCILL Free Software License Agreement v1.0
 spdx_url: http://spdx.org/licenses/CECILL-1.0
 text_urls:
     - http://www.cecill.info/licences/Licence_CeCILL_V1-fr.html
+    - http://www.cecill.info/licences/Licence_CeCILL_V1-fr.txt
+    - http://www.cecill.info/licences/Licence_CeCILL_V1-US.txt
+    - http://www.cecill.info/licences/Licence_CeCILL_V1-US.html
diff --git a/src/licensedcode/data/licenses/cecill-1.1.LICENSE b/src/licensedcode/data/licenses/cecill-1.1.LICENSE
@@ -1,5 +1,5 @@
 FREE SOFTWARE LICENSING AGREEMENT CeCILL
-                ========================================
+========================================
 
 Notice
 ------

diff --git a/src/licensedcode/data/licenses/cecill-2.0.yml b/src/licensedcode/data/licenses/cecill-2.0.yml
@@ -1,17 +1,15 @@
 key: cecill-2.0
 short_name: CeCILL 2.0
-name: >-
-    CeCILL Free Software License Agreement v2.0
+name: CeCILL Free Software License Agreement v2.0
 category: Copyleft Limited
 owner: CeCILL
 homepage_url: http://www.cecill.info/licences.en.html
 spdx_license_key: CECILL-2.0
-spdx_full_name: >-
-    CeCILL Free Software License Agreement v2.0
+spdx_full_name: CeCILL Free Software License Agreement v2.0
 spdx_url: http://spdx.org/licenses/CECILL-2.0
-spdx_notes: >-
-    English translation can be found here: http://www.cecill.info/licences/Licence_CeCILL_V2-en.html
+spdx_notes: English translation can be found here http://www.cecill.info/licences/Licence_CeCILL_V2-en.html
 text_urls:
-    - >-
-        http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt, http://www.cecill.info/licences/Licence_CeCILL_V2-fr.html,
-        http://www.cecill.info/licences/Licence_CeCILL_V2-fr.txt, http://www.cecill.info/licences/Licence_CeCILL_V2-en.html
+    - http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+    - http://www.cecill.info/licences/Licence_CeCILL_V2-fr.html
+    - http://www.cecill.info/licences/Licence_CeCILL_V2-fr.txt
+    - http://www.cecill.info/licences/Licence_CeCILL_V2-en.html
Original file line number	Diff line number	Diff line change
Expand Up		@@ -64,5 +64,3 @@ Creative Commons is not a party to this License, and makes no warranty whatsoeve
		Except for the limited purpose of indicating to the public that the Work is licensed under the CCPL, Creative Commons does not authorize the use by either party of the trademark "Creative Commons" or any related trademark or logo of Creative Commons without the prior written consent of Creative Commons. Any permitted use will be in compliance with Creative Commons' then-current trademark usage guidelines, as may be published on its website or otherwise made available upon request from time to time. For the avoidance of doubt, this trademark restriction does not form part of this License.

		Creative Commons may be contacted at http://creativecommons.org/.

		ﾫ Back to Commons Deed