[Pkg-owncloud-commits] [SCM] owncloud-client.git branch, master, updated. upstream/1.2.5+debian-95-ga55597d

Tue May 14 02:28:09 UTC 2013

The following commit has been merged in the master branch:
commit f321b3e127a9502c7899a4beeaa17175af5ba0c9
Author: Sandro Knauß <bugs at sandroknauss.de>
Date:   Tue May 14 01:42:30 2013 +0200

    Updated debian/copyright

diff --git a/debian/copyright b/debian/copyright
index 213571c..79f203b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -55,7 +55,7 @@ License: BSD-3-Clause
 Files: src/3rdparty/qtlockedfile/*
        src/3rdparty/qtsingleapplication/*
 Copyright: 2012 Nokia Corporation and/or its subsidiary(-ies).
-License: LGPL 2.1, Nokia Qt LGPL Exception
+License: LGPL, Nokia Qt LGPL Exception
  GNU Lesser General Public License Usage
  .
  This file may be used under the terms of the GNU Lesser General Public
@@ -65,23 +65,109 @@ License: LGPL 2.1, Nokia Qt LGPL Exception
  Public License version 2.1 requirements will be met:
  http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
  .
+ On Debian systems a full copy of the LGPL 2.1 can be found at
+ /usr/share/common-licenses/LGPL-2.1
+ .
  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.
 
+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
+ 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 2 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.
+ .
+ On Debian systems a full copy of the GPL 2 can be found at
+ /usr/share/common-licenses/GPL-2
+ .
+ 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
+
+Files: test/testdanimostinkt.h
+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
+ the Free Software Foundation; version 2 of the License.
+ .
+ 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.
+ .
+ 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: LGPLv3
+License: LGPL
  The HTML Help Project has licensed its software under LGPLv3 terms.
+ .
+ On Debian systems a full copy of the LGPL 3 can be found at
+ /usr/share/common-licenses/LGPL-3
 
 Files: cmake/modules/GNUInstallDirs.cmake
 Copyright: 2011 Nikita Krupen'ko <krnekit at gmail.com> 
            2011 Kitware, Inc.
-License: BSD
- Distributed under the OSI-approved BSD License (the "License");
- see accompanying file Copyright.txt for details.
+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:
  .
- This software is distributed WITHOUT ANY WARRANTY; without even the
- implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- See the License for more information.
-
+  * 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 names of Kitware, Inc., the Insight Consortium, or the names of
+    any consortium members, or of any contributors, 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 HOLDER 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 AUTHORS 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.

-- 
owncloud-client.git

