[Pkg-owncloud-commits] [SCM] owncloud-client.git branch, master, updated. debian/1.2.5+dfsg-1-11-gd294644

[Sandro Knauß]

The following commit has been merged in the master branch:
commit 81a8884975e68d0590edd65dfad90f5f7aa69937
Author: Sandro Knauß <bugs at sandroknauss.de>
Date:   Sun Jun 16 01:29:35 2013 +0200

    Updated debian/copyright

diff --git a/debian/copyright b/debian/copyright
index bcac79f..31041fb 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,10 +5,11 @@ 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>
+           2011-2013 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>
+           Cédric Bellegarde <gnumdk at gmail.com>
 License: GPL-2+
 
 Files: debian/*
@@ -23,9 +24,11 @@ License: GPL-2+
 Files: src/mirall/fileitemdialog.*
        src/mirall/credentialstore.*
        src/mirall/utility.*
+       src/mirall/connectionvalidator.*
 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>
@@ -34,7 +37,15 @@ License: GPL-2+ and Expat
 Files: src/3rdparty/qtlockedfile/*
        src/3rdparty/qtsingleapplication/*
 Copyright: 2012 Nokia Corporation and/or its subsidiary(-ies).
-License: LGPL-2.1 and Nokia-LGPL-Exception
+License: LGPL-2.1 and Diaga-LGPL-Exception
+
+Files: src/3rdparty/fancylineedit/*
+Copyright: Digia Plc and/or its subsidiary(-ies).
+License: LGPL-2.1 and Diaga-LGPL-Exception
+
+Files: src/3rdparty/QProgressIndicator/*
+Copyright: 2009 - 2010 Morgan Leborgne
+License: LGPL-3+
 
 Files: doc/*
 Copyright: 2012 The ownCloud developers
@@ -95,7 +106,24 @@ License: LGPL-2.1
  On Debian systems a full copy of the LGPL 2.1 can be found at
  /usr/share/common-licenses/LGPL-2.1
 
-License: Nokia-LGPL-Exception
+License: LGPL-3+
+ This program 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 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 Lesser General Public License for more details.
+ .
+ You should have received a copy of the GNU Lesser General Public License
+ along with QRecentFilesMenu. If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems a full copy of the LGPL 2.1 can be found at
+ /usr/share/common-licenses/LGPL-3
+
+License: Diaga-LGPL-Exception
  Digia Qt LGPL Exception version 1.1
  .
  As an additional permission to the GNU Lesser General Public License version

-- 
owncloud-client.git