[Pkg-owncloud-commits] [owncloud] 16/20: Adapt packaging to dropped office fallback

David Prévot taffit at moszumanska.debian.org
Tue Apr 29 17:37:56 UTC 2014


This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit e7554a7855ab5b45f9fc19ce4364b1e5dd6782cc
Author: David Prévot <taffit at debian.org>
Date:   Mon Apr 28 22:40:40 2014 -0400

    Adapt packaging to dropped office fallback
---
 debian/control                  |   3 -
 debian/copyright                | 359 +---------------------------------------
 debian/install                  |   1 -
 debian/links                    |   3 -
 debian/rules                    |   4 -
 debian/source/lintian-overrides |  10 --
 6 files changed, 7 insertions(+), 373 deletions(-)

diff --git a/debian/control b/debian/control
index 940e2f9..fb79e70 100644
--- a/debian/control
+++ b/debian/control
@@ -28,16 +28,13 @@ Depends: apache2 | httpd,
          libjs-jquery-mousewheel,
          libjs-jquery-timepicker,
          libjs-pdf (>= 0.8.1181),
-         libphp-pclzip,
          libphp-phpmailer,
          mediawiki-classes | mediawiki (>= 1:1.19),
          owncloud-doc,
          php-doctrine-common,
-         php-dompdf,
          php-getid3 (>= 1.9.5~),
          php-patchwork-utf8,
          php-pear,
-         php-phpdocx,
          php-sabre-dav (<< 1.8),
          php-sabre-vobject (<< 3),
          php-symfony-console,
diff --git a/debian/copyright b/debian/copyright
index fb61362..d3fc621 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -42,53 +42,14 @@ License: AGPL-3+
 
 Files: 3rdparty/class.phpmailer.php
        3rdparty/class.smtp.php
