[Pkg-owncloud-commits] [owncloud] 14/17: Reorder copyright

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 7f0e240fbedb60a1221fdc3e73d6676821782b33
Author: David Prévot <taffit at debian.org>
Date:   Thu Mar 12 16:55:52 2015 -0400

    Reorder copyright
    
    Git-Dch: Ignore
---
 debian/copyright | 86 ++++++++++++++++++++++++++++----------------------------
 1 file changed, 43 insertions(+), 43 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 86af0e7..da2f2f7 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -67,21 +67,6 @@ Copyright: 2010, 2012-2014, Frank Karlitschek <frank at owncloud.org>
            2014, Clark Tomlinson <clark at owncloud.com>
 License: AGPL-3+
 
-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>
-           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>
-           2007-2011, the Sphinx team
-License: BSD-2-clause
-
-Files: 3rdparty/mcnetic/*
-Copyright: 2013-2014, Nicolai Ehemann <en at enlightened.de>
-License: GPL-3+
-
 Files: 3rdparty/phpmailer/*
 Copyright: 2010-2012, Jim Jagielski
            2004-2009, Andy Prevost
@@ -89,10 +74,6 @@ Copyright: 2010-2012, Jim Jagielski
            2002-2004, Duke University
 License: LGPL-2.1+
 
-Files: 3rdparty/phpmailer/phpmailer/examples/*
-Copyright: 2010, 2012-2014, Marcus Bointon
-License: LGPL-3+
-
 Files: 3rdparty/james-heinrich/getid3/*
        3rdparty/phpmailer/phpmailer/extras/class.html2text.php
        debian/*
@@ -101,6 +82,10 @@ Copyright: 2001-2009, James Heinrich <info at getid3.org>
            2011, Thomas Müller <thomas.mueller at tmit.eu>
 License: GPL-2+
 
+Files: 3rdparty/phpmailer/phpmailer/examples/*
+Copyright: 2010, 2012-2014, Marcus Bointon
+License: LGPL-3+
+
 Files: 3rdparty/phpmailer/phpmailer/extras/ntlm_sasl_client.php
 Copyright: Manuel Lemos
 License: BSD-3-clause
@@ -121,8 +106,8 @@ Copyright: 2007-2015 fruux GmbH (https://fruux.com/)
            2012, entreCables S.L.
 License: BSD-3-clause-SabreDAV
 
-Files: 3rdparty/sabre/dav/bin/googlecode_upload.py
-       3rdparty/rackspace/php-opencloud/*
+Files: 3rdparty/rackspace/php-opencloud/*
+       3rdparty/sabre/dav/bin/googlecode_upload.py
        apps/files_external/3rdparty/aws-sdk-php/*
        apps/files_external/3rdparty/google-api-php-client/*
        apps/files_pdfviewer/vendor/pdfjs/*
@@ -145,13 +130,13 @@ 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/*
-       3rdparty/composer/*
+Files: 3rdparty/composer/*
        3rdparty/doctrine/*
        3rdparty/guzzle/*
        3rdparty/kriswallsmith/*
        3rdparty/phpmailer/phpmailer/examples/scripts/XRegExp.js
        3rdparty/phpseclib/phpseclib/*
+       3rdparty/pimple/*
        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
@@ -179,8 +164,7 @@ Files: 3rdparty/pimple/*
        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>
+Copyright: 2011, Nils Adermann <naderman at naderman.de>
            2011, Jordi Boggiano <j.boggiano at seld.be>
            2006-2014, Doctrine Project
            2013, Dave Gandy <dave at davegandy.com>
@@ -195,6 +179,7 @@ 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>
+           2004-2014, Fabien Potencier <fabien at symfony.com>
            2011-2013, Fabien Cazenave, Mozilla
            2011, Irakli Gozalishvili
            2013, Brandon Aaron
@@ -211,24 +196,6 @@ Copyright: 2004-2014, Fabien Potencier <fabien at symfony.com>
            2012, Dropbox, Inc.
 License: Expat
 
-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
-       apps/user_ldap/vendor/ui-multiselect/*
-Copyright: 2010-2011, Francois Gelinas
-           2012, Mathias Bynens
-           2012, Eric Hynds
-License: Expat or GPL-2+
-
-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/doctrine/dbal/lib/Doctrine/DBAL/Driver/SQLSrv/SQLSrvConnection.php
        3rdparty/doctrine/dbal/lib/Doctrine/DBAL/Platforms/DB2Platform.php
 Copyright: 2006-2012, Doctrine Project
@@ -271,6 +238,34 @@ Files: 3rdparty/guzzle/http/Guzzle/Http/Resources/cacert.pem
 Copyright: 2012, Mozilla Foundation
 License: MPL-2.0
 
+Files: 3rdparty/mcnetic/*
+Copyright: 2013-2014, Nicolai Ehemann <en at enlightened.de>
+License: GPL-3+
+
+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: 3rdparty/pear/*
+       3rdparty/PEAR*
+       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>
+           2007-2011, the Sphinx team
+License: BSD-2-clause
+
+Files: apps/files/js/jquery-visibility.js
+       apps/user_ldap/vendor/ui-multiselect/*
+Copyright: 2010-2011, Francois Gelinas
+           2012, Mathias Bynens
+           2012, Eric Hynds
+License: Expat or GPL-2+
+
 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+
@@ -298,6 +293,11 @@ Files: core/js/tests/lib/sinon-1.7.3.js
 Copyright: 2010-2013, Christian Johansen <christian at cjohansen.no>
 License: BSD-3-clause-Christian_Johansen
 
+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
+
 License: AGPL-3+
                      GNU AFFERO GENERAL PUBLIC LICENSE
                         Version 3, 19 November 2007

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