From b1ca5b91c2827608e9a6d29c6db3b8e2097f5f72 Mon Sep 17 00:00:00 2001 From: Benny Jacobs Date: Sun, 9 Jul 2017 13:56:37 +0200 Subject: [PATCH] corrected APNG Optimizer's license to zlib --- LICENSE.txt | 47 +++++++++++-------- README.md | 10 ++++ .../apng2webp_apngopt/readme.txt | 2 +- 3 files changed, 38 insertions(+), 21 deletions(-) diff --git a/LICENSE.txt b/LICENSE.txt index ebf5252..b368b27 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,24 +1,31 @@ -Copyright (c) 2016, Benny Jacobs +BSD 3-Clause License + +Copyright (c) 2017, Benny Jacobs All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * 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. - * Neither the name of the nor the - names of its contributors may be used to endorse or promote products - derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 Benny Jacobs 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. + +* Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + +* 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. + +* Neither the name of the copyright holder nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT HOLDER OR CONTRIBUTORS 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/README.md b/README.md index 1e56fb7..2b48cea 100644 --- a/README.md +++ b/README.md @@ -148,3 +148,13 @@ python ./setup.py install [APNG Disassembler](http://apngdis.sourceforge.net/) [APNG Optimizer](https://sourceforge.net/projects/apng/files/APNG_Optimizer/) + +## License + +Not all software within this project uses the same license. The following licenses/legal terms are used: + +- [zlib license](https://opensource.org/licenses/Zlib) +- [GNU LGPL 2.1](https://opensource.org/licenses/LGPL-2.1) for some older versions of some parts of the software +- Public Domain (if explicitly stated. The .py scripts are public domain) +- [BSD 3-Clause](https://opensource.org/licenses/BSD-3-Clause) where no other license applies (this readme) + diff --git a/apng2webp_dependencies/apng2webp_apngopt/readme.txt b/apng2webp_dependencies/apng2webp_apngopt/readme.txt index 46dc227..fd59f70 100644 --- a/apng2webp_dependencies/apng2webp_apngopt/readme.txt +++ b/apng2webp_dependencies/apng2webp_apngopt/readme.txt @@ -7,7 +7,7 @@ Copyright (c) 2011-2015 Max Stepin maxst@users.sourceforge.net - License: LGPL license + License: zlib license --------------------------------