[Pkg-owncloud-commits] [SCM] owncloud.git branch, master, updated. upstream/4.0.0debian-131-g7e866bb
Paul van Tilburg
paulvt at debian.org
Thu May 24 20:44:16 UTC 2012
The following commit has been merged in the master branch:
commit 7e866bbac90cc7d9fad800398f6e7cd7e245f897
Author: Paul van Tilburg <paulvt at debian.org>
Date: Thu May 24 22:44:11 2012 +0200
Reordered and tweaked some paragraphs; trimmed trailing spaces
diff --git a/debian/copyright b/debian/copyright
index 8c77021..f724873 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -31,14 +31,14 @@ Files: 3rdparty/Crypt_Blowfish/*
Copyright: 2005, Matthew Fonda <mfonda at php.net>
License: PHP-3
-Files: 3rdparty/MDB2.php
- 3rdparty/MDB2/*
+Files: 3rdparty/MDB2/*
+ 3rdparty/MDB2.php
Copyright: 1998-2008, Manuel Lemos
1998-2008, Tomas V.V.Cox
1998-2008, Stig. S. Bakken
1998-2008, Lukas Smith
1998-2008, Igor Feghali
-License: BSD-3-clause
+License: BSD-3-clause-MDB2
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:
@@ -72,16 +72,16 @@ Copyright: 1997-2009, Stig Bakken <ssb at php.net>
1997-2009, Gregory Beaver <cellog at php.net>
License: BSD-2-clause
-Files: 3rdparty/PEAR*.php
- 3rdparty/PEAR/*
+Files: 3rdparty/PEAR/*
+ 3rdparty/PEAR*.php
Copyright: 1997-2010, Sterling Hughes <sterling at php.net>
1997-2010, Stig Bakken <ssb at php.net>
1997-2010, Tomas V.V.Cox <cox at idecnet.com>
1997-2010, Greg Beaver <cellog at php.net>
License: BSD-2-clause
-Files: 3rdparty/Sabre.includes.php
- 3rdparty/Sabre/*
+Files: 3rdparty/Sabre/*
+ 3rdparty/Sabre.includes.php
Copyright: 2007-2012, Rooftop Solutions
License: BSD-3-clause-SabreDAV
@@ -118,8 +118,15 @@ License: BSD-3-clause
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-Files: 3rdparty/js/chosen*
- 3rdparty/css/chosen*
+Files: 3rdparty/class.phpmailer.php
+ 3rdparty/class.smtp.php
+Copyright: 2010-2011, Jim Jagielski
+ 2004-2009, Andy Prevost
+ 2001-2003, Brent R. Matzelle
+License: LGPL-3
+
+Files: 3rdparty/css/chosen*
+ 3rdparty/js/chosen*
Copyright: 2011, Harvest <info at getharvest.com>
License: Expat
Comment: Expat license referred to as MIT license.
@@ -130,23 +137,6 @@ Copyright: 2009, Adam Shaw
License: Expat or GPL-2
Comment: Expat license referred to as MIT license.
-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>
-License: Expat
-Comment: Expat license referred to as MIT license.
-
-Files: 3rdparty/class.phpmailer.php
- 3rdparty/class.smtp.php
-Copyright: 2010-2011, Jim Jagielski
- 2004-2009, Andy Prevost
- 2001-2003, Brent R. Matzelle
-License: LGPL-3
-
Files: 3rdparty/getid3/*
Copyright: 2001-2009, James Heinrich <info at getid3.org>
License: GPL-2+
@@ -164,10 +154,10 @@ License: MIT
to deal in the Software without restriction, including without limitation
the rights to use, copy, modify, merge, publish, distribute, sublicense,
and/or sell copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following conditions:
+ Software is furnished to do so, subject to the following conditions:
.
The above copyright notice and this permission notice shall be included in
- all copies or substantial portions of the Software.
+ all copies or substantial portions of the Software.
.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
@@ -180,7 +170,7 @@ License: MIT
Except as contained in this notice, the name of Rackspace US, Inc. shall
not be used in advertising or otherwise to promote the sale, use or other
dealings in this Software without prior written authorization from
- Rackspace US, Inc.
+ Rackspace US, Inc.
Files: 3rdparty/phpass/*
Copyright: 2004-2006, Solar Designer <solar at openwall.com>
@@ -193,6 +183,16 @@ Copyright: 2003-2012, Marcus Baker <marcus at lastcraft.com>
License: LGPL-2.1
Comment: Copyright found on http://simpletest.org/api/.
+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>
+License: Expat
+Comment: Expat license referred to as MIT license.
+
Files: apps/calendar/img/*
Copyright: 2010, The Noun Project
License: CC-BY-3
@@ -212,17 +212,18 @@ Copyright: 2010, Sebastian Tschan
License: Expat
Comment: Expat license referred to as MIT license.
-Files: apps/files_imageviewer/js/jquery.fancybox-1.3.4.pack.js
+Files: apps/files_imageviewer/js/jquery.fancybox-1.3.4*js
Copyright: 2008-2010, Janis Skarnelis
License: Expat or GPL-2
Comment: Expat license referred to as MIT license.
-Files: apps/files_imageviewer/js/jquery.mousewheel-3.0.4.pack.js
+Files: apps/files_imageviewer/js/jquery.mousewheel-3.0.4*.js
Copyright: 2010, Brandon Aaron
License: Expat
Comment: Expat license referred to as MIT license.
-Files: apps/files_odfviewer/js/webodf*.js
+Files: apps/files_odfviewer/css/webodf.css
+ apps/files_odfviewer/js/webodf*.js
apps/files_odfviewer/src/webodf/*
Copyright: 2011, KO GmbH
License: AGPL-3+ with HTML-reference exception
@@ -232,26 +233,26 @@ License: AGPL-3+ with HTML-reference exception
version 3 of the License, or (at your option) any later version. The code
is distributed WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU AGPL for
- more details.
+ more details.
.
As additional permission under GNU AGPL version 3 section 7, you may
distribute non-source (e.g., minimized or compacted) forms of that code
without the copy of the GNU GPL normally required by section 4, provided
you include this license notice and a URL through which recipients can
- access the Corresponding Source.
+ access the Corresponding Source.
.
As a special exception to the AGPL, any HTML file which merely makes
function calls to this code, and for that purpose includes it by reference
shall be deemed a separate work for copyright law purposes. In addition,
the copyright holders of this code give you permission to combine this
- code with free software libraries that are released under the GNU LGPL.
+ code with free software libraries that are released under the GNU LGPL.
You may copy and distribute such a system following the terms of the GNU
AGPL for this code and the LGPL for the libraries. If you modify this
code, you may extend this exception to your version of the code, but you
are not obligated to do so. If you do not wish to do so, delete this
- exception statement from your version.
+ exception statement from your version.
.
- This license applies to this entire compilation.
+ This license applies to this entire compilation.
Files: apps/files_pdfviewer/js/pdfjs/*
Copyright: 2011, Mozilla Foundation
@@ -1177,11 +1178,11 @@ License: LGPL-2.1
License: LGPL-3
Distributed under the Lesser General Public License (LGPL)
- http://www.gnu.org/copyleft/lesser.html
+ http://www.gnu.org/copyleft/lesser.html
.
This program is distributed in the hope that it will be useful - WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE.
+ FITNESS FOR A PARTICULAR PURPOSE.
.
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'.
--
owncloud.git
More information about the Pkg-owncloud-commits
mailing list