[Pkg-owncloud-commits] [SCM] owncloud.git branch, master, updated. debian/4.0.8debian-1.5-13-gae458a4
David Prévot
taffit at debian.org
Tue Mar 19 23:44:38 UTC 2013
The following commit has been merged in the master branch:
commit ae458a4c03567326b3091c3c9cda00fa4708128f
Author: David Prévot <taffit at debian.org>
Date: Tue Mar 19 19:39:43 2013 -0400
Document copyright -> 3rdparty/aws-sdk
(aws-sdk not included); first of a long series.
diff --git a/debian/changelog b/debian/changelog
index dc886f5..b9a34ff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ owncloud (5.0.0+debian-1) UNRELEASED; urgency=low
* debian/watch: Update to current upstream URL and Debian version
* debian/control: Add php-services-json and liboauth-php to Recommends for
3rdparty/Dropbox.
+ * debian/{copyright,rules}: Document the new and updated licenses, and trim
+ duplicated and useless files from the package.
-- Paul van Tilburg <paulvt at debian.org> Fri, 02 Nov 2012 22:20:35 +0100
diff --git a/debian/copyright b/debian/copyright
index 5be75e3..3119195 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -23,6 +23,20 @@ Files: 3rdparty/Archive/Tar.php
Copyright: 1997-2010, Vincent Blavet <vincent at phpconcept.net>
License: BSD-2-clause
+Files: 3rdparty/Dropbox/*
+Copyright: 2010, Rooftop Solutions
+ 2011, Joe Constant / halldirector
+ 2011, Daniel Huesken
+License: Expat
+
+Files: 3rdparty/Google/*
+Copyright: 2007, Andy Smith
+License: Expat
+
+Files: 3rdparty/Google/common.inc.php
+Copyright: 2009 Google Inc.
+License: Apache-2.0
+
Files: 3rdparty/MDB2/*
3rdparty/MDB2.php
Copyright: 1998-2008, Manuel Lemos
@@ -30,6 +44,8 @@ Copyright: 1998-2008, Manuel Lemos
1998-2008, Stig. S. Bakken
1998-2008, Lukas Smith
1998-2008, Igor Feghali
+ 1998-2008, Frank M. Kromann
+ 1998-2007, Lorenzo Alberton
License: BSD-3-clause-MDB2
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
@@ -73,8 +89,7 @@ Copyright: 1997-2010, Sterling Hughes <sterling at php.net>
License: BSD-2-clause
Files: 3rdparty/Sabre/*
- 3rdparty/Sabre.includes.php
-Copyright: 2007-2012, Rooftop Solutions
+Copyright: 2007-2013, Rooftop Solutions
License: BSD-3-clause-SabreDAV
Files: 3rdparty/System.php
@@ -110,6 +125,11 @@ License: BSD-3-clause
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/*
+Copyright: 2010-2012, Amazon.com, Inc. or its affiliates
+License: Apache-2.0
+Comment: Many other licences to be documented
+
Files: 3rdparty/class.phpmailer.php
3rdparty/class.smtp.php
Copyright: 2010-2011, Jim Jagielski
@@ -1352,6 +1372,180 @@ License: CC-BY-3
this License is not intended to restrict the license of any rights under
applicable law.
+License: Apache-2.0
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+ .
+ 1. Definitions.
+ .
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+ .
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+ .
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+ .
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+ .
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+ .
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+ .
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+ .
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+ .
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+ .
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+ .
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+ .
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+ .
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+ .
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+ .
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+ .
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+ .
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+ .
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+ .
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+ .
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+ .
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+ .
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+ .
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+ .
+ END OF TERMS AND CONDITIONS
+
License: Expat
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
diff --git a/debian/rules b/debian/rules
index eda6e8e..2405c50 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,6 +11,9 @@ override_dh_install:
dh_install
# Remove redundant license files as it is already captured in debian/copyright.
+ 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/js/chosen/LICENSE.md
rm debian/owncloud/usr/share/owncloud/3rdparty/fullcalendar/*-LICENSE.txt
rm debian/owncloud/usr/share/owncloud/3rdparty/php-cloudfiles/COPYING
@@ -23,6 +26,8 @@ override_dh_install:
rm debian/owncloud/usr/share/owncloud/settings/img/log\ Icon\ License
# Remove other stuff
+ rm debian/owncloud/usr/share/owncloud/3rdparty/Dropbox/README.md
+ rm -r debian/owncloud/usr/share/owncloud/3rdparty/aws-sdk/_docs
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