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

[Rohan Garg]

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

The following commit has been merged in the kubuntu_unstable branch:
commit 9f6a8e41fe0a2d514dfed8a4bfe2a656d4ea15f0
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sun Aug 30 15:09:59 2015 +0300

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

diff --git a/debian/changelog b/debian/changelog
index 5dfeb45..368b76d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ qtx11extras-opensource-src (5.5.0-1) UNRELEASED; urgency=medium
   * New upstream release.
   * Bump Qt build-dependencies to 5.5.0.
   * Build-depend on qtbase5-doc-html, for docs linking.
+  * Update debian/copyright.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 30 Aug 2015 14:56:43 +0300
 
diff --git a/debian/copyright b/debian/copyright
index 31b1a5f..794ce86 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,15 +3,15 @@ Upstream-Name: qtx11extras-opensource-src
 Source: https://download.qt.io/official_releases/qt/*/submodules/
 
 Files: *
-Copyright: 2012-2014 Digia Plc and/or its subsidiary(-ies).
+Copyright: 2015 The Qt Company Ltd.
            2012 Intel Corporation
            2012 Richard Moore <rich at kde.org>
            2012 David Faure <david.faure at kdab.com>
            2012 Klarälvdalens Datakonsult AB, a KDAB Group company <info at kdab.com>
-License: LGPL-2.1-or-3 with Digia-1.1 exception
+License: LGPL-2.1-or-3 with Qt-1.1 exception
 
 Files: *.qdoc
-Copyright: 2012-2013 Digia Plc and/or its subsidiary(-ies).
+Copyright: 2015 The Qt Company Ltd.
 License: GFDL-NIV-1.3
 
 Files: debian/*
@@ -26,7 +26,7 @@ Copyright: 2007-2012 Fathi Boudra <fabo at debian.org>
            2014 Dmitry Shachnev <mitya57 at debian.org>
 License: LGPL-2.1
 
-License: LGPL-2.1-or-3 with Digia-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
@@ -35,16 +35,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

-- 
qtx11extras packaging