[Pkg-owncloud-commits] [SCM] owncloud-client.git branch, master, updated. upstream/1.2.5+dfsg-109-g66b7ca5

Sat Jun 15 01:39:01 UTC 2013

The following commit has been merged in the master branch:
commit 4382f2f92a958584ba0fa980cb377ea64935553a
Author: Sandro Knauß <bugs at sandroknauss.de>
Date:   Sat Jun 15 00:50:43 2013 +0200

    update debian/copyright

diff --git a/debian/copyright b/debian/copyright
index ed2e4b6..fd20f36 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,21 +6,63 @@ Source: http://owncloud.org/sync-clients/
 Files: *
 Copyright: 2011 Duncan Mac-Vicar P. <duncan at kde.org>
            2011-2012 Klaas Freitag <freitag at owncloud.com>
+           Daniel Molkentin <danimo at owncloud.com>
+           Markus Goetz <markus at woboq.com>
+           Thomas Mueller <thomas.mueller at tmit.eu>
 License: GPL-2+
 
 Files: debian/*
 Copyright: 2012 Sandro Knauß <bugs at sandroknauss.de>
 License: GPL-2+
 
-Files: src/3rdparty/qtlockedfile/*
-       src/3rdparty/qtsingleapplication/*
-Copyright: 2012 Nokia Corporation and/or its subsidiary(-ies).
-License: LGPL and Nokia-LGPL-Exception
+Files: src/mirall/inotify.*
+Copyright: Duncan Mac-Vicar P. <duncan at kde.org>
+           Ashish Shukla
+License: GPL-2+
+
+Files: src/mirall/fileitemdialog.*
+       src/mirall/credentialstore.*
+       src/mirall/utility.*
+Copyright: Klaas Freitag <freitag at owncloud.com>
+License: GPL-2
 
 Files: src/mirall/fileutils.cpp
 Copyright: 2009 John Schember <john at nachtimwald.com>
            Duncan Mac-Vicar P. <duncan at kde.org>
-License: GPL-2+ and BSD
+License: GPL-2+ and MIT
+
+Files: src/3rdparty/qtlockedfile/*
+       src/3rdparty/qtsingleapplication/*
+Copyright: 2012 Nokia Corporation and/or its subsidiary(-ies).
+License: LGPL-2.1, Nokia-LGPL-Exception
+
+Files: doc/*
+Copyright: 2012 The ownCloud developers
+License: CC-BY-3.0
+
+Files: doc/scripts/*
+Copyright: José Fonseca <jrfonseca at users.berlios.de>
+License: LGPL-2
+
+Files: test/testdanimostinkt.h
+Copyright: Klaas Freitag <freitag at owncloud.com>
+License: public-domain
+
+Files: cmake/modules/GNUInstallDirs.cmake
+Copyright: 2011 Nikita Krupen'ko <krnekit at gmail.com>
+           2011 Kitware, Inc.
+License: BSD-3-clause-Kitware
+
+Files: cmake/modules/AddAppIconMacro.cmake
+Copyright:  2006-2009 Alexander Neundorf, <neundorf at kde.org>
+            2006, 2007, Laurent Montel, <montel at kde.org>
+            2007 Matthias Kretz <kretz at kde.org>
+License: BSD-3-clause
+
+Files: cmake/modules/GetGitRevisionDescription.*
+Copyright: 2009-2010 Ryan Pavlik <rpavlik at iastate.edu> <abiryan at ryand.net>
+           2009-2010 Iowa State University
+License: BSL-1.0
 
 License: GPL-2+
  This program is free software; you can redistribute it and/or
@@ -40,7 +82,7 @@ License: GPL-2+
  On Debian systems a full copy of the GPL 2 can be found at
  /usr/share/common-licenses/GPL-2
 
-License: LGPL
+License: LGPL-2.1
  GNU Lesser General Public License Usage
  .
  This file may be used under the terms of the GNU Lesser General Public
@@ -55,11 +97,30 @@ License: LGPL
  .
 
 License: Nokia-LGPL-Exception
- In addition, as a special exception, Nokia gives you certain additional
- rights. These rights are described in the Nokia Qt LGPL Exception
- version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+ Digia Qt LGPL Exception version 1.1
+ .
+ As an additional permission to the GNU Lesser General Public License version
+ 2.1, the object code form of a "work that uses the Library" may incorporate
+ material from a header file that is part of the Library.  You may distribute
+ such object code under terms of your choice, provided that:
+    (i)   the header files of the Library have not been modified; and 
+    (ii)  the incorporated material is limited to numerical parameters, data
+          structure layouts, accessors, macros, inline functions and
+          templates; and
+    (iii) you comply with the terms of Section 6 of the GNU Lesser General
+          Public License version 2.1.
+ .
+ Moreover, you may apply this exception to a modified version of the Library,
+ provided that such modification does not involve copying material from the
+ Library into the modified Library's header files unless such material is
+ limited to (i) numerical parameters; (ii) data structure layouts;
+ (iii) accessors; and (iv) small macros, templates and inline functions of
+ five lines or less in length.
+ .
+ Furthermore, you are not required to apply this additional permission to a
+ modified version of the Library.
 
-License: BSD
+License: MIT
  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
@@ -78,20 +139,11 @@ License: BSD
  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  THE SOFTWARE
 
-Files: test/testdanimostinkt.h
-Copyright: Klaas Freitag <freitag at owncloud.com>
 License: public-domain
  This software is in the public domain, furnished "as is", without technical
  support, and with no warranty, express or implied, as to its usefulness for
  any purpose.
 
-Files: src/mirall/fileitemdialog.cpp
-       src/mirall/credentialstore.cpp
-       src/mirall/fileitemdialog.h
-       src/mirall/utility.cpp
-       src/mirall/utility.h
-       src/mirall/credentialstore.h
-Copyright: Klaas Freitag <freitag at owncloud.com>
 License: GPL-2
  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
@@ -105,19 +157,33 @@ License: GPL-2
  On Debian systems a full copy of the GPL 2 can be found at
  /usr/share/common-licenses/GPL-2
 
-Files: doc/*
-Copyright: 2012 The ownCloud developers
-License: LGPL
- The HTML Help Project has licensed its software under LGPLv3 terms.
+License: CC-BY-3.0
+ Creative Commons Legal Code
  .
- On Debian systems a full copy of the LGPL 3 can be found at
- /usr/share/common-licenses/LGPL-3
+ Attribution 3.0 Unported
+ .
+ CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
+ LEGAL SERVICES. DISTRIBUTION OF THIS LICENSE DOES NOT CREATE AN
+ ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
+ INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
+ REGARDING THE INFORMATION PROVIDED, AND DISCLAIMS LIABILITY FOR
+ DAMAGES RESULTING FROM ITS USE.
+ .
+ License
+ .
+ THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE
+ COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY
+ COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS
+ AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
+ .
+ BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE
+ TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY
+ BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS
+ CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND
+ CONDITIONS.
 
-Files: cmake/modules/AddAppIconMacro.cmake
-Copyright:  2006-2009 Alexander Neundorf, <neundorf at kde.org>
-            2006, 2007, Laurent Montel, <montel at kde.org>
-            2007 Matthias Kretz <kretz at kde.org>
-License: BSD-3-Clause
+
+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:
@@ -141,10 +207,7 @@ License: BSD-3-Clause
  (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: cmake/modules/GNUInstallDirs.cmake
-Copyright: 2011 Nikita Krupen'ko <krnekit at gmail.com> 
-           2011 Kitware, Inc.
-License: BSD-3-clause
+License: BSD-3-clause-Kitware
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions are
  met:
@@ -171,3 +234,30 @@ License: BSD-3-clause
  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: BSL-1.0
+ Boost Software License - Version 1.0 - August 17th, 2003
+ .
+ Permission is hereby granted, free of charge, to any person or organization
+ obtaining a copy of the software and accompanying documentation covered by
+ this license (the "Software") to use, reproduce, display, distribute,
+ execute, and transmit the Software, and to prepare derivative works of the
+ Software, and to permit third-parties to whom the Software is furnished to
+ do so, all subject to the following:
+ .
+ The copyright notices in the Software and this entire statement, including
+ the above license grant, this restriction and the following disclaimer,
+ must be included in all copies of the Software, in whole or in part, and
+ all derivative works of the Software, unless such copies or derivative
+ works are solely in the form of machine-executable object code generated by
+ a source language processor.
+ .
+ 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, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+ SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+ FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+ ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ DEALINGS IN THE SOFTWARE.
+
+

-- 
owncloud-client.git

