diff options
| -rw-r--r-- | 3rdparty/COPYING-PHP | 68 | ||||
| -rw-r--r-- | 3rdparty/COPYING-README | 7 | ||||
| -rw-r--r-- | COPYING-README | 7 |
3 files changed, 6 insertions, 76 deletions
diff --git a/3rdparty/COPYING-PHP b/3rdparty/COPYING-PHP deleted file mode 100644 index 3cc8b777b77..00000000000 --- a/3rdparty/COPYING-PHP +++ /dev/null @@ -1,68 +0,0 @@ --------------------------------------------------------------------- - The PHP License, version 3.01 -Copyright (c) 1999 - 2010 The PHP Group. All rights reserved. --------------------------------------------------------------------- - -Redistribution and use in source and binary forms, with or without -modification, is 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 "PHP" must not be used to endorse or promote products - derived from this software without prior written permission. For - written permission, please contact group@php.net. - - 4. Products derived from this software may not be called "PHP", nor - may "PHP" appear in their name, without prior written permission - from group@php.net. You may indicate that your software works in - conjunction with PHP by saying "Foo for PHP" instead of calling - it "PHP Foo" or "phpfoo" - - 5. The PHP Group may publish revised and/or new versions of the - license from time to time. Each version will be given a - distinguishing version number. - Once covered code has been published under a particular version - of the license, you may always continue to use it under the terms - of that version. You may also choose to use such covered code - under the terms of any subsequent version of the license - published by the PHP Group. No one other than the PHP Group has - the right to modify the terms applicable to covered code created - under this License. - - 6. Redistributions of any form whatsoever must retain the following - acknowledgment: - "This product includes PHP software, freely available from - <http://www.php.net/software/>". - -THIS SOFTWARE IS PROVIDED BY THE PHP DEVELOPMENT TEAM ``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 PHP -DEVELOPMENT TEAM 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 PHP Group. - -The PHP Group can be contacted via Email at group@php.net. - -For more information on the PHP Group and the PHP project, -please see <http://www.php.net>. - -PHP includes the Zend Engine, freely available at -<http://www.zend.com>. diff --git a/3rdparty/COPYING-README b/3rdparty/COPYING-README deleted file mode 100644 index 2450ef15813..00000000000 --- a/3rdparty/COPYING-README +++ /dev/null @@ -1,7 +0,0 @@ -HTTP is three clause BSD licence -MDB2 uses a custom licence in the BSD style -User is AGPL -XML/RPC is both MIT and PHP License - -The rest all licenced under the PHP License see packages/ directory -for details diff --git a/COPYING-README b/COPYING-README index 5f00323b719..b0caca2ad21 100644 --- a/COPYING-README +++ b/COPYING-README @@ -2,7 +2,12 @@ Files in ownCloud are licensed under the Affero General Public License version 3 the text of which can be found in COPYING-AGPL, or any later version of the AGPL, unless otherwise noted. -Components of ownCloud, including jQuery, are licensed under the MIT/X11 license. +Components of ownCloud: +* jQuery is dual licensed under MIT and GPL +* HTTP is three clause BSD license +* MDB2 uses a custom license in the BSD style +* User is AGPL +* XML/RPC is both MIT and PHP license All unmodified files from these and other sources retain their original copyright and license notices: see the relevant individual files. |