[Pkg-owncloud-commits] [SCM] owncloud.git branch, master, updated. upstream/3.0.3-28-gf762f55

Wed May 9 17:54:08 UTC 2012

The following commit has been merged in the master branch:
commit d17b5159f0ba3b133e4fd2897ee49a84b5956d64
Author: Paul van Tilburg <paulvt at debian.org>
Date:   Wed May 9 19:52:14 2012 +0200

    debian/copyright: fixed typos

diff --git a/debian/copyright b/debian/copyright
index f41fbd6..ca34053 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -63,54 +63,29 @@ License: BSD-3-clause
 Files: 3rdparty/Sabre/*
 Copyright: 2007-2011, Rooftop Solutions
            2007-2009, FileMobile inc.
-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.
- .
- * Neither the name of the SabreDAV 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 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
 
 Files: 3rdparty/js/chosen*
        3rdparty/css/chosen*
 Copyright: 2011, Harvest <info at getharvest.com>
 License: Expat
-Comment: Expat license refered to as MIT license
+Comment: Expat license referred to as MIT license
 
 Files: 3rdparty/fullcalendar/*
 Copyright: 2009, Adam Shaw
            2011, Adam Shaw
 License: Expat or GPL-2
-Comment: Expat license refered to as MIT license
+Comment: Expat license referred to as MIT license
 
 Files: 3rdparty/timepicker/*
 Copyright: 2010-2011, Francois Gelinas
 License: Expat or GPL-2
-Comment: Expat license refered to as MIT license
+Comment: Expat license referred to as MIT license
 
 Files: 3rdparty/when/*
 Copyright: 2010, Tomhas Planer <tplaner at gmail.com>
 License: Expat
-Comment: Expat license refered to as MIT license
+Comment: Expat license referred to as MIT license
 
 Files: apps/calendar/img/*
 Copyright: 2010, The Noun Project
@@ -125,17 +100,17 @@ Comment: originally under CC-NC-SA-2.0 but conditions waived by author and
 Files: apps/files_imageviewer/js/jquery.fancybox-1.3.4.pack.js
 Copyright: 2008-2010, Janis Skarnelis
 License: Expat or GPL-2
-Comment: Expat license refered to as MIT license
+Comment: Expat license referred to as MIT license
 
 Files: apps/files_imageviewer/js/jquery.mousewheel-3.0.4.pack.js
 Copyright: 2010, Brandon Aaron
 License: Expat
-Comment: Expat license refered to as MIT license
+Comment: Expat license referred to as MIT license
 
 Files: apps/files_pdfviewer/js/pdfjs/*
 Copyright: 2011, Mozilla Foundation
 License: Expat
-Comment: Expat license refered to as MIT license
+Comment: Expat license referred to as MIT license
 
 Files: apps/files_texteditor/js/aceeditor/*
 Copyright: 2010, Initial Developer, Ajax.org B.V.
@@ -148,23 +123,36 @@ License: GPL-2+
 Files: apps/media/js/jQuery.jPlayer.2.1.0.source/*
 Copyright: 2009-2011, Happyworm Ltd.
 License: Expat or GPL-2
-Comment: Expat license refered to as MIT license
+Comment: Expat license referred to as MIT license
+
+Files: apps/remoteStorage/oauth_ro_auth.php
+Copyright: 2007-2011, Rooftop Solutions
+License: BSD-3-clause-SabreDav
+
+Files: apps/user_openid/class.openid.v3.php
+Copyright: ?
+License: GPL-3
+
+Files: apps/user_openid/phpmyid.php
+Copyright: 2006-2008, CJ Niemira <siege at siege.org>
+License: GPL-3
+Comment: License referred to as GNU Public License, but GPL version 3 is linked
 
 Files: core/js/jquery-*.js
 Copyright: 2005-2011, John Resig, Brandon Aaron & Jörn Zaefferer
 License: Expat or GPL-2
-Comment: Expat license refered to as MIT license
+Comment: Expat license referred to as MIT license
 
 Files: core/js/jquery-showpassword.js
 Copyright: Jan Jarfalk
 License: Expat
-Comment: Expat license refered to as MIT license
+Comment: Expat license referred to as MIT license
 
 Files: core/css/jquery-tipsy.css
        core/js/jquery-typsy.js
 Copyright: 2008-2010, Jason Frame <json at onehackoranother.com>
 License: Expat
-Comment: Expat license refered to as MIT license
+Comment: Expat license referred to as MIT license
 
 Files: core/css/jquery-ui-*.css
        core/js/jquery-ui-*.js
@@ -193,18 +181,18 @@ Copyright: 2011, Paul Bakaus (ui.jquery.com)
                  Richard D. Worth (rdworth.org)
                  Jörn Zaefferer (bassistance.de)
 License: Expat or GPL-2
-Comment: Expat license refered to as MIT license
+Comment: Expat license referred to as MIT license
 
 Files: core/js/jquery.infieldlabel*.js
 Copyright: 2009, Doug Neiner
 License: Expat or GPL-2
-Comment: Expat license refered to as MIT license
+Comment: Expat license referred to as MIT license
 
 Files: core/css/jquery.multiselect.css
        core/js/jquery.multiselect.js
 Copyright: 2011, Eric Hynds
 License: Expat or GPL-2
-Comment: Expat license refered to as MIT license
+Comment: Expat license referred to as MIT license
 
 Files: debian/*
 Copyright: 2011, Thomas Mueller <thomas.mueller at tmit.eu>
@@ -948,8 +936,8 @@ License: GPL-2
  with this package; if not, write to the Free Software Foundation, Inc.,
  51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  .
- On Debian systems, the full text of the GNU General Public License version
- 2 can be found in the file `/usr/share/common-licenses/GPL-2'.
+ On Debian systems, the full text of the GNU General Public License
+ version 2 can be found in the file `/usr/share/common-licenses/GPL-2'.
 
 License: GPL-2+
  This program is free software; you can redistribute it and/or modify it
@@ -966,8 +954,25 @@ License: GPL-2+
  with this package; if not, write to the Free Software Foundation, Inc.,
  51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  .
- On Debian systems, the full text of the GNU General Public License version
- 2 can be found in the file `/usr/share/common-licenses/GPL-2'.
+ On Debian systems, the full text of the GNU General Public License
+ version 2 can be found in the file `/usr/share/common-licenses/GPL-2'.
+
+License: GPL-3
+ This program is free software:  you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by the Free
+ Software Foundation, either version 3 of the License, or (at your option)
+ any later version.
+ .
+ This program 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 General Public License
+ for more details.
+ .
+ You should have received a copy of the GNU General Public License along
+ with this program.  If not, see <http://www.gnu.org/licenses/>.
+ .
+ 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

-- 
owncloud.git