-       3rdparty/phpdocx/*
 Copyright: 2010-2012, Jim Jagielski
            2004-2009, Andy Prevost
            2001-2003, Brent R. Matzelle
-           2009-2013, Narcea Producciones Multimedia S.L.
 License: LGPL-3
 
-Files: 3rdparty/phpdocx/pdf/*
-Copyright: 2004-2006, Benj Carson <benjcarson at digitaljunkies.ca>
-           Fabien Ménager <fabien.menager at gmail.com>
-           Helmut Tischer <htischer at weihenstephan.org>
-           2008, Orion Richardson <orionr at yahoo.co>
-           Blake Ross <BlakeR1234 at aol.com>
-           Brian Sweeney <eclecticgeek at gmail.com>
-           1998, mozilla.org
-License: LGPL-2.1+ or PHP-3.0+
-
-Files: 3rdparty/phpdocx/pdf/tcpdf/*
-Copyright: 2002-2011, Nicola Asuni - Tecnick.com S.r.l.
-License: LGPL-3+
-
-Files: 3rdparty/phpdocx/pdf/lib/ttf2ufm/*
-       3rdparty/phpdocx/pdf/tcpdf/fonts/utils/src/ttf2ufm-src.tar.gz
-Copyright: 1997-2003, Andrew Weeks <ccsaw at bath.ac.uk>
-           1997-2003, Frank M. Siegert <fms at this.net>
-           1997-2003, Mark Heath <mheath at netspace.net.au>
-           1997-2003, Thomas Henlich <thenlich at rcs.urz.tu-dresden.de>
-           1997-2003, Sergey Babkin <babkin at users.sourceforge.net>, <sab123 at hotmail.com>
-           1997-2003, Turgut Uyar <uyar at cs.itu.edu.tr>
-           1997-2003, Rihardas Hepas <rch at WriteMe.Com>
-           1997-2003, Szalay Tamas <tomek at elender.hu>
-           1997-2003, Johan Vromans <jvromans at squirrel.nl>
-           1997-2003, Petr Titera <P.Titera at sh.cvut.cz>
-           1997-2003, Lei Wang <lwang at amath8.amt.ac.cn>
-           1997-2003, Chen Xiangyang <chenxy at sun.ihep.ac.cn>
-           1997-2003, Zvezdan Petkovic <z.petkovic at computer.org>
-           1997-2003, Rigel <rigel863 at yahoo.com>
-           2001, the TTF2PT1 project
-License: BSD-3-clause-TTF2PT1
-
 Files: 3rdparty/getid3/*
-       3rdparty/phpdocx/pdf/lib/ttf2ufm/src/app/TeX/*
-       3rdparty/phpdocx/pdf/tcpdf/fonts/utils/src/ttf2ufm-src.tar.gz!ttf2ufm-src/app/TeX/*
        debian/*
 Copyright: 2001-2009, James Heinrich <info at getid3.org>
-           2002, SuSE Linux AG, Nuernberg, Germany
-           2002, Mike Fabian <mike.fabian at gmx.de>
            2011, Thomas Müller <thomas.mueller at tmit.eu>
 License: GPL-2+
 
@@ -97,21 +58,12 @@ Files: 3rdparty/Archive/Tar.php
        3rdparty/PEAR/*
        3rdparty/PEAR*.php
        3rdparty/System.php
-       3rdparty/phpdocx/pdf/lib/ttf2ufm/src/scripts/convert*
-       3rdparty/phpdocx/pdf/lib/ttf2ufm/src/scripts/forceiso
-       3rdparty/phpdocx/pdf/lib/ttf2ufm/src/scripts/t1fdir
-       3rdparty/phpdocx/pdf/lib/ttf2ufm/src/scripts/x2gs
-       3rdparty/phpdocx/pdf/tcpdf/fonts/utils/src/ttf2ufm-src.tar.gz!ttf2ufm-src/scripts/convert*
-       3rdparty/phpdocx/pdf/tcpdf/fonts/utils/src/ttf2ufm-src.tar.gz!ttf2ufm-src/scripts/forceiso
-       3rdparty/phpdocx/pdf/tcpdf/fonts/utils/src/ttf2ufm-src.tar.gz!ttf2ufm-src/scripts/t1fdir
-       3rdparty/phpdocx/pdf/tcpdf/fonts/utils/src/ttf2ufm-src.tar.gz!ttf2ufm-src/scripts/x2gs
        core/doc/*/_static/*
 Copyright: 1997-2010, Vincent Blavet <vincent at phpconcept.net>
            1997-2010, Stig Bakken <ssb at php.net>
            1997-2010, Gregory Beaver <cellog at php.net>
            1997-2010, Sterling Hughes <sterling at php.net>
            1997-2010, Tomas V.V.Cox <cox at idecnet.com>
-           1998-2000, Sergey A. Babkin <babkin at users.sourceforge.net>, <sab123 at hotmail.com>, <babkin at bellatlantic.net>
            2007-2011, the Sphinx team
 License: BSD-2-clause
 
@@ -122,7 +74,6 @@ Copyright: 2013, Dave Gandy
 License: CC-BY-3
 
 Files: 3rdparty/mediawiki/*
-       3rdparty/phpdocx/lib/log4php/*
        apps/files_external/3rdparty/aws-sdk-php/*
        apps/files_external/3rdparty/google-api-php-client/*
        apps/files_external/3rdparty/php-opencloud/*
@@ -130,7 +81,6 @@ Files: 3rdparty/mediawiki/*
        apps/files_pdfviewer/templates/pdf.php
        apps/files_texteditor/css/DroidSansMono/*
 Copyright: 2010, Wikimedia Foundation
-           2012, Apache Software Foundation
            2010-2012, Amazon.com, Inc. or its affiliates
            2008, 2010-2012, Google Inc.
            2012-2013, Rackspace US, Inc.
@@ -144,34 +94,19 @@ Copyright: 2005-2011, Regents of the University of California
            2005-2011, Data Intensive Cyberinfrastructure Foundation
 License: BSD-3-clause-UCSD
 
+Files: apps/files_external/3rdparty/irodsphp/prods/doc_config.ini
+Copyright: 2002, Greg Beaver <cellog at php.net>
+License: LGPL-2.1+
+
 Files: apps/files_texteditor/js/vendor/ace/src-noconflict/*
 Copyright: 2010, 2012, 2013 Ajax.org B.V.
            2013, Matthew Christopher Kastor-Inare III, Atropa Inc. Intl
 License: BSD-3-clause-Ajax
 
-Files: 3rdparty/PHPExcel/*
-       3rdparty/dompdf/*
-       apps/files_external/3rdparty/irodsphp/prods/doc_config.ini
-Copyright: 2006-2013, PHPExcel <http://www.codeplex.com/PHPExcel>
-           2002-2003, Xavier Noguer <xnoguer at rezebra.com>
-           2004, Michael Nickerson
-           2009, Vincent Blavet
-           2006-2007, Christian Schmidt
-           Benj Carson <benjcarson at digitaljunkies.ca>
-           Fabien Ménager <fabien.menager at gmail.com>
-           Helmut Tischer <htischer at weihenstephan.org>
-           Orion Richardson <orionr at yahoo.co>
-           Blake Ross <BlakeR1234 at aol.com>
-           Brian Sweeney <eclecticgeek at gmail.com>
-           1998, mozilla.org
-           2002, Greg Beaver <cellog at php.net>
-License: LGPL-2.1+
-
 Files: 3rdparty/Jcrop/*
        3rdparty/Pimple/*
        3rdparty/css/*
        3rdparty/doctrine/*
-       3rdparty/dompdf/lib/html5lib/*
        3rdparty/fontawesome/css/*
        3rdparty/js/chosen/*
        3rdparty/symfony/*
@@ -214,9 +149,6 @@ Copyright: 2008-2013, Tapmodo Interactive LLC
            2004-2013, Fabien Potencier <fabien at symfony.com>
            2011, Harvest <info at getharvest.com>
            2006-2012, Doctrine Project
-           2007, Jeroen van der Meer <http://jero.net/>
-           2008, 2009, Edward Z. Yang <http://htmlpurifier.org/>
-           2009, Geoffrey Sneddon <http://gsnedders.com/>
            2013, Dave Gandy
            2012, Dropbox, Inc.
            2011, 2012, Paul Irish
@@ -262,27 +194,6 @@ Files: 3rdparty/Patchwork/*
 Copyright: 2013, Nicolas Grekas <p at tchwork.com>
 License: Apache-2.0 or GPL-2
 
-Files: 3rdparty/PHPExcel/Classes/PHPExcel/Calculation/Formula*.php
-Copyright: 2006-2013, PHPExcel <http://www.codeplex.com/PHPExcel>
-           2007, E. W. Bachtal, Inc.
-License: LGPL-2.1+ and Expat
-
-Files: 3rdparty/PHPExcel/Classes/PHPExcel/Shared/JAMA/*
-       3rdparty/XML/*
-Copyright: 2005, Paul Meagher
-           2005, Michael Bommarito
-           2005, Lukasz Karapuda
-           2005, Bartek Matosiuk
-           2002-2008, The PHP Group
-License: BSD-3-clause
-Comment: “Changed the licensing from PHP v3.0 to BSD” from
- <http://www.phpmath.com/build02/JAMA/CHANGELOG.TXT>.
-
-Files: 3rdparty/PHPExcel/Classes/PHPExcel/Shared/OLE.php
-       3rdparty/PHPExcel/Classes/PHPExcel/Shared/OLE/PPS*
-Copyright: 1997-2002, The PHP Group
-License: PHP-3.01
-
 Files: 3rdparty/Sabre/*
        lib/private/connector/sabre/quotaplugin.php
        lib/private/connector/sabre/server.php
@@ -320,42 +231,9 @@ Files: 3rdparty/phpass/*
 Copyright: 2004-2006, Solar Designer <solar at openwall.com>
 License: public-domain
 
-Files: 3rdparty/dompdf/lib/class.pdf.php
-       3rdparty/phpdocx/pdf/lib/class.pdf.php
-Copyright: Wayne Munro <pdf at ros.co.nz>
-           Orion Richardson <orionr at yahoo.com>
-           Helmut Tischer <htischer at weihenstephan.org>
-           Ryan H. Masten <ryan.masten at gmail.com>
-           Brian Sweeney <eclecticgeek at gmail.com>
-           Fabien Ménager <fabien.menager at gmail.com>
-License: CC-publicdomain
-
-Files: 3rdparty/dompdf/lib/fonts/*.afm
-       3rdparty/phpdocx/pdf/lib/fonts/*.afm
-Copyright: 1985, 1987, 1989-1993, 1997, Adobe Systems Incorporated.
-License: Adobe
-
-Files: 3rdparty/phpdocx/pdf/tcpdf/fonts/zarbold.php
-Copyright: Mohammad Ali Golkar <m.a.golkar at gmail.com>
-License: GPL-2
-
-Files: 3rdparty/phpdocx/pdf/tcpdf/fonts/dejavu*
-Copyright: 2003 Bitstream, Inc.
-License: dejavu
-Comment:
- The original TTF font files have been renamed for compatibility with
- TCPDF and compressed using the gzcompress PHP function that uses the ZLIB
- data format (.z files).
-
-Files: 3rdparty/phpdocx/pdf/tcpdf/fonts/utils/pfm2afm*
-       3rdparty/phpdocx/pdf/tcpdf/fonts/utils/src/pfm2afm-src.tar.gz
-Copyright: 1991, IBM Corp.
-License: IBM
-
-Files: 3rdparty/phpdocx/pdf/lib/ttf2ufm/src/t1asm.c
-       3rdparty/phpdocx/pdf/tcpdf/fonts/utils/src/ttf2ufm-src.tar.gz!ttf2ufm-src/t1asm*
-Copyright: 1992, I. Lee Hetherington
-License: t1asm
+Files: 3rdparty/XML/*
+Copyright: 2002-2008, The PHP Group
+License: BSD-3-clause
 
 Files: apps/contacts/css/placeholder_polyfill.min.css
        apps/contacts/js/placeholder_polyfill.jquery.js
@@ -515,15 +393,6 @@ Files: apps/search_lucene/3rdparty/Zend/*
 Copyright: 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
 License: BSD-3-clause-Zend
 
-License: Adobe
- This file and the 14 PostScript(R) AFM files it accompanies may be used,
- copied, and distributed for any purpose and without charge, with or without
- modification, provided that all copyright notices are retained; that the AFM
- files are not distributed without this file; that all modifications to this
- file or any of the AFM files are prominently noted in the modified file(s);
- and that this paragraph is not modified. Adobe Systems has no responsibility
- or obligation to support the use of the AFM files.
-
 License: AGPL-3+
                      GNU AFFERO GENERAL PUBLIC LICENSE
                         Version 3, 19 November 2007
@@ -1371,32 +1240,6 @@ License: BSD-3-clause-SabreDAV
  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-License: BSD-3-clause-TTF2PT1
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
- 1. Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
- 3. All advertising materials mentioning features or use of this software
-    must display the following acknowledgement:
-      This product includes software developed by the TTF2PT1 Project
-      and its contributors.
- .
- THIS SOFTWARE IS PROVIDED BY THE AUTHORS 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 AUTHORS 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-UCSD
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions are met:
@@ -1769,76 +1612,6 @@ License: CC-BY-3
     this License is not intended to restrict the license of any rights under
     applicable law.
 
-License: CC-publicdomain
- The person or persons who have associated work with this document (the
- "Dedicator" or "Certifier") hereby either (a) certifies that, to the best of
- his knowledge, the work of authorship identified is in the public domain of
- the country from which the work is published, or (b) hereby dedicates whatever
- copyright the dedicators holds in the work of authorship identified below (the
- "Work") to the public domain. A certifier, moreover, dedicates any copyright
- interest he may have in the associated work, and for these purposes, is
- described as a "dedicator" below.
- .
- A certifier has taken reasonable steps to verify the copyright status of this
- work. Certifier recognizes that his good faith efforts may not shield him from
- liability if in fact the work certified is not in the public domain.
- .
- Dedicator makes this dedication for the benefit of the public at large and to
- the detriment of the Dedicator's heirs and successors. Dedicator intends this
- dedication to be an overt act of relinquishment in perpetuity of all present
- and future rights under copyright law, whether vested or contingent, in the
- Work. Dedicator understands that such relinquishment of all rights includes
- the relinquishment of all rights to enforce (by lawsuit or otherwise) those
- copyrights in the Work.
- .
- Dedicator recognizes that, once placed in the public domain, the Work may be
- freely reproduced, distributed, transmitted, used, modified, built upon, or
- otherwise exploited by anyone for any purpose, commercial or non-commercial,
- and in any way, including by methods that have not yet been invented or
- conceived.
-
-License: dejavu
- Permission is hereby granted, free of charge, to any person obtaining a
- copy of the fonts accompanying this license ("Fonts") and associated
- documentation files (the "Font Software"), to reproduce and distribute the
- Font Software, including without limitation the rights to use, copy,
- merge, publish, distribute, and/or sell copies of the Font Software, and
- to permit persons to whom the Font Software is furnished to do so, subject
- to the following conditions:
- .
- The above copyright and trademark notices and this permission notice shall
- be included in all copies of one or more of the Font Software typefaces.
- .
- The Font Software may be modified, altered, or added to, and in particular
- the designs of glyphs or characters in the Fonts may be modified and
- additional glyphs or characters may be added to the Fonts, only if the
- fonts are renamed to names not containing either the words "Bitstream" or
- the word "Vera".
- .
- This License becomes null and void to the extent applicable to Fonts or
- Font Software that has been modified and is distributed under the
- "Bitstream Vera" names.
- .
- The Font Software may be sold as part of a larger software package but no
- copy of one or more of the Font Software typefaces may be sold by itself.
- .
- 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 BITSTREAM
- OR THE GNOME FOUNDATION 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.
- .
- Except as contained in this notice, the names of Gnome, the Gnome
- Foundation, and Bitstream Inc., shall not be used in advertising or
- otherwise to promote the sale, use or other dealings in this Font Software
- without prior written authorization from the Gnome Foundation or Bitstream
- Inc., respectively. For further information, contact: fonts at gnome dot
- org.
-
 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
@@ -1894,11 +1667,6 @@ License: HTML-reference-exception
  .
  This license applies to this entire compilation.
 
-License: IBM
- This code is released for public use as long as the
- copyright remains intact.  This code is provided asis
- without any warrenties, express or implied.
-
 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'.
@@ -1911,10 +1679,6 @@ 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: 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-2.0
  1. Definitions
  --------------
@@ -2372,115 +2136,6 @@ License: OFL
  FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
  OTHER DEALINGS IN THE FONT SOFTWARE.
 
-License: PHP-3.0+
- Redistribution and use in source and binary forms, with or without
- modification, is permitted provided that the following conditions
- are met:
- .
-   1. Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
- .
-   2. Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in
-      the documentation and/or other materials provided with the
-      distribution.
- .
-   3. The name "PHP" must not be used to endorse or promote products
-      derived from this software without prior written permission. For
-      written permission, please contact group at php.net.
- .
-   4. Products derived from this software may not be called "PHP", nor
-      may "PHP" appear in their name, without prior written permission
-      from group at php.net.  You may indicate that your software works in
-      conjunction with PHP by saying "Foo for PHP" instead of calling
-      it "PHP Foo" or "phpfoo"
- .
-   5. The PHP Group may publish revised and/or new versions of the
-      license from time to time. Each version will be given a
-      distinguishing version number.
-      Once covered code has been published under a particular version
-      of the license, you may always continue to use it under the terms
-      of that version. You may also choose to use such covered code
-      under the terms of any subsequent version of the license
-      published by the PHP Group. No one other than the PHP Group has
-      the right to modify the terms applicable to covered code created
-      under this License.
- .
-   6. Redistributions of any form whatsoever must retain the following
-      acknowledgment:
-      "This product includes PHP, freely available from
-      <http://www.php.net/>".
- .
- THIS SOFTWARE IS PROVIDED BY THE PHP DEVELOPMENT TEAM ``AS IS'' AND
- ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE PHP
- DEVELOPMENT TEAM OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- OF THE POSSIBILITY OF SUCH DAMAGE.
-
-License: PHP-3.01
- Redistribution and use in source and binary forms, with or without
- modification, is permitted provided that the following conditions
- are met:
- .
-   1. Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
- .
-   2. Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in
-      the documentation and/or other materials provided with the
-      distribution.
- .
-   3. The name "PHP" must not be used to endorse or promote products
-      derived from this software without prior written permission. For
-      written permission, please contact group at php.net.
- .
-   4. Products derived from this software may not be called "PHP", nor
-      may "PHP" appear in their name, without prior written permission
-      from group at php.net.  You may indicate that your software works in
-      conjunction with PHP by saying "Foo for PHP" instead of calling
-      it "PHP Foo" or "phpfoo"
- .
-   5. The PHP Group may publish revised and/or new versions of the
-      license from time to time. Each version will be given a
-      distinguishing version number.
-      Once covered code has been published under a particular version
-      of the license, you may always continue to use it under the terms
-      of that version. You may also choose to use such covered code
-      under the terms of any subsequent version of the license
-      published by the PHP Group. No one other than the PHP Group has
-      the right to modify the terms applicable to covered code created
-      under this License.
- .
-   6. Redistributions of any form whatsoever must retain the following
-      acknowledgment:
-      "This product includes PHP software, freely available from
-      <http://www.php.net/software/>".
- .
- THIS SOFTWARE IS PROVIDED BY THE PHP DEVELOPMENT TEAM ``AS IS'' AND
- ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE PHP
- DEVELOPMENT TEAM OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- OF THE POSSIBILITY OF SUCH DAMAGE.
-
 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.
-
-License: t1asm
- Permission is hereby granted to use, modify, and distribute this program
- for any purpose provided this copyright notice and the one below remain
- intact.
diff --git a/debian/install b/debian/install
index 865a3f5..735df05 100644
--- a/debian/install
+++ b/debian/install
@@ -9,7 +9,6 @@ settings	usr/share/owncloud
 themes		var/lib/owncloud
 
 # Third party
-3rdparty/PHPExcel/Classes	usr/share/owncloud/3rdparty/PHPExcel
 3rdparty/Pimple			usr/share/owncloud/3rdparty
 3rdparty/doctrine/dbal/lib	usr/share/owncloud/3rdparty/doctrine/dbal
 3rdparty/js/md5/md5.js		usr/share/owncloud/3rdparty/js/md5
diff --git a/debian/links b/debian/links
index 4f07e61..f72418c 100644
--- a/debian/links
+++ b/debian/links
@@ -60,8 +60,5 @@ usr/share/javascript/jquery-timepicker/jquery-ui-timepicker-addon.css	usr/share/
 usr/share/javascript/jquery-timepicker/jquery-ui-timepicker-addon.js	usr/share/owncloud/3rdparty/timepicker/js/jquery.ui.timepicker.js
 usr/share/javascript/jquery-timepicker/localization			usr/share/owncloud/3rdparty/timepicker/js/localization
 
-# Use pclzip.lib.php from the libphp-pclzip package
-usr/share/php/libphp-pclzip/pclzip.lib.php	usr/share/owncloud/3rdparty/PHPExcel/Classes/PHPExcel/Shared/PCLZip/pclzip.lib.php
-
 # Use the PDF from owncloud-doc
 usr/share/owncloud/core/doc/user/ownCloudUserManual.pdf			usr/share/owncloud/core/skeleton/ownCloudUserManual.pdf
diff --git a/debian/rules b/debian/rules
index 9966eaa..9d1aa16 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,7 +13,6 @@ override_dh_install:
 	dh_install
 
 	# Remove redundant license files as it is already captured in debian/copyright.
-	rm debian/owncloud/usr/share/owncloud/3rdparty/PHPExcel/Classes/PHPExcel/Shared/PCLZip/gnu-lgpl.txt
 	rm debian/owncloud/usr/share/owncloud/apps/calendar/3rdparty/fullcalendar/*-LICENSE.txt
 	rm debian/owncloud/usr/share/owncloud/apps/contacts/COPYING-README
 	rm debian/owncloud/usr/share/owncloud/apps/documents/css/fonts/LICENSE_Apache2.txt
@@ -26,9 +25,6 @@ override_dh_install:
 	rm debian/owncloud/usr/share/owncloud/settings/img/log\ Icon\ License
 
 	# Remove other useless documentation
-	rm debian/owncloud/usr/share/owncloud/3rdparty/PHPExcel/Classes/PHPExcel/Chart/Renderer/PHP\ Charting\ Libraries.txt
-	rm debian/owncloud/usr/share/owncloud/3rdparty/PHPExcel/Classes/PHPExcel/Shared/JAMA/CHANGELOG.TXT
-	rm debian/owncloud/usr/share/owncloud/3rdparty/PHPExcel/Classes/PHPExcel/Shared/PCLZip/readme.txt
 	rm debian/owncloud/usr/share/owncloud/apps/activity/TODO
 	rm debian/owncloud/usr/share/owncloud/apps/bookmarks/README.md
 	rm debian/owncloud/usr/share/owncloud/apps/calendar/README.md
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
index 2777b4a..686974e 100644
--- a/debian/source/lintian-overrides
+++ b/debian/source/lintian-overrides
@@ -9,16 +9,6 @@ source-contains-prebuilt-javascript-object apps/documents/js/3rdparty/webodf/doj
 source-contains-prebuilt-javascript-object apps/documents/js/3rdparty/webodf/webodf.js mean line length is about 448 characters
 source-contains-prebuilt-javascript-object apps/documents/js/3rdparty/resources/dojo/dojo.js mean line length is about 505 characters
 source-contains-prebuilt-javascript-object apps/documents/js/3rdparty/webodf/editor/nls/dojobundle.js mean line length is about 418 characters
-# 3rdparty/phpdocx/pdf/lib/ttf2ufm/src/ does contain the source
-source-contains-prebuilt-windows-binary 3rdparty/phpdocx/pdf/lib/ttf2ufm/bin/ttf2ufm.exe
-source-contains-prebuilt-windows-binary 3rdparty/phpdocx/pdf/lib/ttf2ufm/src/ttf2ufm
-# 3rdparty/phpdocx/pdf/tcpdf/fonts/utils/src/ does contain the source
-source-is-missing 3rdparty/phpdocx/pdf/tcpdf/fonts/utils/pfm2afm
-source-is-missing 3rdparty/phpdocx/pdf/tcpdf/fonts/utils/ttf2ufm
-source-contains-prebuilt-windows-binary 3rdparty/phpdocx/pdf/tcpdf/fonts/utils/pfm2afm.exe
-source-contains-prebuilt-binary 3rdparty/phpdocx/pdf/tcpdf/fonts/utils/pfm2afm
-source-contains-prebuilt-windows-binary 3rdparty/phpdocx/pdf/tcpdf/fonts/utils/ttf2ufm.exe
-source-contains-prebuilt-binary 3rdparty/phpdocx/pdf/tcpdf/fonts/utils/ttf2ufm
 # False positives (long lines)
 source-contains-prebuilt-javascript-object apps/files_texteditor/js/vendor/ace/src-noconflict/mode-actionscript.js mean line length is about 535 characters
 source-is-missing apps/files_texteditor/js/vendor/ace/src-noconflict/mode-actionscript.js

-- 
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