[Pkg-owncloud-commits] [SCM] owncloud.git branch, master, updated. debian/4.0.8debian-1.5-20-g184aa39
David Prévot
taffit at debian.org
Thu Mar 21 23:25:24 UTC 2013
The following commit has been merged in the master branch:
commit 184aa39b1adaf6f7f3fd861ff4b3fd096c4b62bc
Author: David Prévot <taffit at debian.org>
Date: Thu Mar 21 17:48:42 2013 -0400
Document copyright -> config (included)
diff --git a/debian/changelog b/debian/changelog
index 67bd3f3..e9ac684 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,8 +8,10 @@ owncloud (5.0.0+debian-1) UNRELEASED; urgency=low
- Add php-services-json and liboauth-php to Recommends for Dropbox-php
- Add clamav or clamav-daemon to Recommends for Owncloud Antivirus App
- Add zendframework to Recommends for Full Text Search
- * debian/{copyright,rules}: Document the new and updated licenses, and trim
- duplicated and useless files from the package.
+ * debian/copyright: Document the new and updated licenses
+ * debian/rules:
+ - Trim duplicated and useless files from the package
+ - Minify JavaScript
* debian/repack.sh:
- Remove incompatible docs from Font Awesome
- Remove incompatible PDF from pdfjs
diff --git a/debian/copyright b/debian/copyright
index b6b7ec3..31fd1cd 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,19 +4,32 @@ Upstream-Contact: ownCloud mailinglist <owncloud at kde.org>
Source: http://owncloud.org
Files: *
-Copyright: 2010-2012, Frank Karlitschek <karlitschek at kde.org>
+Copyright: 2010-2012, Frank Karlitschek <frank at owncloud.org>
2010-2012, Robin Appelman <icewind1991 at gmail.com>
2010-2012, Jakob Sack <kde at jakobsack.de>
2010-2012, Jan-Christoph Borchardt <JanCBorchardt at fsfe.org>
- 2010-2012, Michael Gapczynski <mtgap at owncloud.com>
- 2010-2012, Arthur Schiwon <blizzz at arthur-schiwon.de>
+ 2010-2013, Michael Gapczynski <mtgap at owncloud.com>
+ 2010-2013, Arthur Schiwon <blizzz at arthur-schiwon.de>
2010-2012, Bart Visscher <bartv at thisnet.nl>
2010-2012, Georg Ehrke <ownclouddev at georgswebsite.de>
2010-2012, Brice Maron <brice at bmaron.net>
- 2010-2012, Tom Needham <tom at owncloud.com>
+ 2010-2013, Tom Needham <tom at owncloud.com>
2010-2012, Marvin Thomas Rabe <mrabe at marvinrabe.de>
2010-2012, Florian Pritz
2010-2012, Bartek Przybylski <bart.p.pl at gmail.com>
+ 2011-2012, Thomas Tanghus <thomas at tanghus.net>
+ 2012-2013, Victor Dubiniuk <victor.dubiniuk at gmail.com>
+ 2012, Erik Sargent <esthepiking at gmail.com>
+ 2012, Manuel Deglado <manuel.delgado at ucr.ac.cr>
+ 2012, Jörn Dreyer <jfd at butonic.de>
+ 2013, Bjoern Schiessle <schiessle at owncloud.com>
+ 2013, Thomas Müller
+ 2013, Klaas Freitag
+ 2013, Sam Tuke <samtuke at owncloud.com>
+ 2013, Simon Birnbach
+ 2013, Lukas Reschke <lukas at statuscode.ch>
+ 2013, Christian Reiner
+ 2013, Daniel Molkentin
License: AGPL-3+
Files: 3rdparty/Archive/Tar.php
@@ -204,6 +217,101 @@ Copyright: 2011, Harvest <info at getharvest.com>
License: Expat
Comment: Expat license referred to as MIT license.
+Files: 3rdparty/fontawesome/*
+Copyright: 2013, Dave Gandy
+License: CC-BY-3
+
+Files: 3rdparty/fontawesome/css/*
+Copyright: 2013, Dave Gandy
+License: Expat
+
+Files: 3rdparty/fontawesome/font/*
+Copyright: 2013, Dave Gandy
+License: OFL
+ PREAMBLE
+ .
+ The goals of the Open Font License (OFL) are to stimulate worldwide
+ development of collaborative font projects, to support the font creation
+ efforts of academic and linguistic communities, and to provide a free and
+ open framework in which fonts may be shared and improved in partnership
+ with others.
+ .
+ The OFL allows the licensed fonts to be used, studied, modified and
+ redistributed freely as long as they are not sold by themselves. The
+ fonts, including any derivative works, can be bundled, embedded,
+ redistributed and/or sold with any software provided that any reserved
+ names are not used by derivative works. The fonts and derivatives,
+ however, cannot be released under any other type of license. The
+ requirement for fonts to remain under this license does not apply
+ to any document created using the fonts or their derivatives.
+ DEFINITIONS
+ .
+ "Font Software" refers to the set of files released by the Copyright
+ Holder(s) under this license and clearly marked as such. This may
+ include source files, build scripts and documentation.
+ .
+ "Reserved Font Name" refers to any names specified as such after the
+ copyright statement(s).
+ .
+ "Original Version" refers to the collection of Font Software components as
+ distributed by the Copyright Holder(s).
+ .
+ "Modified Version" refers to any derivative made by adding to, deleting,
+ or substituting — in part or in whole — any of the components of the
+ Original Version, by changing formats or by porting the Font Software to a
+ new environment.
+ .
+ "Author" refers to any designer, engineer, programmer, technical
+ writer or other person who contributed to the Font Software.
+ PERMISSION & CONDITIONS
+ .
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of the Font Software, to use, study, copy, merge, embed, modify,
+ redistribute, and sell modified and unmodified copies of the Font
+ Software, subject to the following conditions:
+ .
+ 1) Neither the Font Software nor any of its individual components,
+ in Original or Modified Versions, may be sold by itself.
+ .
+ 2) Original or Modified Versions of the Font Software may be bundled,
+ redistributed and/or sold with any software, provided that each copy
+ contains the above copyright notice and this license. These can be
+ included either as stand-alone text files, human-readable headers or
+ in the appropriate machine-readable metadata fields within text or
+ binary files as long as those fields can be easily viewed by the user.
+ .
+ 3) No Modified Version of the Font Software may use the Reserved Font
+ Name(s) unless explicit written permission is granted by the corresponding
+ Copyright Holder. This restriction only applies to the primary font name as
+ presented to the users.
+ .
+ 4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+ Software shall not be used to promote, endorse or advertise any
+ Modified Version, except to acknowledge the contribution(s) of the
+ Copyright Holder(s) and the Author(s) or with their explicit written
+ permission.
+ .
+ 5) The Font Software, modified or unmodified, in part or in whole,
+ must be distributed entirely under this license, and must not be
+ distributed under any other license. The requirement for fonts to
+ remain under this license does not apply to any document created
+ using the Font Software.
+ TERMINATION
+ .
+ This license becomes null and void if any of the above conditions are
+ not met.
+ DISCLAIMER
+ .
+ THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+ OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+ COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+ DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+ OTHER DEALINGS IN THE FONT SOFTWARE.
+
Files: 3rdparty/fullcalendar/*
Copyright: 2009, Adam Shaw
2011, Adam Shaw
@@ -214,6 +322,18 @@ Files: 3rdparty/getid3/*
Copyright: 2001-2009, James Heinrich <info at getid3.org>
License: GPL-2+
+Files: 3rdparty/mediawiki/*
+Copyright: 2010, Wikimedia Foundation
+License: Apache-2.0
+
+Files: 3rdparty/miniColors/*
+Copyright: 2012, Cory LaViska
+License: Expat or GPL-2
+
+Files: 3rdparty/openid/*
+Copyright: 2006-2008, CJ Niemira
+License: GPL-3
+
Files: 3rdparty/php-cloudfiles/*
Copyright: 2008, Rackspace US, Inc.
License: MIT
@@ -251,40 +371,50 @@ License: public-domain
Written by Solar Designer <solar at openwall.com> in 2004-2006 and placed
in the public domain. Revised in subsequent years, still public domain.
-Files: 3rdparty/simpletest/*
-Copyright: 2003-2012, Marcus Baker <marcus at lastcraft.com>
-License: LGPL-2.1
-Comment: Copyright found on http://simpletest.org/api/.
+Files: 3rdparty/symfony/*
+Copyright: 2004-2012, Fabien Potencier
+License: Expat
Files: 3rdparty/timepicker/*
Copyright: 2010-2011, Francois Gelinas
License: Expat or GPL-2
Comment: Expat license referred to as MIT license.
-Files: 3rdparty/when/*
-Copyright: 2010, Tomhas Planer <tplaner at gmail.com>
+Files: apps/bookmarks/3rdparty/*
+Copyright: 2011, Levy Carneiro Jr.
License: Expat
-Comment: Expat license referred to as MIT license.
-Files: apps/calendar/img/*
-Copyright: 2010, The Noun Project
-License: CC-BY-3
+Files: apps/contacts/css/placeholder_polyfill.min.css
+ apps/contacts/js/placeholder_polyfill.jquery.js
+Copyright: 2012, Dirk Ginader
+License: Expat or GPL-2+
Files: apps/contacts/js/jquery.Jcrop*.js
Copyright: 2008-2012, Tapmodo Interactive LLC
License: Expat
-Files: apps/contacts/js/jquery.inview*
-Copyright: Christopher Blum
-License: AGPL-3+
-Comment: originally under CC-NC-SA-2 but conditions waived by author and
- now falls under AGPL-3+ (see apps/contacts/js/jquery.inview.txt).
+Files: apps/contacts/js/jquery.onfontresize.js
+Copyright: 2008, Tom Deater (http://www.tomdeater.com)
+License: Expat
+
+Files: apps/contacts/js/modernizr.*
+Copyright: 2009–2013, Faruk Ates, Paul Irish, Alex Sexton
+License: Expat
+
+Files: apps/contacts/js/placeholder_polyfill.jquery.min.combo.js
+Copyright: 2008, Tom Deater (http://www.tomdeater.com)
+ 2012, Dirk Ginader
+License: Expat
Files: apps/files/js/jquery.*.js
Copyright: 2010, Sebastian Tschan
License: Expat
Comment: Expat license referred to as MIT license.
+Files: apps/files/js/jquery-visibility.js
+Copyright: 2012, Mathias Bynens
+License: Expat or GPL-2
+
Files: apps/files_imageviewer/js/jquery.fancybox-1.3.4*js
Copyright: 2008-2010, Janis Skarnelis
License: Expat or GPL-2
@@ -327,15 +457,411 @@ License: AGPL-3+ with HTML-reference exception
.
This license applies to this entire compilation.
-Files: apps/files_pdfviewer/js/pdfjs/*
-Copyright: 2011, Mozilla Foundation
+Files: apps/files_pdfviewer/3rdparty/pdfjs/*
+Copyright: 2012, Mozilla Foundation
+License: Apache-2.0
+
+Files: apps/files_pdfviewer/3rdparty/pdfjs/l10n.js
+Copyright: 2011-2012, Fabien Cazenave, Mozilla
License: Expat
-Comment: Expat license referred to as MIT license.
+
+Files: apps/files_pdfviewer/3rdparty/pdfjs/locale/fr/viewer.properties
+Copyright: 2012, Mozilla Foundation
+License: MPL-2.0
+ 1. Definitions
+ --------------
+ .
+ 1.1. "Contributor"
+ means each individual or legal entity that creates, contributes to
+ the creation of, or owns Covered Software.
+ .
+ 1.2. "Contributor Version"
+ means the combination of the Contributions of others (if any) used
+ by a Contributor and that particular Contributor's Contribution.
+ .
+ 1.3. "Contribution"
+ means Covered Software of a particular Contributor.
+ .
+ 1.4. "Covered Software"
+ means Source Code Form to which the initial Contributor has attached
+ the notice in Exhibit A, the Executable Form of such Source Code
+ Form, and Modifications of such Source Code Form, in each case
+ including portions thereof.
+ .
+ 1.5. "Incompatible With Secondary Licenses"
+ means
+ .
+ (a) that the initial Contributor has attached the notice described
+ in Exhibit B to the Covered Software; or
+ .
+ (b) that the Covered Software was made available under the terms of
+ version 1.1 or earlier of the License, but not also under the
+ terms of a Secondary License.
+ .
+ 1.6. "Executable Form"
+ means any form of the work other than Source Code Form.
+ .
+ 1.7. "Larger Work"
+ means a work that combines Covered Software with other material, in
+ a separate file or files, that is not Covered Software.
+ .
+ 1.8. "License"
+ means this document.
+ .
+ 1.9. "Licensable"
+ means having the right to grant, to the maximum extent possible,
+ whether at the time of the initial grant or subsequently, any and
+ all of the rights conveyed by this License.
+ .
+ 1.10. "Modifications"
+ means any of the following:
+ .
+ (a) any file in Source Code Form that results from an addition to,
+ deletion from, or modification of the contents of Covered
+ Software; or
+ .
+ (b) any new file in Source Code Form that contains any Covered
+ Software.
+ .
+ 1.11. "Patent Claims" of a Contributor
+ means any patent claim(s), including without limitation, method,
+ process, and apparatus claims, in any patent Licensable by such
+ Contributor that would be infringed, but for the grant of the
+ License, by the making, using, selling, offering for sale, having
+ made, import, or transfer of either its Contributions or its
+ Contributor Version.
+ .
+ 1.12. "Secondary License"
+ means either the GNU General Public License, Version 2.0, the GNU
+ Lesser General Public License, Version 2.1, the GNU Affero General
+ Public License, Version 3.0, or any later versions of those
+ licenses.
+ .
+ 1.13. "Source Code Form"
+ means the form of the work preferred for making modifications.
+ .
+ 1.14. "You" (or "Your")
+ means an individual or a legal entity exercising rights under this
+ License. For legal entities, "You" includes any entity that
+ controls, is controlled by, or is under common control with You. For
+ purposes of this definition, "control" means (a) the power, direct
+ or indirect, to cause the direction or management of such entity,
+ whether by contract or otherwise, or (b) ownership of more than
+ fifty percent (50%) of the outstanding shares or beneficial
+ ownership of such entity.
+ .
+ 2. License Grants and Conditions
+ --------------------------------
+ .
+ 2.1. Grants
+ .
+ Each Contributor hereby grants You a world-wide, royalty-free,
+ non-exclusive license:
+ .
+ (a) under intellectual property rights (other than patent or trademark)
+ Licensable by such Contributor to use, reproduce, make available,
+ modify, display, perform, distribute, and otherwise exploit its
+ Contributions, either on an unmodified basis, with Modifications, or
+ as part of a Larger Work; and
+ .
+ (b) under Patent Claims of such Contributor to make, use, sell, offer
+ for sale, have made, import, and otherwise transfer either its
+ Contributions or its Contributor Version.
+ .
+ 2.2. Effective Date
+ .
+ The licenses granted in Section 2.1 with respect to any Contribution
+ become effective for each Contribution on the date the Contributor first
+ distributes such Contribution.
+ .
+ 2.3. Limitations on Grant Scope
+ .
+ The licenses granted in this Section 2 are the only rights granted under
+ this License. No additional rights or licenses will be implied from the
+ distribution or licensing of Covered Software under this License.
+ Notwithstanding Section 2.1(b) above, no patent license is granted by a
+ Contributor:
+ .
+ (a) for any code that a Contributor has removed from Covered Software;
+ or
+ .
+ (b) for infringements caused by: (i) Your and any other third party's
+ modifications of Covered Software, or (ii) the combination of its
+ Contributions with other software (except as part of its Contributor
+ Version); or
+ .
+ (c) under Patent Claims infringed by Covered Software in the absence of
+ its Contributions.
+ .
+ This License does not grant any rights in the trademarks, service marks,
+ or logos of any Contributor (except as may be necessary to comply with
+ the notice requirements in Section 3.4).
+ .
+ 2.4. Subsequent Licenses
+ .
+ No Contributor makes additional grants as a result of Your choice to
+ distribute the Covered Software under a subsequent version of this
+ License (see Section 10.2) or under the terms of a Secondary License (if
+ permitted under the terms of Section 3.3).
+ .
+ 2.5. Representation
+ .
+ Each Contributor represents that the Contributor believes its
+ Contributions are its original creation(s) or it has sufficient rights
+ to grant the rights to its Contributions conveyed by this License.
+ .
+ 2.6. Fair Use
+ .
+ This License is not intended to limit any rights You have under
+ applicable copyright doctrines of fair use, fair dealing, or other
+ equivalents.
+ .
+ 2.7. Conditions
+ .
+ Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
+ in Section 2.1.
+ .
+ 3. Responsibilities
+ -------------------
+ .
+ 3.1. Distribution of Source Form
+ .
+ All distribution of Covered Software in Source Code Form, including any
+ Modifications that You create or to which You contribute, must be under
+ the terms of this License. You must inform recipients that the Source
+ Code Form of the Covered Software is governed by the terms of this
+ License, and how they can obtain a copy of this License. You may not
+ attempt to alter or restrict the recipients' rights in the Source Code
+ Form.
+ .
+ 3.2. Distribution of Executable Form
+ .
+ If You distribute Covered Software in Executable Form then:
+ .
+ (a) such Covered Software must also be made available in Source Code
+ Form, as described in Section 3.1, and You must inform recipients of
+ the Executable Form how they can obtain a copy of such Source Code
+ Form by reasonable means in a timely manner, at a charge no more
+ than the cost of distribution to the recipient; and
+ .
+ (b) You may distribute such Executable Form under the terms of this
+ License, or sublicense it under different terms, provided that the
+ license for the Executable Form does not attempt to limit or alter
+ the recipients' rights in the Source Code Form under this License.
+ .
+ 3.3. Distribution of a Larger Work
+ .
+ You may create and distribute a Larger Work under terms of Your choice,
+ provided that You also comply with the requirements of this License for
+ the Covered Software. If the Larger Work is a combination of Covered
+ Software with a work governed by one or more Secondary Licenses, and the
+ Covered Software is not Incompatible With Secondary Licenses, this
+ License permits You to additionally distribute such Covered Software
+ under the terms of such Secondary License(s), so that the recipient of
+ the Larger Work may, at their option, further distribute the Covered
+ Software under the terms of either this License or such Secondary
+ License(s).
+ .
+ 3.4. Notices
+ .
+ You may not remove or alter the substance of any license notices
+ (including copyright notices, patent notices, disclaimers of warranty,
+ or limitations of liability) contained within the Source Code Form of
+ the Covered Software, except that You may alter any license notices to
+ the extent required to remedy known factual inaccuracies.
+ .
+ 3.5. Application of Additional Terms
+ .
+ You may choose to offer, and to charge a fee for, warranty, support,
+ indemnity or liability obligations to one or more recipients of Covered
+ Software. However, You may do so only on Your own behalf, and not on
+ behalf of any Contributor. You must make it absolutely clear that any
+ such warranty, support, indemnity, or liability obligation is offered by
+ You alone, and You hereby agree to indemnify every Contributor for any
+ liability incurred by such Contributor as a result of warranty, support,
+ indemnity or liability terms You offer. You may include additional
+ disclaimers of warranty and limitations of liability specific to any
+ jurisdiction.
+ .
+ 4. Inability to Comply Due to Statute or Regulation
+ ---------------------------------------------------
+ .
+ If it is impossible for You to comply with any of the terms of this
+ License with respect to some or all of the Covered Software due to
+ statute, judicial order, or regulation then You must: (a) comply with
+ the terms of this License to the maximum extent possible; and (b)
+ describe the limitations and the code they affect. Such description must
+ be placed in a text file included with all distributions of the Covered
+ Software under this License. Except to the extent prohibited by statute
+ or regulation, such description must be sufficiently detailed for a
+ recipient of ordinary skill to be able to understand it.
+ .
+ 5. Termination
+ --------------
+ .
+ 5.1. The rights granted under this License will terminate automatically
+ if You fail to comply with any of its terms. However, if You become
+ compliant, then the rights granted under this License from a particular
+ Contributor are reinstated (a) provisionally, unless and until such
+ Contributor explicitly and finally terminates Your grants, and (b) on an
+ ongoing basis, if such Contributor fails to notify You of the
+ non-compliance by some reasonable means prior to 60 days after You have
+ come back into compliance. Moreover, Your grants from a particular
+ Contributor are reinstated on an ongoing basis if such Contributor
+ notifies You of the non-compliance by some reasonable means, this is the
+ first time You have received notice of non-compliance with this License
+ from such Contributor, and You become compliant prior to 30 days after
+ Your receipt of the notice.
+ .
+ 5.2. If You initiate litigation against any entity by asserting a patent
+ infringement claim (excluding declaratory judgment actions,
+ counter-claims, and cross-claims) alleging that a Contributor Version
+ directly or indirectly infringes any patent, then the rights granted to
+ You by any and all Contributors for the Covered Software under Section
+ 2.1 of this License shall terminate.
+ .
+ 5.3. In the event of termination under Sections 5.1 or 5.2 above, all
+ end user license agreements (excluding distributors and resellers) which
+ have been validly granted by You or Your distributors under this License
+ prior to termination shall survive termination.
+ .
+ ************************************************************************
+ * *
+ * 6. Disclaimer of Warranty *
+ * ------------------------- *
+ * *
+ * Covered Software is provided under this License on an "as is" *
+ * basis, without warranty of any kind, either expressed, implied, or *
+ * statutory, including, without limitation, warranties that the *
+ * Covered Software is free of defects, merchantable, fit for a *
+ * particular purpose or non-infringing. The entire risk as to the *
+ * quality and performance of the Covered Software is with You. *
+ * Should any Covered Software prove defective in any respect, You *
+ * (not any Contributor) assume the cost of any necessary servicing, *
+ * repair, or correction. This disclaimer of warranty constitutes an *
+ * essential part of this License. No use of any Covered Software is *
+ * authorized under this License except under this disclaimer. *
+ * *
+ ************************************************************************
+ .
+ ************************************************************************
+ * *
+ * 7. Limitation of Liability *
+ * -------------------------- *
+ * *
+ * Under no circumstances and under no legal theory, whether tort *
+ * (including negligence), contract, or otherwise, shall any *
+ * Contributor, or anyone who distributes Covered Software as *
+ * permitted above, be liable to You for any direct, indirect, *
+ * special, incidental, or consequential damages of any character *
+ * including, without limitation, damages for lost profits, loss of *
+ * goodwill, work stoppage, computer failure or malfunction, or any *
+ * and all other commercial damages or losses, even if such party *
+ * shall have been informed of the possibility of such damages. This *
+ * limitation of liability shall not apply to liability for death or *
+ * personal injury resulting from such party's negligence to the *
+ * extent applicable law prohibits such limitation. Some *
+ * jurisdictions do not allow the exclusion or limitation of *
+ * incidental or consequential damages, so this exclusion and *
+ * limitation may not apply to You. *
+ * *
+ ************************************************************************
+ .
+ 8. Litigation
+ -------------
+ .
+ Any litigation relating to this License may be brought only in the
+ courts of a jurisdiction where the defendant maintains its principal
+ place of business and such litigation shall be governed by laws of that
+ jurisdiction, without reference to its conflict-of-law provisions.
+ Nothing in this Section shall prevent a party's ability to bring
+ cross-claims or counter-claims.
+ .
+ 9. Miscellaneous
+ ----------------
+ .
+ This License represents the complete agreement concerning the subject
+ matter hereof. If any provision of this License is held to be
+ unenforceable, such provision shall be reformed only to the extent
+ necessary to make it enforceable. Any law or regulation which provides
+ that the language of a contract shall be construed against the drafter
+ shall not be used to construe this License against a Contributor.
+ .
+ 10. Versions of the License
+ ---------------------------
+ .
+ 10.1. New Versions
+ .
+ Mozilla Foundation is the license steward. Except as provided in Section
+ 10.3, no one other than the license steward has the right to modify or
+ publish new versions of this License. Each version will be given a
+ distinguishing version number.
+ .
+ 10.2. Effect of New Versions
+ .
+ You may distribute the Covered Software under the terms of the version
+ of the License under which You originally received the Covered Software,
+ or under the terms of any subsequent version published by the license
+ steward.
+ .
+ 10.3. Modified Versions
+ .
+ If you create software not governed by this License, and you want to
+ create a new license for such software, you may create and use a
+ modified version of this License if you rename the license and remove
+ any references to the name of the license steward (except to note that
+ such modified license differs from this License).
+ .
+ 10.4. Distributing Source Code Form that is Incompatible With Secondary
+ Licenses
+ .
+ If You choose to distribute Source Code Form that is Incompatible With
+ Secondary Licenses under the terms of this version of the License, the
+ notice described in Exhibit B of this License must be attached.
+ .
+ Exhibit A - Source Code Form License Notice
+ -------------------------------------------
+ .
+ This Source Code Form is subject to the terms of the Mozilla Public
+ License, v. 2.0. If a copy of the MPL was not distributed with this
+ file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ .
+ If it is not possible or desirable to put the notice in a particular
+ file, then You may include the notice in a location (such as a LICENSE
+ file in a relevant directory) where a recipient would be likely to look
+ for such a notice.
+ .
+ You may add additional accurate notices of copyright ownership.
+ .
+ Exhibit B - "Incompatible With Secondary Licenses" Notice
+ ---------------------------------------------------------
+ .
+ This Source Code Form is "Incompatible With Secondary Licenses", as
+ defined by the Mozilla Public License, v. 2.0.
+
+Files: apps/files_texteditor/css/DroidSansMono/*
+Copyright: 2006, 2008, The Android Open Source Project
+License: Apache-2.0
Files: apps/files_texteditor/js/aceeditor/*
Copyright: 2010, Initial Developer, Ajax.org B.V.
License: MPL-1.1 or GPL-2+ or LGPL-3
+Files: apps/files_videoviewer/js/*
+ apps/files_videoviewer/mediaelement/*
+Copyright: 2010-2012, John Dyer (http://j.hn)
+ 2011, Dustin Diaz
+ 2011, Jacob Thornton
+License: Expat and GPL-2
+
+Files: apps/firstrunwizard/js/jquery.colorbox.js
+Copyright: 2012, Jack Moore
+License: Expat
+
+Files: apps/impress/js/impress.js
+Copyright: 2012, Bartek Szopka
+License: Expat
+
Files: apps/media/js/jQuery.jPlayer.2.1.0.source/*
apps/media/js/jquery.jplayer.min.js
apps/media/js/JPlayer.swf
@@ -343,21 +869,39 @@ Copyright: 2009-2011, Happyworm Ltd.
License: Expat or GPL-2
Comment: Expat license referred to as MIT license.
-Files: apps/remoteStorage/BearerAuth.php
-Copyright: 2007-2011, Rooftop Solutions
-License: BSD-3-clause-SabreDAV
-
-Files: apps/user_openid/class.openid.v3.php
-Copyright: 2008, Eddie Roosenmaallen <eddie at roosenmaallen.com>
-License: GPL-3
-Comment: Taken from http://www.phpclasses.org/browse/file/22469.html and
- http://roosenmaallen.com/2008/03/20/simpleopenid-for-php/.
+Files: apps/search_lucene/3rdparty/Zend/*
+Copyright: 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+License: BSD-3-clause-Zend
+ 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 Zend Technologies USA, 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 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.
-Files: apps/user_openid/phpmyid.php
-Copyright: 2006-2008, CJ Niemira <siege at siege.org>
-License: GPL-3
-Comment: License referred to as GNU General Public License, but GPL
- version 3 is linked.
+Files: apps/search_lucene/3rdparty/pdf2text.php
+Copyright: 2009, Philip Norton
+License: Expat
Files: core/js/jquery-*.js
Copyright: 2005-2011, John Resig, Brandon Aaron & Jörn Zaefferer
diff --git a/debian/rules b/debian/rules
index 782645c..442bef5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,13 +19,14 @@ override_dh_install:
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/miniColors/*-LICENSE.txt
rm debian/owncloud/usr/share/owncloud/3rdparty/php-cloudfiles/COPYING
+ rm debian/owncloud/usr/share/owncloud/3rdparty/symfony/routing/Symfony/Component/Routing/LICENSE
rm debian/owncloud/usr/share/owncloud/3rdparty/timepicker/*-LICENSE.txt
- rm debian/owncloud/usr/share/owncloud/3rdparty/when/MIT-LICENSE.txt
- rm debian/owncloud/usr/share/owncloud/apps/calendar/img/Icon\ License
- rm debian/owncloud/usr/share/owncloud/apps/contacts/js/LICENSE.jquery.inview
- rm debian/owncloud/usr/share/owncloud/apps/files_pdfviewer/js/pdfjs/LICENSE
+ rm debian/owncloud/usr/share/owncloud/apps/files_pdfviewer/3rdparty/pdfjs/LICENSE
+ rm debian/owncloud/usr/share/owncloud/apps/files_texteditor/css/DroidSansMono/Google\ Android\ License.txt
rm debian/owncloud/usr/share/owncloud/apps/files_texteditor/js/aceeditor/LICENSE
+ rm debian/owncloud/usr/share/owncloud/apps/updater/COPYING-AGPL
rm debian/owncloud/usr/share/owncloud/settings/img/log\ Icon\ License
# Remove other stuff
@@ -36,45 +37,65 @@ override_dh_install:
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/fontawesome/README.md
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
rm debian/owncloud/usr/share/owncloud/3rdparty/php-cloudfiles/Changelog
rm debian/owncloud/usr/share/owncloud/3rdparty/php-cloudfiles/README
+ rm debian/owncloud/usr/share/owncloud/3rdparty/symfony/routing/Symfony/Component/Routing/README.md
rm debian/owncloud/usr/share/owncloud/3rdparty/timepicker/releases.txt
+ rm debian/owncloud/usr/share/owncloud/apps/files_antivirus/README.md
+ rm debian/owncloud/usr/share/owncloud/apps/updater/README
rm debian/owncloud/usr/share/owncloud/core/img/filetypes/readme*.txt
rm debian/owncloud/usr/share/owncloud/core/js/oc-vcategories.txt
- rm -r debian/owncloud/usr/share/owncloud/apps/files_archive/tests
- rm -r debian/owncloud/usr/share/owncloud/apps/files_encryption/tests
rm -r debian/owncloud/usr/share/owncloud/apps/user_ldap/tests
rm -r debian/owncloud/usr/share/owncloud/l10n/templates # translation templates are not needed to run the app
- # Remove an unused scripts, source and minified JavaScript files.
+ # Remove unused scripts and sources.
rm -r debian/owncloud/usr/share/owncloud/3rdparty/phpass/c
rm debian/owncloud/usr/share/owncloud/3rdparty/phpass/test.php
- rm debian/owncloud/usr/share/owncloud/apps/contacts/js/jquery.inview.txt
- rm debian/owncloud/usr/share/owncloud/apps/files_pdfviewer/js/pdfjs/update.sh
rm -r debian/owncloud/usr/share/owncloud/apps/files_odfviewer/src
+ rm -r debian/owncloud/usr/share/owncloud/apps/files_videoviewer/mediaelement/src
rm debian/owncloud/usr/share/owncloud/l10n/l10n.pl
rm debian/owncloud/usr/share/owncloud/l10n/init.sh
# Minify JavaScript files and remove the source.
rm debian/owncloud/usr/share/owncloud/3rdparty/js/chosen/chosen.jquery.min.js
+ rm debian/owncloud/usr/share/owncloud/3rdparty/js/chosen/chosen.proto.min.js
rm debian/owncloud/usr/share/owncloud/3rdparty/fullcalendar/js/fullcalendar.min.js
+ rm debian/owncloud/usr/share/owncloud/3rdparty/miniColors/js/jquery.miniColors.min.js
rm debian/owncloud/usr/share/owncloud/apps/contacts/js/jquery.Jcrop.min.js
+ rm debian/owncloud/usr/share/owncloud/apps/contacts/js/placeholder_polyfill.jquery.min.combo.js
rm debian/owncloud/usr/share/owncloud/apps/files_imageviewer/js/jquery.fancybox-1.3.4.pack.js
rm debian/owncloud/usr/share/owncloud/apps/files_imageviewer/js/jquery.mousewheel-3.0.4.pack.js
rm debian/owncloud/usr/share/owncloud/apps/files_odfviewer/js/webodf.js
+ rm debian/owncloud/usr/share/owncloud/apps/files_videoviewer/js/mediaelement-and-player.min.js
rm debian/owncloud/usr/share/owncloud/core/js/jquery.infieldlabel.min.js
yui-compressor --type js debian/owncloud/usr/share/owncloud/3rdparty/js/chosen/chosen.jquery.js -o debian/owncloud/usr/share/owncloud/3rdparty/js/chosen/chosen.jquery.min.js
rm debian/owncloud/usr/share/owncloud/3rdparty/js/chosen/chosen.jquery.js
+ yui-compressor --type js debian/owncloud/usr/share/owncloud/3rdparty/js/chosen/chosen.proto.js -o debian/owncloud/usr/share/owncloud/3rdparty/js/chosen/chosen.proto.min.js
+ rm debian/owncloud/usr/share/owncloud/3rdparty/js/chosen/chosen.proto.js
+ yui-compressor --type js debian/owncloud/usr/share/owncloud/3rdparty/fullcalendar/js/fullcalendar.js -o fullcalendar/js/fullcalendar.min.js
+ rm debian/owncloud/usr/share/owncloud/3rdparty/fullcalendar/js/fullcalendar.js
+ yui-compressor --type js debian/owncloud/usr/share/owncloud/3rdparty/miniColors/js/jquery.miniColors.js -o debian/owncloud/usr/share/owncloud/3rdparty/miniColors/js/jquery.miniColors.min.js
+ rm debian/owncloud/usr/share/owncloud/3rdparty/miniColors/js/jquery.miniColors.js
+ yui-compressor --type js debian/owncloud/usr/share/owncloud/apps/contacts/js/jquery.Jcrop.js -o debian/owncloud/usr/share/owncloud/apps/contacts/js/jquery.Jcrop.min.js
+ rm debian/owncloud/usr/share/owncloud/apps/contacts/js/jquery.Jcrop.js
+ yui-compressor --type js apps/contacts/js/jquery.onfontresize.js \
+ -o debian/owncloud/usr/share/owncloud/apps/contacts/js/placeholder_polyfill.jquery.min.combo.js && \
+ yui-compressor --type js apps/contacts/js/placeholder_polyfill.jquery.js >> \
+ debian/owncloud/usr/share/owncloud/apps/contacts/js/placeholder_polyfill.jquery.min.combo.js
+ rm apps/contacts/js/jquery.onfontresize.js apps/contacts/js/placeholder_polyfill.jquery.js
yui-compressor --type js debian/owncloud/usr/share/owncloud/apps/files_imageviewer/js/jquery.fancybox-1.3.4.js -o debian/owncloud/usr/share/owncloud/apps/files_imageviewer/js/jquery.fancybox-1.3.4.pack.js
rm debian/owncloud/usr/share/owncloud/apps/files_imageviewer/js/jquery.fancybox-1.3.4.js
yui-compressor --type js debian/owncloud/usr/share/owncloud/apps/files_imageviewer/js/jquery.mousewheel-3.0.4.js -o debian/owncloud/usr/share/owncloud/apps/files_imageviewer/js/jquery.mousewheel-3.0.4.pack.js
rm debian/owncloud/usr/share/owncloud/apps/files_imageviewer/js/jquery.mousewheel-3.0.4.js
yui-compressor --type js debian/owncloud/usr/share/owncloud/apps/files_odfviewer/js/webodf-debug.js -o debian/owncloud/usr/share/owncloud/apps/files_odfviewer/js/webodf.js
rm debian/owncloud/usr/share/owncloud/apps/files_odfviewer/js/webodf-debug.js
+ yui-compressor --type js apps/files_videoviewer/js/mediaelement-and-player.js -o debian/owncloud/usr/share/owncloud/apps/files_videoviewer/js/mediaelement-and-player.min.js
+ rm apps/files_videoviewer/js/mediaelement-and-player.js
yui-compressor --type js debian/owncloud/usr/share/owncloud/core/js/jquery.infieldlabel.js -o debian/owncloud/usr/share/owncloud/core/js/jquery.infieldlabel.min.js
rm debian/owncloud/usr/share/owncloud/core/js/jquery.infieldlabel.js
--
owncloud.git
More information about the Pkg-owncloud-commits
mailing list