From: Jan Schneider Date: Fri, 10 Dec 2010 18:11:33 +0000 (+0100) Subject: Vilma is BSD. X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=48fbaea247e887c9103c118664a3f1dbe57ab165;p=horde.git Vilma is BSD. --- diff --git a/vilma/LICENSE b/vilma/LICENSE index bc75d4d2a..6ccdc47b9 100644 --- a/vilma/LICENSE +++ b/vilma/LICENSE @@ -1,49 +1,24 @@ -Version 1.0 - -Copyright 2001-2010 The Horde Project (http://www.horde.org/) -All rights reserved. +Copyright 2003-2010 The Horde Project. All rights reserved. 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 end-user documentation included with the redistribution, if -any, must include the following acknowledgment: - - "This product includes software developed by the Horde Project - (http://www.horde.org/)." - -Alternately, this acknowledgment may appear in the software itself, if -and wherever such third-party acknowledgments normally appear. - -4. The names "Horde", "The Horde Project", and "Vilma" must not be -used to endorse or promote products derived from this software without -prior written permission. For written permission, please contact -core@horde.org. - -5. Products derived from this software may not be called "Horde" or -"Vilma", nor may "Horde" or "Vilma" appear in their name, without -prior written permission of the Horde Project. - -THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED 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 HORDE PROJECT OR ITS 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. - -This software consists of voluntary contributions made by many -individuals on behalf of the Horde Project. For more information on -the Horde Project, please see . + - 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 HORDE PROJECT +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/vilma/lib/Api.php b/vilma/lib/Api.php index d6907c17d..610ef2340 100644 --- a/vilma/lib/Api.php +++ b/vilma/lib/Api.php @@ -10,9 +10,6 @@ * See the enclosed file LICENSE for license information (BSD). If you did not * did not receive this file, see http://cvs.horde.org/co.php/vilma/LICENSE. * - * See the enclosed file COPYING for license information (GPL). If you - * did not receive this file, see http://www.fsf.org/copyleft/gpl.html. - * * @author Ben Klang * @package Vilma */ diff --git a/vilma/lib/Application.php b/vilma/lib/Application.php index 53fe8c55f..7c6f5143f 100644 --- a/vilma/lib/Application.php +++ b/vilma/lib/Application.php @@ -9,9 +9,6 @@ * See the enclosed file LICENSE for license information (BSD). If you did not * did not receive this file, see http://cvs.horde.org/co.php/vilma/LICENSE. * - * See the enclosed file COPYING for license information (GPL). If you - * did not receive this file, see http://www.fsf.org/copyleft/gpl.html. - * * @author Ben Klang * @package Vilma */ diff --git a/vilma/lib/Test.php b/vilma/lib/Test.php index 465a8b8d4..208c80ab5 100644 --- a/vilma/lib/Test.php +++ b/vilma/lib/Test.php @@ -4,8 +4,8 @@ * * Copyright 2010 The Horde Project (http://www.horde.org/) * - * See the enclosed file COPYING for license information (GPL). If you - * did not receive this file, see http://www.fsf.org/copyleft/gpl.html. + * See the enclosed file LICENSE for license information (BSD). If you did not + * did not receive this file, see http://cvs.horde.org/co.php/vilma/LICENSE. * * @author Michael Slusarz * @package Vilma