[SCM] sni-qt packaging branch, master, updated. 959ed342c42c3249fd3261a892a397258cb00320

[Felix Geyer]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/sni-qt.git;a=commitdiff;h=0a73200

The following commit has been merged in the master branch:
commit 0a73200012ff37c94005bff5bacf0c5f500a69cd
Author: Felix Geyer <fgeyer at debian.org>
Date:   Tue Aug 4 22:25:03 2015 +0200

    Another copyright file update.
---
 debian/copyright | 36 +++++++++++++++++++++++++++++++-----
 1 file changed, 31 insertions(+), 5 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 61dabc7..cffd779 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,7 +3,7 @@ Upstream-Name: sni-qt
 Upstream-Contact: Renato Filho <renato.filho at canonical.com>
 Source: https://launchpad.net/sni-qt
 
-File: *
+Files: *
 Copyright: 2011 Canonical Ltd
 License: LGPL-3
  sni-qt is free software; you can redistribute it and/or modify it under the
@@ -18,9 +18,9 @@ License: LGPL-3
  On Debian/Ubuntu systems, the full text of the LGPL v3 can be found in
  `/usr/share/common-licenses/LGPL-3'
 
-File: src/private/qabstractsystemtrayiconsys_p.h
+Files: src/private/qabstractsystemtrayiconsys_p.h
 Copyright: 2011 Nokia Corporation and/or its subsidiary(-ies)
-License: LGPL-2.1 (with additional exception)
+License: LGPL-2.1 (with additional exception) or GPL-3
  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 and
  appearing in the file LICENSE.LGPL included in the packaging of this
@@ -30,10 +30,36 @@ License: LGPL-2.1 (with additional 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.
+ 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.
+ .
+ Alternatively, this file may be used under the terms of the GNU General
+ Public License version 3.0 as published by the Free Software Foundation
+ and appearing in the file LICENSE.GPL included in the packaging of this
+ file. Please review the following information to ensure the GNU General
  .
  On Debian/Ubuntu systems, the full text of the LGPL v2.1 can be found in
- `/usr/share/common-licenses/LGPL-2.1'
+ `/usr/share/common-licenses/LGPL-2.1' and the text of the GPL v3 can
+ be found in `/usr/share/common-licenses/GPL-3'.
 
 Files: tests/manual/window.cpp tests/manual/main.cpp tests/manual/window.h
 Copyright: 2011 Nokia Corporation and/or its subsidiary(-ies)

-- 
sni-qt packaging