[Pkg-owncloud-commits] [SCM] owncloud.git branch, master, updated. upstream/4.0.0-rc-48-gd5156d9
Paul van Tilburg
paulvt at debian.org
Tue May 15 14:36:56 UTC 2012
The following commit has been merged in the master branch:
commit d5156d92a4558b93b1274297b33a5854e67e2056
Author: Paul van Tilburg <paulvt at debian.org>
Date: Tue May 15 16:36:52 2012 +0200
debian/copyright: updated for new upstream release.
diff --git a/debian/TODO b/debian/TODO
index 8427c4d..8627872 100644
--- a/debian/TODO
+++ b/debian/TODO
@@ -17,4 +17,3 @@ AFTER OC4 UPDATE:
* Debian has jquery 1.7.1 - OC ships 1.7.2, will it work?
* lintian reported some new license files
* lintian is complaining about some php-libs
-* files have been added/removed, update debian/copyright
diff --git a/debian/changelog b/debian/changelog
index d5d49eb..4dec823 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,10 @@
-owncloud (4.0.0-1) unstable; urgency=low
+owncloud (4.0.0-1) UNRELEASED; urgency=low
[ Thomas Mueller ]
* New upstream release 4.0.0-rc as of May 14th.
[ Paul van Tilburg ]
+ * debian/copyright: updated for new upstream release.
-- Thomas Mueller <thomas.mueller at tmit.eu> Tue, 15 May 2012 00:42:12 +0200
diff --git a/debian/copyright b/debian/copyright
index 851f79e..b80e02d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -10,22 +10,22 @@ Copyright: 2010-2011, Frank Karlitschek <karlitschek at kde.org>
2010-2011, Jan-Christoph Borchardt
2010-2011, Michael Gapczynski
2010-2011, Arthur Schiwon
-License: AGPL
+License: AGPL-3+
-Files: 3rdparty/Console/*
- 3rdparty/PEAR/*
-Copyright: 1997-2003, The PHP Group
-License: PHP-3.0
+Files: 3rdparty/Archive/Tar.php
+Copyright: 1997-2010, Vincent Blavet <vincent at phpconcept.net>
+License: BSD-2-clause
-Files: 3rdparty/XML/*
-Copyright: 1997-2004, The PHP Group
-License: PHP-3.0
+Files: 3rdparty/Console/Getopt.php
+Copyright: 1997-2003, The PHP Group
+License: PHP-3
Files: 3rdparty/Crypt_Blowfish/*
Copyright: 2005, Matthew Fonda <mfonda at php.net>
-License: PHP-3.0
+License: PHP-3
-Files: 3rdparty/MDB2*
+Files: 3rdparty/MDB2.php
+ 3rdparty/MDB2/*
Copyright: 1998-2008, Manuel Lemos
1998-2008, Tomas V.V.Cox
1998-2008, Stig. S. Bakken
@@ -36,17 +36,17 @@ License: BSD-3-clause
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 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.
+ * 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 Manuel Lemos, Tomas V.V.Cox, Stig. S. Bakken, Lukas
- Smith nor the names of his contributors may be used to endorse or promote
- products derived from this software without specific prior written
- permission.
+ * Neither the name of Manuel Lemos, Tomas V.V.Cox, Stig. S. Bakken, Lukas
+ Smith nor the names of his 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,
@@ -60,12 +60,57 @@ 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/Sabre/*
- lib/connector/sabre/*
-Copyright: 2007-2011, Rooftop Solutions
- 2007-2009, FileMobile inc.
+Files: 3rdparty/OS/Guess.php
+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/*
+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/*
+Copyright: 2007-2012, Rooftop Solutions
License: BSD-3-clause-SabreDAV
+Files: 3rdparty/System.php
+Copyright: 1997-2009, Tomas V.V.Cox <cox at idecnet.com>
+License: BSD-2-clause
+
+Files: 3rdparty/XML/*
+Copyright: 2002-2008, The PHP Group
+License: BSD-3-clause
+ 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.
+ .
+ * The name of the author may not be used to endorse or promote products
+ derived from this software without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
Files: 3rdparty/js/chosen*
3rdparty/css/chosen*
Copyright: 2011, Harvest <info at getharvest.com>
@@ -88,15 +133,75 @@ 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+
+
+Files: 3rdparty/php-cloudfiles/*
+Copyright: 2008, Rackspace US, Inc.
+License: MIT
+ Unless otherwise noted, all files are released under the MIT license,
+ exceptions contain licensing information in them.
+ .
+ Copyright (C) 2008 Rackspace US, Inc.
+ .
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of this software and associated documentation files (the "Software"),
+ 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:
+ .
+ The above copyright notice and this permission notice shall be included in
+ 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,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ DEALINGS IN THE SOFTWARE.
+ .
+ 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.
+
+Files: 3rdparty/phpass/*
+Copyright: 2004-2006, Solar Designer <solar at openwall.com>
+License: public-domain
+
+Files: 3rdparty/simpletest/*
+Copyright: 2003-2012, Marcus Baker <marcus at lastcraft.com>
+License: LGPL-2.1
+Comment: Copyright found on http://simpletest.org/api/.
+
Files: apps/calendar/img/*
Copyright: 2010, The Noun Project
-License: CC-BY-3.0
+License: CC-BY-3
-Files: apps/contacts/js/*jquery.inview*
+Files: apps/contacts/js/jquery.Jcrop*.js
+Copyright: 2008-2012, Tapmodo Interactive LLC
+License: Expat
+
+Files: apps/contacts/js/jquery.inview*
Copyright: Christopher Blum
-License: AGPL
-Comment: originally under CC-NC-SA-2.0 but conditions waived by author and
- now falls under AGPL (see apps/contacts/js/jquery.inview.txt).
+License: AGPL-3+
+Comment: originally under CC-NC-SA-2 but conditions waived by author and
+ now falls under AGPL-3+ (see apps/contacts/js/jquery.inview.txt).
+
+Files: apps/files/js/jquery.*.js
+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
Copyright: 2008-2010, Janis Skarnelis
@@ -108,6 +213,37 @@ Copyright: 2010, Brandon Aaron
License: Expat
Comment: Expat license referred to as MIT license
+Files: apps/files_odfviewer/js/webodf.js
+ apps/files_odfviewer/src/webodf/*
+Copyright: 2011, KO GmbH
+License: AGPL-3+ with HTML-reference exception
+ The JavaScript code in this page is free software: you can redistribute
+ it and/or modify it under the terms of the GNU Affero General Public
+ License (GNU AGPL) as published by the Free Software Foundation, either
+ 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.
+ .
+ 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.
+ .
+ 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.
+ 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.
+ .
+ This license applies to this entire compilation.
+
Files: apps/files_pdfviewer/js/pdfjs/*
Copyright: 2011, Mozilla Foundation
License: Expat
@@ -115,11 +251,7 @@ Comment: Expat license referred to as MIT license
Files: apps/files_texteditor/js/aceeditor/*
Copyright: 2010, Initial Developer, Ajax.org B.V.
-License: MPL-1.1 or GPL-2+ or LGPL-2.1+
-
-Files: apps/media/getID3/*
-Copyright: 2001-2009, James Heinrich <info at getid3.org>
-License: GPL-2+
+License: MPL-1.1 or GPL-2+ or LGPL-3
Files: apps/media/js/jQuery.jPlayer.2.1.0.source/*
apps/media/js/jquery.jplayer.min.js
@@ -133,7 +265,7 @@ Copyright: 2007-2011, Rooftop Solutions
License: BSD-3-clause-SabreDAV
Files: apps/user_openid/class.openid.v3.php
-Copyright: ?
+Copyright: TODO
License: GPL-3
Files: apps/user_openid/phpmyid.php
@@ -203,9 +335,9 @@ License: GPL-2+
Files: settings/img/log*
Copyright: 2010, The Noun Project
-License: CC-BY-3.0
+License: CC-BY-3
-License: AGPL
+License: AGPL-3+
GNU AFFERO GENERAL PUBLIC LICENSE
Version 3, 19 November 2007
.
@@ -868,6 +1000,29 @@ License: AGPL
For more information on this, and how to apply and follow the GNU AGPL, see
<http://www.gnu.org/licenses/>.
+License: BSD-2-clause
+ 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.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
License: BSD-3-clause-SabreDAV
Redistribution and use in source and binary forms, with or without modification,
are permitted provided that the following conditions are met:
@@ -895,7 +1050,7 @@ 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: CC-BY-3.0
+License: CC-BY-3
You are free:
.
* to Share — to copy, distribute and transmit the work
@@ -931,7 +1086,7 @@ License: CC-BY-3.0
this web page.
.
For the full legal code of the license see:
- http://creativecommons.org/licenses/by/3.0/legalcode
+ http://creativecommons.org/licenses/by/3/legalcode
License: Expat
Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -1004,23 +1159,16 @@ 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+
- This library is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as published by
- the Free Software Foundation, version 2.1 of the License, or (at your
- opinion) any later version.
- .
- This library is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
- License for more details.
+License: LGPL-3
+ Distributed under the Lesser General Public License (LGPL)
+ http://www.gnu.org/copyleft/lesser.html
.
- You should have received a copy of the GNU Lesser General Public License
- along with this library; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ 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.
.
- On Debian systems, the full text of the GNU General Public License version
- 2 can be found in the file `/usr/share/common-licenses/LGPL-1.2'.
+ 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
The contents of this file are subject to the Mozilla Public License Version
@@ -1033,7 +1181,7 @@ License: MPL-1.1
for the specific language governing rights and limitations under the
License.
-License: PHP-3.0
+License: PHP-3
Redistribution and use in source and binary forms, with or without
modification, is permitted provided that the following conditions are met:
.
--
owncloud.git
More information about the Pkg-owncloud-commits
mailing list