[Pkg-owncloud-commits] [owncloud-client] 82/83: Updated copyright file

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit 5b29eb30a3672f6b5585f91c4c4a0a54ae59b6b3
Author: Sandro Knauß <bugs at sandroknauss.de>
Date:   Sat May 31 13:26:09 2014 +0200

    Updated copyright file
---
 debian/copyright | 43 ++++++++++++++++++++++++-------------------
 1 file changed, 24 insertions(+), 19 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index fa10409..4d9e3c2 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -7,7 +7,7 @@ Files-Excluded:
 
 Files: *
 Copyright: 2014, Daniel Molkentin <danimo at owncloud.com>
-           2011-2013 Klaas Freitag <freitag at owncloud.com>
+           2011-2014 Klaas Freitag <freitag at owncloud.com>
            Krzesimir Nowak <krzesimir at endocode.com>
            Markus Goetz <markus at woboq.com>
            Olivier Goffart <ogoffart at owncloud.com>
@@ -44,7 +44,7 @@ Files: src/creds/credentialscommon.*
        src/mirall/syncresult.*
        src/mirall/systray.*
        src/mirall/theme.*
-       src/owncloudcmd/owncloudcmd.cpp
+       src/owncloudcmd/owncloudcmd.*
        src/updater/ocupdater.*
        src/wizard/owncloudadvancedsetuppage.*
        src/wizard/owncloudhttpcredspage.*
@@ -66,7 +66,7 @@ License: GPL-2+
 
 Files: src/3rdparty/qtlockedfile/*
        src/3rdparty/qtsingleapplication/*
-Copyright: 2012 Nokia Corporation and/or its subsidiary(-ies)
+Copyright: 2014 Digia Plc and/or its subsidiary(-ies)
 License: LGPL-2.1 with Diaga-LGPL-1.1 exception
 
 Files: src/3rdparty/fancylineedit/*
@@ -236,10 +236,27 @@ License: LGPL-3+
  /usr/share/common-licenses/LGPL-3
 
 License: LGPL-2.1 with Diaga-LGPL-1.1 exception
- 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; either
- version 2.1 of the License.
+ Commercial License Usage
+ Licensees holding valid commercial Qt licenses may use this file in
+ accordance with the commercial license agreement provided with the
+ Software or, alternatively, in accordance with the terms contained in
+ a written agreement between you and Digia.  For licensing terms and
+ conditions see http://qt.digia.com/licensing.  For further information
+ use the contact form at http://qt.digia.com/contact-us.
+ .
+ GNU Lesser General Public License Usage
+ Alternatively, this file may be used under the terms of the GNU Lesser
+ General Public License version 2.1 as published by the Free Software
+ Foundation.
+ .
+ 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, Digia gives you certain additional
+ rights.  These rights are described in the Digia Qt LGPL Exception
+ version 1.1.
+ .
+ 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
@@ -261,18 +278,6 @@ License: LGPL-2.1 with Diaga-LGPL-1.1 exception
  .
  Furthermore, you are not required to apply this additional permission to a
  modified version of the Library.
- .
- 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.
- .
- 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
- .
- On Debian systems a full copy of the LGPL 2.1 can be found at
- /usr/share/common-licenses/LGPL-2.1
 
 License: public-domain
  This software is in the public domain, furnished "as is", without technical

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git