From db4a587a44ee03fd3be36afadf5101e4993b1356 Mon Sep 17 00:00:00 2001 From: Edouard DUPIN Date: Sat, 9 Aug 2014 23:55:31 +0200 Subject: [PATCH] [LICENCE] change BSD => apache v2.0 --- README.md | 42 ++++++++++++------------------------------ licence.txt | 13 +++++++++++++ licence_BSD.txt | 32 -------------------------------- lutinTargetAndroid.py | 4 ++-- 4 files changed, 27 insertions(+), 64 deletions(-) create mode 100644 licence.txt delete mode 100644 licence_BSD.txt diff --git a/README.md b/README.md index faa769a..990232d 100644 --- a/README.md +++ b/README.md @@ -22,38 +22,20 @@ you can see exemple for some type in : edn : package glew : prebuild -Copyright (c) -============= +License (APACHE v2.0) +===================== -2011, Edouard DUPIN +Copyright lutin Edouard DUPIN -License (DSB) -============= +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: + http://www.apache.org/licenses/LICENSE-2.0 - 1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in - the documentation and/or other materials provided with the - distribution. - - 3. The name of the author may not be used to endorse or promote - products derived from this software without specific prior - written permission. - -THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, -INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING -IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -POSSIBILITY OF SUCH DAMAGE. diff --git a/licence.txt b/licence.txt new file mode 100644 index 0000000..6798e05 --- /dev/null +++ b/licence.txt @@ -0,0 +1,13 @@ +Copyright lutin Edouard DUPIN + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. \ No newline at end of file diff --git a/licence_BSD.txt b/licence_BSD.txt deleted file mode 100644 index c750aed..0000000 --- a/licence_BSD.txt +++ /dev/null @@ -1,32 +0,0 @@ - -Copyright (c) 2011, Edouard DUPIN - -License (DSB) - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: - - 1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in - the documentation and/or other materials provided with the - distribution. - - 3. The name of the author may not be used to endorse or promote - products derived from this software without specific prior - written permission. - -THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, -INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING -IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -POSSIBILITY OF SUCH DAMAGE.L \ No newline at end of file diff --git a/lutinTargetAndroid.py b/lutinTargetAndroid.py index 9d78520..774eeff 100644 --- a/lutinTargetAndroid.py +++ b/lutinTargetAndroid.py @@ -209,7 +209,7 @@ class Target(lutinTarget.Target): tmpFile.write( "/**\n") tmpFile.write( " * @author Edouard DUPIN, Kevin BILLONNEAU\n") tmpFile.write( " * @copyright 2011, Edouard DUPIN, all right reserved\n") - tmpFile.write( " * @license BSD v3 (see license file)\n") + tmpFile.write( " * @license APACHE v2.0 (see license file)\n") tmpFile.write( " * @note This file is autogenerate ==> see documantation to generate your own\n") tmpFile.write( " */\n") tmpFile.write( "package "+ compleatePackageName + ";\n") @@ -298,7 +298,7 @@ class Target(lutinTarget.Target): tmpFile.write( "/**\n") tmpFile.write( " * @author Edouard DUPIN, Kevin BILLONNEAU\n") tmpFile.write( " * @copyright 2011, Edouard DUPIN, all right reserved\n") - tmpFile.write( " * @license BSD v3 (see license file)\n") + tmpFile.write( " * @license APACHE v2.0 (see license file)\n") tmpFile.write( " * @note This file is autogenerate ==> see documantation to generate your own\n") tmpFile.write( " */\n") tmpFile.write( "package "+ compleatePackageName + ";\n")