From 45d33e572fd8b6e105e5ed973277daf9e416dda4 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Sat, 3 Aug 2013 19:12:32 +0200 Subject: [PATCH] unified LICENSEs between the PHP and the C code --- AUTHORS | 4 ++++ ext/twig/LICENSE | 45 +++++++++++++++++++++++++++------------------ ext/twig/php_twig.h | 2 +- ext/twig/twig.c | 2 +- 4 files changed, 33 insertions(+), 20 deletions(-) diff --git a/AUTHORS b/AUTHORS index eb5db05..9757105 100644 --- a/AUTHORS +++ b/AUTHORS @@ -4,6 +4,10 @@ Lead Developer: - Fabien Potencier +C Extension Developer: + +- Derick Rethans + Project Founder: - Armin Ronacher diff --git a/ext/twig/LICENSE b/ext/twig/LICENSE index 66b8bb4..3384cc5 100644 --- a/ext/twig/LICENSE +++ b/ext/twig/LICENSE @@ -1,22 +1,31 @@ -Copyright (c) 2011, Derick Rethans -All rights reserved. +Copyright (c) 2009-2013 by the Twig Team, see AUTHORS for more details. -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: +Some rights reserved. - * 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. +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: -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 OWNER 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 + * 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. + + * The names of the contributors may not 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 +OWNER 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/ext/twig/php_twig.h b/ext/twig/php_twig.h index 5a9ff1c..8729c23 100644 --- a/ext/twig/php_twig.h +++ b/ext/twig/php_twig.h @@ -6,7 +6,7 @@ +----------------------------------------------------------------------+ | Redistribution and use in source and binary forms, with or without | | modification, are permitted provided that the conditions mentioned | - | in the accompanying LICENSE file are met (BSD, revised). | + | in the accompanying LICENSE file are met (BSD-3-Clause). | +----------------------------------------------------------------------+ | Author: Derick Rethans | +----------------------------------------------------------------------+ diff --git a/ext/twig/twig.c b/ext/twig/twig.c index 3ba9ff2..c25c484 100644 --- a/ext/twig/twig.c +++ b/ext/twig/twig.c @@ -6,7 +6,7 @@ +----------------------------------------------------------------------+ | Redistribution and use in source and binary forms, with or without | | modification, are permitted provided that the conditions mentioned | - | in the accompanying LICENSE file are met (BSD, revised). | + | in the accompanying LICENSE file are met (BSD-3-Clause). | +----------------------------------------------------------------------+ | Author: Derick Rethans | +----------------------------------------------------------------------+ -- 1.7.2.5