[Pkg-owncloud-commits] [owncloud] 13/17: Adapt packaging to updated 3rdparty
David Prévot
taffit at moszumanska.debian.org
Thu Mar 12 22:07:31 UTC 2015
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch stable8
in repository owncloud.
commit f98f5895ff5cb15b9988833154a6ccd83b5e72e3
Author: David Prévot <taffit at debian.org>
Date: Wed Feb 25 14:26:56 2015 -0400
Adapt packaging to updated 3rdparty
And removal, and move…
---
debian/control | 3 +-
debian/copyright | 722 +++++++++++++++++++++++++++++++++++++----------
debian/install | 6 -
debian/links | 12 +-
debian/lintian-overrides | 9 +-
debian/rules | 50 +---
debian/viewer.css | 5 -
7 files changed, 589 insertions(+), 218 deletions(-)
diff --git a/debian/control b/debian/control
index c9f5cda..6f1dc7f 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,6 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-owncloud/owncloud.git
Package: owncloud
Architecture: all
Depends: apache2 | httpd,
- libjs-chosen,
libjs-jcrop,
libjs-jquery-mousewheel,
libjs-mediaelement,
@@ -29,7 +28,7 @@ Depends: apache2 | httpd,
php-opencloud,
php-patchwork-utf8,
php-pear,
- php-pimple (<< 2),
+ php-pimple (>= 3),
php-sabre-dav (<< 1.9),
php-sabre-dav (>= 1.8),
php-seclib,
diff --git a/debian/copyright b/debian/copyright
index f169684..86af0e7 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -67,11 +67,8 @@ Copyright: 2010, 2012-2014, Frank Karlitschek <frank at owncloud.org>
2014, Clark Tomlinson <clark at owncloud.com>
License: AGPL-3+
-Files: 3rdparty/Archive/Tar.php
- 3rdparty/OS/Guess.php
- 3rdparty/PEAR/*
- 3rdparty/PEAR*.php
- 3rdparty/System.php
+Files: 3rdparty/pear/*
+ 3rdparty/PEAR*
core/doc/*/_static/*
Copyright: 1997-2010, Vincent Blavet <vincent at phpconcept.net>
1997-2010, Stig Bakken <ssb at php.net>
@@ -128,15 +125,17 @@ Files: 3rdparty/sabre/dav/bin/googlecode_upload.py
3rdparty/rackspace/php-opencloud/*
apps/files_external/3rdparty/aws-sdk-php/*
apps/files_external/3rdparty/google-api-php-client/*
- apps/files_pdfviewer/3rdparty/pdfjs/*
- apps/files_pdfviewer/templates/pdf.php
+ apps/files_pdfviewer/vendor/pdfjs/*
+ apps/files_pdfviewer/templates/viewer.php
apps/files_texteditor/css/DroidSansMono/*
core/fonts/*
Copyright: 2010-2012, Amazon.com, Inc. or its affiliates
- 2006-2008, 2010-2012, Google Inc.
+ 2006-2014, Google Inc.
2012-2014, Rackspace US, Inc.
2012-2014, Rackspace Hosting, Inc.
- 2012, Mozilla Foundation
+ 2012-2014, Mozilla Foundation
+ 2013, Rob Wu <gwnRob at gmail.com>
+ 2014, Opera Software ASA
2006, 2008, The Android Open Source Project
2010, 2011, Steve Matteson
License: Apache-2.0
@@ -146,29 +145,22 @@ Copyright: 2010, 2012, 2013 Ajax.org B.V.
2013, Matthew Christopher Kastor-Inare III, Atropa Inc. Intl
License: BSD-3-clause-Ajax
-Files: 3rdparty/Pimple/*
+Files: 3rdparty/pimple/*
3rdparty/composer/*
- 3rdparty/css/*
3rdparty/doctrine/*
3rdparty/guzzle/*
- 3rdparty/js/chosen/*
- 3rdparty/js/strengthify/*
3rdparty/kriswallsmith/*
3rdparty/phpmailer/phpmailer/examples/scripts/XRegExp.js
3rdparty/phpseclib/phpseclib/*
- 3rdparty/symfony/*
3rdparty/rackspace/php-opencloud/lib/OpenCloud/Common/Log/AbstractLogger.php
3rdparty/rackspace/php-opencloud/lib/OpenCloud/Common/Log/LogLevel.php
3rdparty/rackspace/php-opencloud/lib/OpenCloud/Common/Log/LoggerInterface.php
- 3rdparty/zxcvbn/*
+ 3rdparty/symfony/*
apps/files/js/jquery.*.js
apps/files_external/3rdparty/Dropbox/*
- apps/files_external/3rdparty/aws-sdk-php/Doctrine/*
apps/files_external/3rdparty/aws-sdk-php/Guzzle/*
- apps/files_external/3rdparty/aws-sdk-php/Monolog/*
apps/files_external/3rdparty/aws-sdk-php/Symfony/*
- apps/files_external/3rdparty/google-api-php-client/src/external/URITemplateParser.php
- apps/files_pdfviewer/3rdparty/pdfjs/l10n.js
+ apps/files_pdfviewer/vendor/pdfjs/web/l10n.js
apps/files_texteditor/js/vendor/ace/src-noconflict/mode-r.js
apps/files_texteditor/js/vendor/ace/src-noconflict/mode-rdoc.js
apps/files_texteditor/js/vendor/ace/src-noconflict/mode-rhtml.js
@@ -178,26 +170,22 @@ Files: 3rdparty/Pimple/*
apps/updater/js/3rdparty/angular.js
core/css/jquery-tipsy.css
core/css/jquery-ui-*.css
- core/js/jquery-1.10.0*.js
- core/js/jquery.placeholder.js
core/js/jquery-showpassword.js
core/js/jquery-tipsy.js
- core/js/jquery-migrate-1.2.1*.js
- core/js/jquery-ui-*.js
core/js/placeholders.js
- core/js/snap.js
- core/js/underscore.js
core/vendor/jcrop/*
+ core/vendor/jquery*
+ core/vendor/snapjs/dist/latest/snap.js
+ core/vendor/strengthify/*
+ core/vendor/underscore/underscore.js
+ core/vendor/zxcvbn/*
Copyright: 2004-2014, Fabien Potencier <fabien at symfony.com>
2011, Nils Adermann <naderman at naderman.de>
2011, Jordi Boggiano <j.boggiano at seld.be>
- 2013, Morris Jobke
- 2011, Harvest <info at getharvest.com>
- 2006-2012, Doctrine Project
+ 2006-2014, Doctrine Project
2013, Dave Gandy <dave at davegandy.com>
2010-2014, OpenSky Project Inc
2007-2012, Steven Levithan
- 2012, Dropbox, Inc.
2010, Sebastian Tschan
2012, Jack Moore
2010, Rooftop Solutions <http://www.rooftopsolutions.nl/>
@@ -207,162 +195,90 @@ Copyright: 2004-2014, Fabien Potencier <fabien at symfony.com>
2010, Kevin M Burns Jr <http://kevburnsjr.com>
2012, PHP Framework Interoperability Group
2006-2013, Jim Wigginton <terrafrost at php.net>
- 2011-2012, Fabien Cazenave, Mozilla
+ 2011-2013, Fabien Cazenave, Mozilla
2011, Irakli Gozalishvili
2013, Brandon Aaron
2010-2012, Google, Inc.
2008-2010, Jason Frame <json at onehackoranother.com>
Andrey Kuzmin
Jan Jarfalk
- 2005, 2013, jQuery Foundation Inc.
2012, James Allardice
+ 2008-2013, Tapmodo Interactive LLC
+ 2005, 2013, jQuery Foundation Inc.
2013, Jacob Kelley
+ 2013, Morris Jobke
2009-2014, Jeremy Ashkenas
- 2008-2013, Tapmodo Interactive LLC
+ 2012, Dropbox, Inc.
License: Expat
-Files: 3rdparty/Patchwork/*
- core/css/select2/*
- core/js/select2/*
+Files: 3rdparty/patchwork/*
+ core/vendor/select2/*
Copyright: 2013, Nicolas Grekas <p at tchwork.com>
2012, 2014, Igor Vaynberg
License: Apache-2.0 or GPL-2
Files: apps/files/js/jquery-visibility.js
- core/css/jquery.multiselect.css
- core/js/jquery.multiselect.js
+ apps/user_ldap/vendor/ui-multiselect/*
Copyright: 2010-2011, Francois Gelinas
2012, Mathias Bynens
2012, Eric Hynds
-License: Expat or GPL-2
+License: Expat or GPL-2+
-Files: 3rdparty/js/md5/*
+Files: core/vendor/blueimp-md5/js/md5.js
Copyright: 2011, Sebastian Tschan
1999-2009, Paul Johnston <paj at pajhome.org.uk>
License: Expat and BSD-3-clause
-Files: 3rdparty/phpass/*
-Copyright: 2004-2006, Solar Designer <solar at openwall.com>
-License: public-domain
-
-Files: 3rdparty/doctrine/common/lib/Doctrine/Common/Cache/ApcCache.php
- 3rdparty/doctrine/common/lib/Doctrine/Common/Cache/ArrayCache.php
- 3rdparty/doctrine/common/lib/Doctrine/Common/Cache/Cache.php
- 3rdparty/doctrine/common/lib/Doctrine/Common/Cache/MemcacheCache.php
- 3rdparty/doctrine/common/lib/Doctrine/Common/Cache/MemcachedCache.php
- 3rdparty/doctrine/common/lib/Doctrine/Common/Cache/RedisCache.php
- 3rdparty/doctrine/common/lib/Doctrine/Common/Cache/WinCacheCache.php
- 3rdparty/doctrine/common/lib/Doctrine/Common/Cache/XcacheCache.php
- 3rdparty/doctrine/common/lib/Doctrine/Common/Cache/ZendDataCache.php
- 3rdparty/doctrine/common/lib/Doctrine/Common/Comparable.php
- 3rdparty/doctrine/common/lib/Doctrine/Common/Event*.php
- 3rdparty/doctrine/common/lib/Doctrine/Common/NotifyPropertyChanged.php
- 3rdparty/doctrine/common/lib/Doctrine/Common/Persistence/AbstractManagerRegistry.php
- 3rdparty/doctrine/common/lib/Doctrine/Common/Persistence/ConnectionRegistry.php
- 3rdparty/doctrine/common/lib/Doctrine/Common/Persistence/Event/ManagerEventArgs.php
- 3rdparty/doctrine/common/lib/Doctrine/Common/Persistence/Event/OnClearEventArgs.php
- 3rdparty/doctrine/common/lib/Doctrine/Common/Persistence/ManagerRegistry.php
- 3rdparty/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/ClassMetadata*.php
- 3rdparty/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/Driver/FileDriver.php
- 3rdparty/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/Driver/PHPDriver.php
- 3rdparty/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/Driver/StaticPHPDriver.php
- 3rdparty/doctrine/common/lib/Doctrine/Common/Persistence/ObjectManager.php
- 3rdparty/doctrine/common/lib/Doctrine/Common/Persistence/ObjectRepository.php
- 3rdparty/doctrine/common/lib/Doctrine/Common/PropertyChangedListener.php
- 3rdparty/doctrine/common/lib/Doctrine/Common/Util/Debug.php
- 3rdparty/doctrine/common/lib/Doctrine/Common/Util/Inflector.php
- 3rdparty/doctrine/common/lib/Doctrine/Common/Version.php
- 3rdparty/doctrine/dbal/lib/Doctrine/DBAL/ConnectionException.php
- 3rdparty/doctrine/dbal/lib/Doctrine/DBAL/Driver/PDOIbm/Driver.php
- 3rdparty/doctrine/dbal/lib/Doctrine/DBAL/Driver/Statement.php
- 3rdparty/doctrine/dbal/lib/Doctrine/DBAL/Event/*
- 3rdparty/doctrine/dbal/lib/Doctrine/DBAL/LockMode.php
- 3rdparty/doctrine/dbal/lib/Doctrine/DBAL/Platforms/Keywords/DB2Keywords.php
- 3rdparty/doctrine/dbal/lib/Doctrine/DBAL/Platforms/Keywords/KeywordList.php
- 3rdparty/doctrine/dbal/lib/Doctrine/DBAL/Platforms/Keywords/SQLiteKeywords.php
- 3rdparty/doctrine/dbal/lib/Doctrine/DBAL/Portability/Statement.php
- 3rdparty/doctrine/dbal/lib/Doctrine/DBAL/Query/Expression/CompositeExpression.php
- 3rdparty/doctrine/dbal/lib/Doctrine/DBAL/Query/Expression/ExpressionBuilder.php
- 3rdparty/doctrine/dbal/lib/Doctrine/DBAL/SQLParserUtils.php
- 3rdparty/doctrine/dbal/lib/Doctrine/DBAL/SQLParserUtilsException.php
- 3rdparty/doctrine/dbal/lib/Doctrine/DBAL/Schema/AbstractSchemaManager.php
- 3rdparty/doctrine/dbal/lib/Doctrine/DBAL/Schema/DB2SchemaManager.php
- 3rdparty/doctrine/dbal/lib/Doctrine/DBAL/Schema/MySqlSchemaManager.php
- 3rdparty/doctrine/dbal/lib/Doctrine/DBAL/Schema/SQLServerSchemaManager.php
- 3rdparty/doctrine/dbal/lib/Doctrine/DBAL/Schema/View.php
- 3rdparty/doctrine/dbal/lib/Doctrine/DBAL/Types/ConversionException.php
- 3rdparty/doctrine/dbal/lib/Doctrine/DBAL/Types/DateTimeTzType.php
- 3rdparty/doctrine/dbal/lib/Doctrine/DBAL/Types/VarDateTimeType.php
- apps/files_external/3rdparty/aws-sdk-php/Doctrine/Common/Cache/ApcCache.php
- apps/files_external/3rdparty/aws-sdk-php/Doctrine/Common/Cache/ArrayCache.php
- apps/files_external/3rdparty/aws-sdk-php/Doctrine/Common/Cache/Cache.php
- apps/files_external/3rdparty/aws-sdk-php/Doctrine/Common/Cache/MemcacheCache.php
- apps/files_external/3rdparty/aws-sdk-php/Doctrine/Common/Cache/MemcachedCache.php
- apps/files_external/3rdparty/aws-sdk-php/Doctrine/Common/Cache/RedisCache.php
- apps/files_external/3rdparty/aws-sdk-php/Doctrine/Common/Cache/WinCacheCache.php
- apps/files_external/3rdparty/aws-sdk-php/Doctrine/Common/Cache/XcacheCache.php
- apps/files_external/3rdparty/aws-sdk-php/Doctrine/Common/Cache/ZendDataCache.php
-Copyright: 2006-2012, Doctrine Project
- Jonathan Wage <jonwage at gmail.com>
- Guilherme Blanco <guilhermeblanco at hotmail.com>
- Roman Borschel <roman at code-factory.org>
- Benjamin Eberlei <kontakt at beberlei.de>
- David Abdemoulaie <dave at hobodave.com>
- Fabio B. Silva <fabio.bat.silva at gmail.com>
- Osman Ungur <osmanungur at gmail.com>
- Ralph Schindler <ralph.schindler at zend.com>
- Fabien Potencier <fabien at symfony.com>
- Lukas Kahwe Smith <smith at pooteeweet.org>
- Giorgio Sironi <piccoloprincipeazzurro at gmail.com>
- Konsta Vesterinen <kvesteri at cc.hut.fi>
- Lars Strojny <lars at strojny.net>
- Jan Sorgalla <jsorgalla at googlemail.com>
-License: Expat and LGPL-2.1
-
-Files: 3rdparty/doctrine/dbal/lib/Doctrine/DBAL/Platforms/DB2Platform.php
+Files: 3rdparty/doctrine/dbal/lib/Doctrine/DBAL/Driver/SQLSrv/SQLSrvConnection.php
+ 3rdparty/doctrine/dbal/lib/Doctrine/DBAL/Platforms/DB2Platform.php
Copyright: 2006-2012, Doctrine Project
2005-2008, Zend Technologies Inc.
License: Expat and BSD-3-clause-Zend
-Files: 3rdparty/doctrine/dbal/lib/Doctrine/DBAL/Platforms/OraclePlatform.php
- 3rdparty/doctrine/dbal/lib/Doctrine/DBAL/Platforms/PostgreSqlPlatform.php
- 3rdparty/doctrine/dbal/lib/Doctrine/DBAL/Schema/Comparator.php
- 3rdparty/doctrine/dbal/lib/Doctrine/DBAL/Schema/SchemaDiff.php
- 3rdparty/doctrine/dbal/lib/Doctrine/DBAL/Schema/TableDiff.php
-Copyright: 2006-2012, Doctrine Project
- 2005-2013, eZ Systems AS
-License: Expat and BSD-3-clause-ez
-
Files: 3rdparty/doctrine/dbal/lib/Doctrine/DBAL/Platforms/Keywords/MsSQLKeywords.php
- 3rdparty/doctrine/dbal/lib/Doctrine/DBAL/Platforms/Keywords/MySQLKeywords.php
- 3rdparty/doctrine/dbal/lib/Doctrine/DBAL/Platforms/Keywords/OracleKeywords.php
- 3rdparty/doctrine/dbal/lib/Doctrine/DBAL/Platforms/Keywords/PostgreSQLKeywords.php
+ 3rdparty/doctrine/dbal/lib/Doctrine/DBAL/Platforms/Keywords/SQLServer*Keywords.php
Copyright: 2006-2012, Doctrine Project
- Benjamin Eberlei <kontakt at beberlei.de>
- David Coallier <davidc at php.net>
- Marcelo Santos Araujo <msaraujo at php.net>
License: Expat and BSD-2-clause
-Files: 3rdparty/doctrine/dbal/lib/Doctrine/DBAL/Query/QueryBuilder.php
+Files: 3rdparty/doctrine/dbal/lib/Doctrine/DBAL/Platforms/OraclePlatform.php
+ 3rdparty/doctrine/dbal/lib/Doctrine/DBAL/Platforms/PostgreSqlPlatform.php
+ 3rdparty/doctrine/dbal/lib/Doctrine/DBAL/Query/QueryBuilder.php
3rdparty/doctrine/dbal/lib/Doctrine/DBAL/Schema/OracleSchemaManager.php
3rdparty/doctrine/dbal/lib/Doctrine/DBAL/Schema/PostgreSqlSchemaManager.php
+ 3rdparty/doctrine/dbal/lib/Doctrine/DBAL/Schema/SchemaDiff.php
3rdparty/doctrine/dbal/lib/Doctrine/DBAL/Schema/SqliteSchemaManager.php
Copyright: 2006-2012, Doctrine Project
- Jonathan Wage <jonwage at gmail.com>
- Benjamin Eberlei <kontakt at beberlei.de>
- Guilherme Blanco <guilhermeblanco at hotmail.com>
- Lukas Kahwe Smith <smith at pooteeweet.org>
- Konsta Vesterinen <kvesteri at cc.hut.fi>
- 2007-2013, eZ Systems AS
-License: Expat and LGPL-2.1 and BSD-3-clause-ez
+ 2005-2013, eZ Systems AS
+License: Expat and BSD-3-clause-ez
Files: 3rdparty/guzzle/http/Guzzle/Http/Resources/cacert.pem
3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/Common/cacert.pem
apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Resources/cacert.pem
- apps/files_pdfviewer/3rdparty/pdfjs/locale/fr/viewer.properties
+ apps/files_pdfviewer/vendor/pdfjs/web/locale/ast/viewer.properties
+ apps/files_pdfviewer/vendor/pdfjs/web/locale/csb/viewer.properties
+ apps/files_pdfviewer/vendor/pdfjs/web/locale/el/viewer.properties
+ apps/files_pdfviewer/vendor/pdfjs/web/locale/es-ES/viewer.properties
+ apps/files_pdfviewer/vendor/pdfjs/web/locale/gu-IN/viewer.properties
+ apps/files_pdfviewer/vendor/pdfjs/web/locale/he/viewer.properties
+ apps/files_pdfviewer/vendor/pdfjs/web/locale/it/viewer.properties
+ apps/files_pdfviewer/vendor/pdfjs/web/locale/lij/viewer.properties
+ apps/files_pdfviewer/vendor/pdfjs/web/locale/lv/viewer.properties
+ apps/files_pdfviewer/vendor/pdfjs/web/locale/mk/viewer.properties
+ apps/files_pdfviewer/vendor/pdfjs/web/locale/pl/viewer.properties
+ apps/files_pdfviewer/vendor/pdfjs/web/locale/rm/viewer.properties
+ apps/files_pdfviewer/vendor/pdfjs/web/locale/ru/viewer.properties
+ apps/files_pdfviewer/vendor/pdfjs/web/locale/sq/viewer.properties
Copyright: 2012, Mozilla Foundation
License: MPL-2.0
+Files: apps/files_external/3rdparty/google-api-php-client/src/Google/IO/cacerts.pem
+Copyright: 1994-2000 Netscape Communications Corporation
+License: MPL-1.1 or GPL-2+ or LGPL-2.1+
+
+Files: apps/files_pdfviewer/vendor/pdfjs/web/cmaps/*
+Copyright: 1990-2009, Adobe Systems Incorporated
+License: BSD-3-clause-Adobe
+
Files: apps/files_texteditor/js/vendor/ace/src-noconflict/mode-r.js
apps/files_texteditor/js/vendor/ace/src-noconflict/mode-rdoc.js
apps/files_texteditor/js/vendor/ace/src-noconflict/mode-rhtml.js
@@ -1099,6 +1015,39 @@ 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.
+License: BSD-3-clause-Adobe
+ 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 Adobe Systems Incorporated 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 HOLDER 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.
+
License: BSD-3-clause-Ajax
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
@@ -1253,10 +1202,6 @@ License: GPL-3+
On Debian systems, the full text of the GNU General Public License
version 3 can be found in the file `/usr/share/common-licenses/GPL-3'.
-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'.
@@ -1265,6 +1210,487 @@ License: LGPL-3+
On Debian systems, the full text of the GNU Lesser General Public License
version 3 can be found in the file `/usr/share/common-licenses/LGPL-3'.
+License: MPL-1.1
+ 1. Definitions.
+ .
+ 1.0.1. "Commercial Use" means distribution or otherwise making the
+ Covered Code available to a third party.
+ .
+ 1.1. "Contributor" means each entity that creates or contributes to
+ the creation of Modifications.
+ .
+ 1.2. "Contributor Version" means the combination of the Original
+ Code, prior Modifications used by a Contributor, and the Modifications
+ made by that particular Contributor.
+ .
+ 1.3. "Covered Code" means the Original Code or Modifications or the
+ combination of the Original Code and Modifications, in each case
+ including portions thereof.
+ .
+ 1.4. "Electronic Distribution Mechanism" means a mechanism generally
+ accepted in the software development community for the electronic
+ transfer of data.
+ .
+ 1.5. "Executable" means Covered Code in any form other than Source
+ Code.
+ .
+ 1.6. "Initial Developer" means the individual or entity identified
+ as the Initial Developer in the Source Code notice required by Exhibit
+ A.
+ .
+ 1.7. "Larger Work" means a work which combines Covered Code or
+ portions thereof with code not governed by the terms of this License.
+ .
+ 1.8. "License" means this document.
+ .
+ 1.8.1. "Licensable" means having the right to grant, to the maximum
+ extent possible, whether at the time of the initial grant or
+ subsequently acquired, any and all of the rights conveyed herein.
+ .
+ 1.9. "Modifications" means any addition to or deletion from the
+ substance or structure of either the Original Code or any previous
+ Modifications. When Covered Code is released as a series of files, a
+ Modification is:
+ .
+ A. Any addition to or deletion from the contents of a file
+ containing Original Code or previous Modifications.
+ .
+ B. Any new file that contains any part of the Original Code or
+ previous Modifications.
+ .
+ 1.10. "Original Code" means Source Code of computer software code
+ which is described in the Source Code notice required by Exhibit A as
+ Original Code, and which, at the time of its release under this
+ License is not already Covered Code governed by this License.
+ .
+ 1.10.1. "Patent Claims" means any patent claim(s), now owned or
+ hereafter acquired, including without limitation, method, process,
+ and apparatus claims, in any patent Licensable by grantor.
+ .
+ 1.11. "Source Code" means the preferred form of the Covered Code for
+ making modifications to it, including all modules it contains, plus
+ any associated interface definition files, scripts used to control
+ compilation and installation of an Executable, or source code
+ differential comparisons against either the Original Code or another
+ well known, available Covered Code of the Contributor's choice. The
+ Source Code can be in a compressed or archival form, provided the
+ appropriate decompression or de-archiving software is widely available
+ for no charge.
+ .
+ 1.12. "You" (or "Your") means an individual or a legal entity
+ exercising rights under, and complying with all of the terms of, this
+ License or a future version of this License issued under Section 6.1.
+ For legal entities, "You" includes any entity which 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. Source Code License.
+ .
+ 2.1. The Initial Developer Grant.
+ The Initial Developer hereby grants You a world-wide, royalty-free,
+ non-exclusive license, subject to third party intellectual property
+ claims:
+ .
+ (a) under intellectual property rights (other than patent or
+ trademark) Licensable by Initial Developer to use, reproduce,
+ modify, display, perform, sublicense and distribute the Original
+ Code (or portions thereof) with or without Modifications, and/or
+ as part of a Larger Work; and
+ .
+ (b) under Patents Claims infringed by the making, using or
+ selling of Original Code, to make, have made, use, practice,
+ sell, and offer for sale, and/or otherwise dispose of the
+ Original Code (or portions thereof).
+ .
+ (c) the licenses granted in this Section 2.1(a) and (b) are
+ effective on the date Initial Developer first distributes
+ Original Code under the terms of this License.
+ .
+ (d) Notwithstanding Section 2.1(b) above, no patent license is
+ granted: 1) for code that You delete from the Original Code; 2)
+ separate from the Original Code; or 3) for infringements caused
+ by: i) the modification of the Original Code or ii) the
+ combination of the Original Code with other software or devices.
+ .
+ 2.2. Contributor Grant.
+ Subject to third party intellectual property claims, 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 Contributor, to use, reproduce, modify,
+ display, perform, sublicense and distribute the Modifications
+ created by such Contributor (or portions thereof) either on an
+ unmodified basis, with other Modifications, as Covered Code
+ and/or as part of a Larger Work; and
+ .
+ (b) under Patent Claims infringed by the making, using, or
+ selling of Modifications made by that Contributor either alone
+ and/or in combination with its Contributor Version (or portions
+ of such combination), to make, use, sell, offer for sale, have
+ made, and/or otherwise dispose of: 1) Modifications made by that
+ Contributor (or portions thereof); and 2) the combination of
+ Modifications made by that Contributor with its Contributor
+ Version (or portions of such combination).
+ .
+ (c) the licenses granted in Sections 2.2(a) and 2.2(b) are
+ effective on the date Contributor first makes Commercial Use of
+ the Covered Code.
+ .
+ (d) Notwithstanding Section 2.2(b) above, no patent license is
+ granted: 1) for any code that Contributor has deleted from the
+ Contributor Version; 2) separate from the Contributor Version;
+ 3) for infringements caused by: i) third party modifications of
+ Contributor Version or ii) the combination of Modifications made
+ by that Contributor with other software (except as part of the
+ Contributor Version) or other devices; or 4) under Patent Claims
+ infringed by Covered Code in the absence of Modifications made by
+ that Contributor.
+ .
+ 3. Distribution Obligations.
+ .
+ 3.1. Application of License.
+ .
+ The Modifications which You create or to which You contribute are
+ governed by the terms of this License, including without limitation
+ Section 2.2. The Source Code version of Covered Code may be
+ distributed only under the terms of this License or a future version
+ of this License released under Section 6.1, and You must include a
+ copy of this License with every copy of the Source Code You
+ distribute. You may not offer or impose any terms on any Source Code
+ version that alters or restricts the applicable version of this
+ License or the recipients' rights hereunder. However, You may include
+ an additional document offering the additional rights described in
+ Section 3.5.
+ .
+ 3.2. Availability of Source Code.
+ .
+ Any Modification which You create or to which You contribute must be
+ made available in Source Code form under the terms of this License
+ either on the same media as an Executable version or via an accepted
+ Electronic Distribution Mechanism to anyone to whom you made an
+ Executable version available; and if made available via Electronic
+ Distribution Mechanism, must remain available for at least twelve (12)
+ months after the date it initially became available, or at least six
+ (6) months after a subsequent version of that particular Modification
+ has been made available to such recipients. You are responsible for
+ ensuring that the Source Code version remains available even if the
+ Electronic Distribution Mechanism is maintained by a third party.
+ .
+ 3.3. Description of Modifications.
+ .
+ You must cause all Covered Code to which You contribute to contain a
+ file documenting the changes You made to create that Covered Code and
+ the date of any change. You must include a prominent statement that
+ the Modification is derived, directly or indirectly, from Original
+ Code provided by the Initial Developer and including the name of the
+ Initial Developer in (a) the Source Code, and (b) in any notice in an
+ Executable version or related documentation in which You describe the
+ origin or ownership of the Covered Code.
+ .
+ 3.4. Intellectual Property Matters
+ .
+ (a) Third Party Claims.
+ .
+ If Contributor has knowledge that a license under a third party's
+ intellectual property rights is required to exercise the rights
+ granted by such Contributor under Sections 2.1 or 2.2,
+ Contributor must include a text file with the Source Code
+ distribution titled "LEGAL" which describes the claim and the
+ party making the claim in sufficient detail that a recipient will
+ know whom to contact. If Contributor obtains such knowledge after
+ the Modification is made available as described in Section 3.2,
+ Contributor shall promptly modify the LEGAL file in all copies
+ Contributor makes available thereafter and shall take other steps
+ (such as notifying appropriate mailing lists or newsgroups)
+ reasonably calculated to inform those who received the Covered
+ Code that new knowledge has been obtained.
+ .
+ (b) Contributor APIs.
+ .
+ If Contributor's Modifications include an application programming
+ interface and Contributor has knowledge of patent licenses which
+ are reasonably necessary to implement that API, Contributor must
+ also include this information in the LEGAL file.
+ .
+ (c) Representations.
+ .
+ Contributor represents that, except as disclosed pursuant to
+ Section 3.4(a) above, Contributor believes that Contributor's
+ Modifications are Contributor's original creation(s) and/or
+ Contributor has sufficient rights to grant the rights conveyed by
+ this License.
+ .
+ 3.5. Required Notices.
+ .
+ You must duplicate the notice in Exhibit A in each file of the Source
+ Code. If it is not possible to put such notice in a particular Source
+ Code file due to its structure, then You must include such notice in a
+ location (such as a relevant directory) where a user would be likely
+ to look for such a notice. If You created one or more Modification(s)
+ You may add your name as a Contributor to the notice described in
+ Exhibit A. You must also duplicate this License in any documentation
+ for the Source Code where You describe recipients' rights or ownership
+ rights relating to Covered Code. You may choose to offer, and to
+ charge a fee for, warranty, support, indemnity or liability
+ obligations to one or more recipients of Covered Code. However, You
+ may do so only on Your own behalf, and not on behalf of the Initial
+ Developer or any Contributor. You must make it absolutely clear than
+ any such warranty, support, indemnity or liability obligation is
+ offered by You alone, and You hereby agree to indemnify the Initial
+ Developer and every Contributor for any liability incurred by the
+ Initial Developer or such Contributor as a result of warranty,
+ support, indemnity or liability terms You offer.
+ .
+ 3.6. Distribution of Executable Versions.
+ .
+ You may distribute Covered Code in Executable form only if the
+ requirements of Section 3.1-3.5 have been met for that Covered Code,
+ and if You include a notice stating that the Source Code version of
+ the Covered Code is available under the terms of this License,
+ including a description of how and where You have fulfilled the
+ obligations of Section 3.2. The notice must be conspicuously included
+ in any notice in an Executable version, related documentation or
+ collateral in which You describe recipients' rights relating to the
+ Covered Code. You may distribute the Executable version of Covered
+ Code or ownership rights under a license of Your choice, which may
+ contain terms different from this License, provided that You are in
+ compliance with the terms of this License and that the license for the
+ Executable version does not attempt to limit or alter the recipient's
+ rights in the Source Code version from the rights set forth in this
+ License. If You distribute the Executable version under a different
+ license You must make it absolutely clear that any terms which differ
+ from this License are offered by You alone, not by the Initial
+ Developer or any Contributor. You hereby agree to indemnify the
+ Initial Developer and every Contributor for any liability incurred by
+ the Initial Developer or such Contributor as a result of any such
+ terms You offer.
+ .
+ 3.7. Larger Works.
+ .
+ You may create a Larger Work by combining Covered Code with other code
+ not governed by the terms of this License and distribute the Larger
+ Work as a single product. In such a case, You must make sure the
+ requirements of this License are fulfilled for the Covered Code.
+ .
+ 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 Code 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 included in the LEGAL file described in Section 3.4 and must
+ be included with all distributions of the Source Code. 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. Application of this License.
+ .
+ This License applies to code to which the Initial Developer has
+ attached the notice in Exhibit A and to related Covered Code.
+ .
+ 6. Versions of the License.
+ .
+ 6.1. New Versions.
+ .
+ Netscape Communications Corporation ("Netscape") may publish revised
+ and/or new versions of the License from time to time. Each version
+ will be given a distinguishing version number.
+ .
+ 6.2. Effect of New Versions.
+ .
+ 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 Netscape. No one
+ other than Netscape has the right to modify the terms applicable to
+ Covered Code created under this License.
+ .
+ 6.3. Derivative Works.
+ .
+ If You create or use a modified version of this License (which you may
+ only do in order to apply it to code which is not already Covered Code
+ governed by this License), You must (a) rename Your license so that
+ the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape",
+ "MPL", "NPL" or any confusingly similar phrase do not appear in your
+ license (except to note that your license differs from this License)
+ and (b) otherwise make it clear that Your version of the license
+ contains terms which differ from the Mozilla Public License and
+ Netscape Public License. (Filling in the name of the Initial
+ Developer, Original Code or Contributor in the notice described in
+ Exhibit A shall not of themselves be deemed to be modifications of
+ this License.)
+ .
+ 7. DISCLAIMER OF WARRANTY.
+ .
+ COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS,
+ WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+ WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE 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 CODE
+ IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT,
+ YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER 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 CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
+ .
+ 8. TERMINATION.
+ .
+ 8.1. This License and the rights granted hereunder will terminate
+ automatically if You fail to comply with terms herein and fail to cure
+ such breach within 30 days of becoming aware of the breach. All
+ sublicenses to the Covered Code which are properly granted shall
+ survive any termination of this License. Provisions which, by their
+ nature, must remain in effect beyond the termination of this License
+ shall survive.
+ .
+ 8.2. If You initiate litigation by asserting a patent infringement
+ claim (excluding declatory judgment actions) against Initial Developer
+ or a Contributor (the Initial Developer or Contributor against whom
+ You file such action is referred to as "Participant") alleging that:
+ .
+ (a) such Participant's Contributor Version directly or indirectly
+ infringes any patent, then any and all rights granted by such
+ Participant to You under Sections 2.1 and/or 2.2 of this License
+ shall, upon 60 days notice from Participant terminate prospectively,
+ unless if within 60 days after receipt of notice You either: (i)
+ agree in writing to pay Participant a mutually agreeable reasonable
+ royalty for Your past and future use of Modifications made by such
+ Participant, or (ii) withdraw Your litigation claim with respect to
+ the Contributor Version against such Participant. If within 60 days
+ of notice, a reasonable royalty and payment arrangement are not
+ mutually agreed upon in writing by the parties or the litigation claim
+ is not withdrawn, the rights granted by Participant to You under
+ Sections 2.1 and/or 2.2 automatically terminate at the expiration of
+ the 60 day notice period specified above.
+ .
+ (b) any software, hardware, or device, other than such Participant's
+ Contributor Version, directly or indirectly infringes any patent, then
+ any rights granted to You by such Participant under Sections 2.1(b)
+ and 2.2(b) are revoked effective as of the date You first made, used,
+ sold, distributed, or had made, Modifications made by that
+ Participant.
+ .
+ 8.3. If You assert a patent infringement claim against Participant
+ alleging that such Participant's Contributor Version directly or
+ indirectly infringes any patent where such claim is resolved (such as
+ by license or settlement) prior to the initiation of patent
+ infringement litigation, then the reasonable value of the licenses
+ granted by such Participant under Sections 2.1 or 2.2 shall be taken
+ into account in determining the amount or value of any payment or
+ license.
+ .
+ 8.4. In the event of termination under Sections 8.1 or 8.2 above,
+ all end user license agreements (excluding distributors and resellers)
+ which have been validly granted by You or any distributor hereunder
+ prior to termination shall survive termination.
+ .
+ 9. LIMITATION OF LIABILITY.
+ .
+ UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
+ (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL
+ DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE,
+ OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR
+ ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY
+ CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR 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.
+ .
+ 10. U.S. GOVERNMENT END USERS.
+ .
+ The Covered Code is a "commercial item," as that term is defined in
+ 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer
+ software" and "commercial computer software documentation," as such
+ terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48
+ C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995),
+ all U.S. Government End Users acquire Covered Code with only those
+ rights set forth herein.
+ .
+ 11. MISCELLANEOUS.
+ .
+ This License represents the complete agreement concerning 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. This License shall be governed by
+ California law provisions (except to the extent applicable law, if
+ any, provides otherwise), excluding its conflict-of-law provisions.
+ With respect to disputes in which at least one party is a citizen of,
+ or an entity chartered or registered to do business in the United
+ States of America, any litigation relating to this License shall be
+ subject to the jurisdiction of the Federal Courts of the Northern
+ District of California, with venue lying in Santa Clara County,
+ California, with the losing party responsible for costs, including
+ without limitation, court costs and reasonable attorneys' fees and
+ expenses. The application of the United Nations Convention on
+ Contracts for the International Sale of Goods is expressly excluded.
+ Any law or regulation which provides that the language of a contract
+ shall be construed against the drafter shall not apply to this
+ License.
+ .
+ 12. RESPONSIBILITY FOR CLAIMS.
+ .
+ As between Initial Developer and the Contributors, each party is
+ responsible for claims and damages arising, directly or indirectly,
+ out of its utilization of rights under this License and You agree to
+ work with Initial Developer and Contributors to distribute such
+ responsibility on an equitable basis. Nothing herein is intended or
+ shall be deemed to constitute any admission of liability.
+ .
+ 13. MULTIPLE-LICENSED CODE.
+ .
+ Initial Developer may designate portions of the Covered Code as
+ "Multiple-Licensed". "Multiple-Licensed" means that the Initial
+ Developer permits you to utilize portions of the Covered Code under
+ Your choice of the NPL or the alternative licenses, if any, specified
+ by the Initial Developer in the file described in Exhibit A.
+ .
+ EXHIBIT A -Mozilla Public License.
+ .
+ ``The contents of this file are subject to the Mozilla Public License
+ Version 1.1 (the "License"); you may not use this file except in
+ compliance with the License. You may obtain a copy of the License at
+ http://www.mozilla.org/MPL/
+ .
+ Software distributed under the License is distributed on an "AS IS"
+ basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ License for the specific language governing rights and limitations
+ under the License.
+ .
+ The Original Code is ______________________________________.
+ .
+ The Initial Developer of the Original Code is ________________________.
+ Portions created by ______________________ are Copyright (C) ______
+ _______________________. All Rights Reserved.
+ .
+ Contributor(s): ______________________________________.
+ .
+ Alternatively, the contents of this file may be used under the terms
+ of the _____ license (the "[___] License"), in which case the
+ provisions of [______] License are applicable instead of those
+ above. If you wish to allow use of your version of this file only
+ under the terms of the [____] License and not to allow others to use
+ your version of this file under the MPL, indicate your decision by
+ deleting the provisions above and replace them with the notice and
+ other provisions required by the [___] License. If you do not delete
+ the provisions above, a recipient may use your version of this file
+ under either the MPL or the [___] License."
+ .
+ [NOTE: The text of this Exhibit A may differ slightly from the text of
+ the notices in the Source Code files of the Original Code. You should
+ use the text of this Exhibit A rather than the text found in the
+ Original Code Source Code for Your Modifications.]
+
License: MPL-2.0
1. Definitions
--------------
@@ -1636,7 +2062,3 @@ License: MPL-2.0
.
This Source Code Form is "Incompatible With Secondary Licenses", as
defined by the Mozilla Public License, v. 2.0.
-
-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.
diff --git a/debian/install b/debian/install
index 5660b1a..ef0920a 100644
--- a/debian/install
+++ b/debian/install
@@ -7,14 +7,8 @@ settings usr/share/owncloud
themes var/lib/owncloud
# Third party
-3rdparty/css/strengthify/strengthify.css usr/share/owncloud/3rdparty/css/strengthify
-3rdparty/js/md5/md5.js usr/share/owncloud/3rdparty/js/md5
-3rdparty/js/strengthify/jquery.strengthify.js usr/share/owncloud/3rdparty/js/strengthify
3rdparty/mcnetic/phpzipstreamer/ZipStreamer.php usr/share/owncloud/3rdparty/mcnetic/phpzipstreamer
-3rdparty/phpass/PasswordHash.php usr/share/owncloud/3rdparty/phpass
-3rdparty/zxcvbn/js/zxcvbn.js usr/share/owncloud/3rdparty/zxcvbn/js
debian/autoload.php usr/share/owncloud/3rdparty
-debian/viewer.css usr/share/owncloud/apps/files_pdfviewer/3rdparty/pdfjs
# Files
config/.htaccess etc/owncloud
diff --git a/debian/links b/debian/links
index d97e768..a854e40 100644
--- a/debian/links
+++ b/debian/links
@@ -12,20 +12,10 @@ etc/owncloud usr/share/owncloud/config
etc/owncloud/htaccess usr/share/owncloud/.htaccess
# Link JavaScript files from the locations in dependency packages.
-usr/share/javascript/chosen usr/share/owncloud/3rdparty/js/chosen
-usr/share/javascript/chosen usr/share/owncloud/3rdparty/css/chosen
usr/share/javascript/jcrop usr/share/owncloud/core/vendor/jcrop
usr/share/javascript/jquery-mousewheel/jquery.mousewheel.js usr/share/owncloud/apps/gallery/js/jquery.mousewheel-3.1.1.js
usr/share/javascript/underscore/underscore.js usr/share/owncloud/core/js/underscore.js
-
-# pdf.js is mostly taken from the external package
-usr/share/javascript/pdf/web/compatibility.js usr/share/owncloud/apps/files_pdfviewer/3rdparty/pdfjs/compatibility.js
-usr/share/javascript/pdf/web/images usr/share/owncloud/apps/files_pdfviewer/3rdparty/pdfjs/images
-usr/share/javascript/pdf/web/l10n.js usr/share/owncloud/apps/files_pdfviewer/3rdparty/pdfjs/l10n.js
-usr/share/javascript/pdf/web/locale usr/share/owncloud/apps/files_pdfviewer/3rdparty/pdfjs/locale
-usr/share/javascript/pdf/build/pdf.js usr/share/owncloud/apps/files_pdfviewer/3rdparty/pdfjs/pdf.js
-usr/share/javascript/pdf/build/pdf.worker.js usr/share/owncloud/apps/files_pdfviewer/3rdparty/pdfjs/pdf.worker.js
-usr/share/javascript/pdf/web/viewer.css usr/share/owncloud/apps/files_pdfviewer/3rdparty/pdfjs/viewer.orig.css
+usr/share/javascript/pdf usr/share/owncloud/apps/files_pdfviewer/vendor/pdfjs
# Use MediaElement from libjs-mediaelement
usr/share/javascript/mediaelement/mediaelementplayer.css usr/share/owncloud/apps/files_videoviewer/css/mediaelementplayer.css
diff --git a/debian/lintian-overrides b/debian/lintian-overrides
index f13544c..8cb37f1 100644
--- a/debian/lintian-overrides
+++ b/debian/lintian-overrides
@@ -7,13 +7,8 @@ apache2-reverse-dependency-calls-invoke-rc.d postinst
apache2-reverse-dependency-calls-wrapper-script postinst a2enmod
# This symlink points to a file provided by libjs-jcrop, which is a dependency.
package-contains-broken-symlink usr/share/owncloud/core/vendor/jcrop ../../../javascript/jcrop
-# These symlinks point to a directory provided by libjs-chosen, which is a dependency.
-package-contains-broken-symlink usr/share/owncloud/3rdparty/css/chosen ../../../javascript/chosen
-package-contains-broken-symlink usr/share/owncloud/3rdparty/js/chosen ../../../javascript/chosen
-# These symlinks point to a file and directories provided by libjs-pdf, which is a dependency.
-package-contains-broken-symlink usr/share/owncloud/apps/files_pdfviewer/3rdparty/pdfjs/images ../../../../../javascript/pdf/web/images
-package-contains-broken-symlink usr/share/owncloud/apps/files_pdfviewer/3rdparty/pdfjs/locale ../../../../../javascript/pdf/web/locale
-package-contains-broken-symlink usr/share/owncloud/apps/files_pdfviewer/3rdparty/pdfjs/viewer.orig.css ../../../../../javascript/pdf/web/viewer.css
+# This symlink point to a directory provided by libjs-pdf, which is a dependency.
+package-contains-broken-symlink usr/share/owncloud/apps/files_pdfviewer/vendor/pdfjs ../../../../javascript/pdf
# This symlink points to a file provided by owncloud-doc, which is a dependency.
package-contains-broken-symlink usr/share/owncloud/core/skeleton/ownCloudUserManual.pdf ../doc/user/ownCloudUserManual.pdf
# These symlinks point to files provided by libjs-mediaelement, which is a dependency.
diff --git a/debian/rules b/debian/rules
index e55531c..8dcf058 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,14 +8,17 @@ VERSION := $(shell head -1 debian/changelog | sed 's/.*(//;s/).*//')
override_dh_install:
# Remove useless licences, documentation, tests, scripts and sources
dh_install \
+ -Xapps/updater -Xaws-sdk-php \
-Xbower.json \
- -XChangelog -Xcomponent.json -Xcomposer.json -XCOPYING \
- -Xfiles_videoviewer/src -Xfonts/index.html \
+ -Xcomposer.json -XCOPYING -Xcore/doc \
+ -XDropbox \
+ -Xfiles_videoviewer/src \
+ -Xgoogle-api-php-client \
-Xignorelist -Ximage-optimization.sh -Ximg/skin \
- -Xjquery.inview.txt -Xjquery.json -X.js.template \
- -Xl10n.pl -XLICENSE -XLicense.txt \
- -Xpackage.json \
- -XREADME. -Xrelease.sh \
+ -Xjcrop \
+ -XLICEN -XLicense.txt \
+ -Xpdfjs \
+ -XREADME. \
-Xspec.txt \
-Xtemplateeditor/l10n -Xtests \
-Xxgettextfiles
@@ -26,39 +29,12 @@ override_dh_install:
rm debian/owncloud/usr/share/owncloud/apps/*/l10n/*.js*
# Minify JavaScript files.
- rm debian/owncloud/usr/share/owncloud/core/js/jquery-1.10.0.min.js
- rm debian/owncloud/usr/share/owncloud/core/js/jquery-migrate-1.2.1.min.js
-
- uglifyjs -o \
- debian/owncloud/usr/share/owncloud/3rdparty/js/md5/md5.min.js \
- debian/owncloud/usr/share/owncloud/3rdparty/js/md5/md5.js
uglifyjs -o \
- debian/owncloud/usr/share/owncloud/3rdparty/zxcvbn/js/zxcvbn.min.js \
- debian/owncloud/usr/share/owncloud/3rdparty/zxcvbn/js/zxcvbn.js
+ debian/owncloud/usr/share/owncloud/core/vendor/jquery/jquery.min.js \
+ debian/owncloud/usr/share/owncloud/core/vendor/jquery/jquery.js
uglifyjs -o \
- debian/owncloud/usr/share/owncloud/core/js/jquery-1.10.0.min.js \
- debian/owncloud/usr/share/owncloud/core/js/jquery-1.10.0.js
- uglifyjs -o \
- debian/owncloud/usr/share/owncloud/core/js/jquery-migrate-1.2.1.min.js \
- debian/owncloud/usr/share/owncloud/core/js/jquery-migrate-1.2.1.js
-
- # Clean up apps to link external third parties
- rm -r debian/owncloud/usr/share/owncloud/apps/files_pdfviewer/3rdparty/pdfjs/images
- rm -r debian/owncloud/usr/share/owncloud/apps/files_pdfviewer/3rdparty/pdfjs/locale
- rm debian/owncloud/usr/share/owncloud/apps/files_pdfviewer/3rdparty/pdfjs/viewer.js
-
- # Remove the Updater app since upgrade must be made via the package
- rm -r debian/owncloud/usr/share/owncloud/apps/updater
-
- # Remove the doc, shipped in owncloud-doc
- rm -r debian/owncloud/usr/share/owncloud/core/doc
-
- # Remove third party provided by external package
- rmdir debian/owncloud/usr/share/owncloud/apps/files_encryption/3rdparty
- rm -r debian/owncloud/usr/share/owncloud/apps/files_external/3rdparty/Dropbox
- rm -r debian/owncloud/usr/share/owncloud/apps/files_external/3rdparty/aws-sdk-php
- rm -r debian/owncloud/usr/share/owncloud/apps/files_external/3rdparty/google-api-php-client
- rm -r debian/owncloud/usr/share/owncloud/core/vendor/jcrop
+ debian/owncloud/usr/share/owncloud/core/vendor/jquery/jquery-migrate.min.js \
+ debian/owncloud/usr/share/owncloud/core/vendor/jquery/jquery-migrate.js
# Fix displayed version
sed -i "s/@VERSION@/$(VERSION) (Debian)/" \
diff --git a/debian/viewer.css b/debian/viewer.css
deleted file mode 100644
index 6ae37b3..0000000
--- a/debian/viewer.css
+++ /dev/null
@@ -1,5 +0,0 @@
- at import url("viewer.orig.css");
-html[dir='ltr'] #toolbarViewerRight,
-html[dir='rtl'] #toolbarViewerLeft {
- right: 25px;
-}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git
More information about the Pkg-owncloud-commits
mailing list