[SCM] qtconnectivity packaging branch, kubuntu_unstable, updated. debian/5.5.0-1

Tue Sep 8 15:55:45 UTC 2015

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

The following commit has been merged in the kubuntu_unstable branch:
commit 2f66db7e503cdb49ee3eb49798f52b06d047c74d
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sun Aug 30 14:32:30 2015 +0300

    Update debian/copyright.
---
 debian/changelog |  1 +
 debian/copyright | 54 +++++++++++++++++++++++++++++++-----------------------
 2 files changed, 32 insertions(+), 23 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fc71cf9..15eff6f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ qtconnectivity-opensource-src (5.5.0-1) UNRELEASED; urgency=medium
   [ Dmitry Shachnev ]
   * New upstream release.
   * Bump Qt build-dependencies to 5.5.0.
+  * Update debian/copyright.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 30 Aug 2015 14:06:46 +0300
 
diff --git a/debian/copyright b/debian/copyright
index 2609525..088b595 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,21 +3,20 @@ Upstream-Name: qtconnectivity-opensource-src
 Source: https://download.qt.io/official_releases/qt/*/submodules/
 
 Files: *
-Copyright: 2013-2014 Digia Plc and/or its subsidiary(-ies)
-           2011-2014 Research In Motion (aka Blackberry)
-           2012 Klarälvdalens Datakonsult AB, a KDAB Group company
-License: LGPL-2.1-or-3 with Digia Qt LGPL Exception 1.1
+Copyright: 2015 The Qt Company Ltd.
+           2011-2014 Research In Motion (aka BlackBerry Limited)
+License: LGPL-2.1-or-3 with Qt-1.1 exception
 
 Files: src/nfc/doc/snippets/*
        src/bluetooth/doc/snippets/*
-Copyright: 2013 Digia Plc and/or its subsidiary(-ies)
+Copyright: 2015 The Qt Company Ltd.
 License: BSD-3-clause
 
 Files: *.qdoc
        src/nfc/doc/snippets/doc_src_qtnfc.*
-Copyright: 2012-2014 Digia Plc and/or its subsidiary(-ies).
+Copyright: 2015 The Qt Company Ltd.
            2013 Aaron McCarthy <mccarthy.aaron at gmail.com>
-License: GFDL-1.3+NIV
+License: GFDL-NIV-1.3
 
 Files: debian/*
 Copyright: 2007-2012 Fathi Boudra <fabo at debian.org>
@@ -27,33 +26,41 @@ Copyright: 2007-2012 Fathi Boudra <fabo at debian.org>
            2005-2007 Brian Nelson <pyro at debian.org>
            2012-2013 Timo Jyrinki <timo.jyrinki at canonical.com>
            2014 Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>
+           2015 Dmitry Shachnev <mitya57 at debian.org>
 License: LGPL-2.1
 
 Files: examples/*
-Copyright: 2013-2014 Digia Plc and/or its subsidiary(-ies)
+Copyright: 2015 The Qt Company Ltd.
            2013-2014 BlackBerry Limited
 License: BSD-3-clause
 
 Files: src/nfc/doc/snippets/doc_src_qtnfc.*
 Copyright: 2013 Aaron McCarthy <mccarthy.aaron at gmail.com>
-           2014 Digia Plc and/or its subsidiary(-ies)
+           2015 The Qt Company Ltd.
 License: BSD-3-clause
 
 Files: src/android/bluetooth/src/org/qtproject/qt5/android/bluetooth/QtBluetoothBroadcastReceiver.java
        src/bluetooth/android/*
        src/bluetooth/*_android.cpp
 Copyright: 2013 Lauri Laanmets (Proekspert AS) <lauri.laanmets at eesti.ee>
-           2014 Digia Plc and/or its subsidiary(-ies)
-License: LGPL-2.1-or-3 with Digia Qt LGPL Exception 1.1
+           2015 The Qt Company Ltd.
+License: LGPL-2.1-or-3 with Qt-1.1 exception
 
-Files: src/bluetooth/qlowenergycontroller_bluez.cpp
-       src/bluetooth/bluez/hcimanager.cpp
+Files: src/bluetooth/bluez/hcimanager.cpp
+       src/bluetooth/qlowenergycontroller_bluez.cpp
+       src/bluetooth/qlowenergycontroller_osx*
        src/bluetooth/qlowenergyservice.*
 Copyright: 2013 Javier S. Pedro <maemo at javispedro.com>
-           2014 Digia Plc and/or its subsidiary(-ies)
-License: LGPL-2.1-or-3 with Digia Qt LGPL Exception 1.1
+           2015 The Qt Company Ltd.
+License: LGPL-2.1-or-3 with Qt-1.1 exception
 
-License: LGPL-2.1-or-3 with Digia Qt LGPL Exception 1.1
+Files: src/nfc/qnearfieldmanager_neard*
+       src/nfc/qnearfieldtarget_neard_p.h
+Copyright: 2014 BasysKom GmbH
+           2014 BlackBerry Limited
+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
@@ -62,16 +69,17 @@ License: LGPL-2.1-or-3 with Digia Qt LGPL Exception 1.1
  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
@@ -116,8 +124,8 @@ License: BSD-3-clause
      notice, this list of conditions and the following disclaimer in
      the documentation and/or other materials provided with the
      distribution.
-   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-     of its contributors may be used to endorse or promote products derived
+   * Neither the name of The Qt Company Ltd nor the names of its
+     contributors may be used to endorse or promote products derived
      from this software without specific prior written permission.
  .
  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
@@ -132,7 +140,7 @@ License: BSD-3-clause
  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 
-License: GFDL-1.3+NIV
+License: GFDL-NIV-1.3
  GNU Free Documentation License Usage
  Alternatively, this file may be used under the terms of the GNU Free
  Documentation License version 1.3 as published by the Free Software

-- 
qtconnectivity packaging

