[SCM] qtimageformats packaging branch, kubuntu_unstable, updated. debian/5.4.2-2-4-g8f9bb86

[Rohan Garg]

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

The following commit has been merged in the kubuntu_unstable branch:
commit 56d2bbfe1143fb54796b9dfb4ebcfade98abc810
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Wed Aug 26 18:01:39 2015 +0300

    Update debian/copyright.
---
 debian/changelog |  1 +
 debian/copyright | 44 ++++++++++++++++++++++++++++++++------------
 2 files changed, 33 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 03ed330..cb4c6fd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ qtimageformats-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>  Wed, 26 Aug 2015 17:41:43 +0300
 
diff --git a/debian/copyright b/debian/copyright
index 9f10d7c..aa26e51 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,8 +3,8 @@ Upstream-Name: qtimageformats-opensource-src
 Source: https://download.qt.io/official_releases/qt/*/submodules/
 
 Files: *
-Copyright: 2013-2015 Digia Plc and/or its subsidiary(-ies)
-License: LGPL-2.1-or-3 with Digia-1.1 exception
+Copyright: 2015 The Qt Company Ltd.
+License: LGPL-2.1-or-3 with Qt-1.1 exception
 
 Files: debian/*
 Copyright: 2007-2012 Fathi Boudra <fabo at debian.org>
@@ -23,13 +23,14 @@ Copyright: 2001-2006 Michael David Adams
 License: JasPer-License-Version-2.0
 
 Files: src/3rdparty/libmng/*
-Copyright: 2000-2004 G.Juyn
+Copyright: 2000-2004 Gerard Juyn <gerard at libmng.com>
            2000 AM <s98t269 at stmail.eng.kagawa-u.ac.jp>
 License: BSD-3-clause
 
 Files: src/3rdparty/libtiff/*
 Copyright: 1988-1997 Sam Leffler
            1991-1997 Silicon Graphics, Inc.
+           2002-2010 Andrey Kiselev <dron at ak4719.spb.edu>
 License: BSD-libtiff
 
 Files: src/3rdparty/libtiff/port/strcasecmp.c
@@ -47,11 +48,29 @@ Files: src/3rdparty/libwebp/*
 Copyright: 2010 Google Inc.
 License: BSD-3-clause-Google
 
+Files: src/plugins/imageformats/icns/*
+       tests/auto/icns/tst_qicns.cpp
+Copyright: 2013 Alex Char
+           2015 The Qt Company Ltd.
+License: LGPL-2.1-or-3 with Qt-1.1 exception
+
+Files: src/plugins/imageformats/dds/*
+       tests/auto/dds/tst_qdds.cpp
+Copyright: 2013 Ivan Komissarov
+           2015 The Qt Company Ltd.
+License: LGPL-2.1-or-3 with Qt-1.1 exception
+
+Files: src/plugins/imageformats/jp2/*
+       tests/auto/jp2/tst_qjp2.cpp
+Copyright: 2014 Petroules Corporation
+           2015 The Qt Company Ltd.
+License: LGPL-2.1-or-3 with Qt-1.1 exception
+
 Files: *.qdoc
-Copyright: 2012 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
+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
@@ -60,16 +79,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
@@ -126,9 +146,9 @@ 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
-     from this software without specific prior written permission.
+   * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) 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
  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT

-- 
qtimageformats packaging