[SCM] qtwebsockets packaging branch, experimental, updated. debian/5.4.2-2-3-g061a8eb

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit dead815a319cff76f050754d7e89c1ae319a3639
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Thu Aug 27 14:42:48 2015 +0300

    Update debian/copyright.
---
 debian/changelog |  1 +
 debian/copyright | 28 ++++++++++++++++++++--------
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 17b3017..b39595f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ qtwebsockets-opensource-src (5.5.0-1) UNRELEASED; urgency=medium
 
   [ Dmitry Shachnev ]
   * New upstream release.
+  * Update debian/copyright.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 27 Aug 2015 14:28:20 +0300
 
diff --git a/debian/copyright b/debian/copyright
index 73d3b31..6e82a78 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -15,17 +15,28 @@ License: LGPL-2.1
 
 Files: *
 Copyright: 2014 Kurt Pattyn <pattyn.kurt at gmail.com>
-License: LGPL-2.1-or-3 with Digia-1.1 exception
+License: LGPL-2.1-or-3 with Qt-1.1 exception
 
 Files: src/websockets/doc/src/*.qdoc
-Copyright: 2014 Kurt Pattyn <pattyn.kurt at gmail.com>
+Copyright: 2013-2014 Kurt Pattyn <pattyn.kurt at gmail.com>
 License: GFDL-NIV-1.3
 
 Files: examples/websockets/doc/*.qdoc
-Copyright: 2014 Digia Plc and/or its subsidiary(-ies)
+Copyright: 2015 The Qt Company Ltd.
 License: GFDL-NIV-1.3
 
-License: LGPL-2.1-or-3 with Digia-1.1 exception
+Files: tests/auto/qml/qmlwebsockets/tst_qmlwebsockets.*
+       tests/auto/qml/qmlwebsockets_compat/tst_qmlwebsockets_compat.*
+Copyright: 2015 The Qt Company Ltd.
+License: LGPL-2.1-or-3 with Qt-1.1 exception
+
+Files: examples/websockets/doc/qmlwebsocketserver.qdoc
+       examples/websockets/qmlwebsocketserver/*
+       src/imports/qmlwebsockets/qqmlwebsocketserver.*
+Copyright: 2014 Klarälvdalens Datakonsult AB, a KDAB Group company
+License: LGPL-2.1-or-3 with Qt-1.1 exception
+
+License: LGPL-2.1-or-3 with Qt-1.1 exception
  GNU Lesser General Public License:
  This file may be used under the terms of the GNU Lesser General Public
  License version 2.1 or version 3 as published by the Free Software
@@ -34,16 +45,17 @@ License: LGPL-2.1-or-3 with Digia-1.1 exception
  information to ensure the GNU Lesser General Public License requirements
  will be met: https://www.gnu.org/licenses/lgpl.html.
  .
- 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, included in the file LGPL_EXCEPTION.txt in this package.
+ In addition, as a special exception, The Qt Company gives you certain
+ additional rights. These rights are described in The Qt Company Qt LGPL
+ Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
+ package.
  .
  On Debian systems, the complete text of the GNU Lesser General Public
  License version 2.1 can be found in `/usr/share/common-licenses/LGPL-2.1`.
  The complete text of the GNU Lesser General Public License version 3 can be
  found in `/usr/share/common-licenses/LGPL-3`.
  .
- Digia Qt LGPL Exception version 1.1:
+ The Qt Company 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

-- 
qtwebsockets packaging