[Pkg-owncloud-commits] [SCM] owncloud.git branch, master, updated. debian/4.0.8debian-1.5-14-gcb2f55a
David Prévot
taffit at debian.org
Wed Mar 20 04:36:49 UTC 2013
The following commit has been merged in the master branch:
commit cb2f55a9e62dbb8fa076d52d4357613fce82ec89
Author: David Prévot <taffit at debian.org>
Date: Wed Mar 20 00:35:09 2013 -0400
Document copyright -> 3rdparty/css (included)
diff --git a/debian/copyright b/debian/copyright
index 3119195..b6b7ec3 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -128,11 +128,72 @@ License: BSD-3-clause
Files: 3rdparty/aws-sdk/*
Copyright: 2010-2012, Amazon.com, Inc. or its affiliates
License: Apache-2.0
-Comment: Many other licences to be documented
+
+Files: 3rdparty/aws-sdk/lib/cachecore/*
+ 3rdparty/aws-sdk/lib/requestcore/*
+Copyright: 2005-2011, Ryan Parman
+ 2006-2010, Foleeo Inc.
+ 2010-2011, Amazon.com, Inc. or its affiliates
+License: BSD-3-clause-CloudFusion
+ Copyright (c) 2006-2010 Ryan Parman, Foleeo Inc., and contributors. 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 Ryan Parman, Foleeo Inc. 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 HOLDERS
+ AND 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.
+
+Files: 3rdparty/aws-sdk/lib/dom/*
+ 3rdparty/aws-sdk/lib/yaml/*
+Copyright: 2011, Dustin Diaz
+ 2010, Alix Axel
+ 2004-2006, 2008-2009, Fabien Potencier
+ 2003-2007, Stefan Walk
+ 2010-2011, Omer Hassan
+ 2012, Amazon.com, Inc. or its affiliates
+License: Expat
+Comment: Globally documented inside 3rdparty/aws-sdk, but yet unidentified
+ contributions from Reqwest, phunction PHP framework, and PEAR
+ Console_ProgressBar
+
+Files: 3rdparty/aws-sdk/lib/requestcore/cacert.pem
+Copyright: 1994-2000 the Initial Developer
+License: MPL-1.1 or GPL-2+ or LGPL-2.1+
+
+Files: 3rdparty/aws-sdk/utilities/gzipdecode.class.php
+Copyright: 2011-2012 Amazon.com, Inc. or its affiliates
+ 2004-2010, Ryan Parman
+ 2004-2010, Geoffrey Sneddon
+ 2004-2011, Ryan McCue
+License: Apache-2.0 and BSD-3-clause-SimplePie
+
+Files: 3rdparty/aws-sdk/utilities/utilities.class.php
+Copyright: 2004-2010, Aidan Lister
+ 2007-2010, Ryan Parman
+ 2008, debug
+License: Apache-2.0 and PHP-3.01
Files: 3rdparty/class.phpmailer.php
3rdparty/class.smtp.php
-Copyright: 2010-2011, Jim Jagielski
+Copyright: 2010-2012, Jim Jagielski
2004-2009, Andy Prevost
2001-2003, Brent R. Matzelle
License: LGPL-3
@@ -1075,6 +1136,31 @@ License: BSD-3-clause-SabreDAV
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+License: BSD-3-clause-SimplePie
+ 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 SimplePie Team 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 HOLDERS
+ AND 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.
+
License: CC-BY-3
THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE
COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY
@@ -1621,6 +1707,10 @@ License: LGPL-2.1
On Debian systems, the full text of the GNU Lesser General Public License
version 2.1 can be found in the file `/usr/share/common-licenses/LGPL-2.1'.
+License: LGPL-2.1+
+ On Debian systems, the full text of the GNU Lesser General Public License
+ version 2.1 can be found in the file `/usr/share/common-licenses/LGPL-2.1'.
+
License: LGPL-3
Distributed under the Lesser General Public License (LGPL)
http://www.gnu.org/copyleft/lesser.html
@@ -1643,3 +1733,54 @@ License: MPL-1.1
for the specific language governing rights and limitations under the
License.
+License: PHP-3.01
+ 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 at 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 at 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.
diff --git a/debian/rules b/debian/rules
index 2405c50..18ece54 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,6 +14,9 @@ override_dh_install:
rm debian/owncloud/usr/share/owncloud/3rdparty/Dropbox/LICENSE.txt
rm debian/owncloud/usr/share/owncloud/3rdparty/Google/LICENSE.txt
rm debian/owncloud/usr/share/owncloud/3rdparty/LICENSE\ INFO
+ rm debian/owncloud/usr/share/owncloud/3rdparty/aws-sdk/lib/cachecore/LICENSE
+ rm debian/owncloud/usr/share/owncloud/3rdparty/aws-sdk/lib/requestcore/LICENSE
+ rm debian/owncloud/usr/share/owncloud/3rdparty/aws-sdk/lib/yaml/LICENSE
rm debian/owncloud/usr/share/owncloud/3rdparty/js/chosen/LICENSE.md
rm debian/owncloud/usr/share/owncloud/3rdparty/fullcalendar/*-LICENSE.txt
rm debian/owncloud/usr/share/owncloud/3rdparty/php-cloudfiles/COPYING
@@ -27,7 +30,12 @@ override_dh_install:
# Remove other stuff
rm debian/owncloud/usr/share/owncloud/3rdparty/Dropbox/README.md
+ rm debian/owncloud/usr/share/owncloud/3rdparty/aws-sdk/README.md
rm -r debian/owncloud/usr/share/owncloud/3rdparty/aws-sdk/_docs
+ rm debian/owncloud/usr/share/owncloud/3rdparty/aws-sdk/lib/cachecore/README
+ rm debian/owncloud/usr/share/owncloud/3rdparty/aws-sdk/lib/cachecore/_sql/README
+ rm debian/owncloud/usr/share/owncloud/3rdparty/aws-sdk/lib/requestcore/README
+ rm debian/owncloud/usr/share/owncloud/3rdparty/aws-sdk/lib/yaml/README.markdown
rm debian/owncloud/usr/share/owncloud/3rdparty/js/chosen/README.md
rm debian/owncloud/usr/share/owncloud/3rdparty/js/chosen/VERSION
rm debian/owncloud/usr/share/owncloud/3rdparty/php-cloudfiles/AUTHORS
--
owncloud.git
More information about the Pkg-owncloud-commits
mailing list