From f7f8346d37d41524834257b180f41fe86a096b91 Mon Sep 17 00:00:00 2001 From: Derick Rethans Date: Sun, 20 Nov 2011 21:26:21 +0000 Subject: [PATCH] Switch LICENSE to Revised BSD. --- ext/twig/LICENSE | 22 ++++++++++++++++++++++ ext/twig/php_twig.h | 10 +++------- ext/twig/twig.c | 10 +++------- 3 files changed, 28 insertions(+), 14 deletions(-) create mode 100644 ext/twig/LICENSE diff --git a/ext/twig/LICENSE b/ext/twig/LICENSE new file mode 100644 index 0000000..7874a36 --- /dev/null +++ b/ext/twig/LICENSE @@ -0,0 +1,22 @@ +Copyright (c) 2007, Michael Wallner . +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. + +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 4958d78..abacb57 100644 --- a/ext/twig/php_twig.h +++ b/ext/twig/php_twig.h @@ -4,13 +4,9 @@ +----------------------------------------------------------------------+ | Copyright (c) 2011 Derick Rethans | +----------------------------------------------------------------------+ - | This source file is subject to version 2.02 of the PHP license, | - | that is bundled with this package in the file LICENSE, and is | - | available at through the world-wide-web at | - | http://www.php.net/license/2_02.txt. | - | If you did not receive a copy of the PHP license and are unable to | - | obtain it through the world-wide-web, please send a note to | - | license@php.net so we can mail you a copy immediately. | + | 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). | +----------------------------------------------------------------------+ | Author: Derick Rethans | +----------------------------------------------------------------------+ diff --git a/ext/twig/twig.c b/ext/twig/twig.c index 9b5735f..bc3a5f9 100644 --- a/ext/twig/twig.c +++ b/ext/twig/twig.c @@ -4,13 +4,9 @@ +----------------------------------------------------------------------+ | Copyright (c) 2011 Derick Rethans | +----------------------------------------------------------------------+ - | This source file is subject to version 2.02 of the PHP license, | - | that is bundled with this package in the file LICENSE, and is | - | available at through the world-wide-web at | - | http://www.php.net/license/2_02.txt. | - | If you did not receive a copy of the PHP license and are unable to | - | obtain it through the world-wide-web, please send a note to | - | license@php.net so we can mail you a copy immediately. | + | 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). | +----------------------------------------------------------------------+ | Author: Derick Rethans | +----------------------------------------------------------------------+ -- 1.7.2.5