[SCM] qtgraphicaleffects packaging branch, experimental, updated. debian/5.9.0-1-7-g908bcbc

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit 252b39cdb2c76c186d67c8a02f7c821bb4145dec
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sun Jul 2 19:02:28 2017 +0300

    Update debian/copyright for upstream license change.
---
 debian/changelog |  1 +
 debian/copyright | 67 ++++++++++++++------------------------------------------
 2 files changed, 18 insertions(+), 50 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 031ae48..6c084f3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ qtgraphicaleffects-opensource-src (5.9.1-1) UNRELEASED; urgency=medium
   * Bump Qt build-dependencies to 5.9.1.
   * Add build-dependency on qtdeclarative5-dev-tools, to get QML cache
     files generated.
+  * Update debian/copyright for upstream license change.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 02 Jul 2017 18:38:17 +0300
 
diff --git a/debian/copyright b/debian/copyright
index a244c7e..457fc28 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,8 +3,8 @@ Upstream-Name: qtgraphicaleffects-opensource-src
 Source: https://download.qt.io/official_releases/qt/*/submodules/
 
 Files: *
-Copyright: 2015-2016 The Qt Company Ltd.
-License: BSD-3-clause
+Copyright: 2017 The Qt Company Ltd.
+License: LGPL-3 or GPL-2
 
 Files: debian/*
 Copyright: 2007-2012 Fathi Boudra <fabo at debian.org>
@@ -13,41 +13,36 @@ Copyright: 2007-2012 Fathi Boudra <fabo at debian.org>
            2007-2009 Ana Beatriz Guerrero Lopez <ana at debian.org>
            2005-2007 Brian Nelson <pyro at debian.org>
            2012-2013 Timo Jyrinki <timo.jyrinki at canonical.com>
-           2014-2016 Dmitry Shachnev <mitya57 at debian.org>
+           2014-2017 Dmitry Shachnev <mitya57 at debian.org>
 License: LGPL-3 or GPL-2
 
 Files: src/effects/DropShadow.qml
        src/effects/GaussianBlur.qml
        src/effects/Glow.qml
        src/effects/MaskedBlur.qml
-       src/effects/private/DropShadowBase.qml
-       tests/manual/SourceProxyTest.qml
-       tests/manual/testSourceProxy.qml
-Copyright: 2015 Jolla Ltd.
-           2015 The Qt Company Ltd.
-License: BSD-3-clause
-
-Files: src/effects/plugin.cpp
-Copyright: 2016 The Qt Company Ltd.
+Copyright: 2017 Jolla Ltd.
+           2017 The Qt Company Ltd.
 License: LGPL-3 or GPL-2
 
-Files: src/effects/private/plugin.cpp
+Files: src/effects/private/DropShadowBase.qml
+       src/effects/private/plugin.cpp
        src/effects/private/qgfxshaderbuilder*
        src/effects/private/qgfxsourceproxy*
-Copyright: 2016 Jolla Ltd.
+Copyright: 2016-2017 Jolla Ltd.
 License: LGPL-3 or GPL-2
 
-Files: tools/pngdumper/*.cpp
-       tools/pngdumper/*h
-       tests/auto/tst_qtgraphicaleffects.cpp
-       tests/system/auto/imagecompare.*
-       tests/system/auto/main.cpp
-       tests/system/auto/tst_imagecompare.*
-Copyright: 2016 The Qt Company Ltd.
+Files: tools/*
+       tests/*
+Copyright: 2017 The Qt Company Ltd.
+License: GPL-3 with Qt-1.0 exception
+
+Files: tests/manual/SourceProxyTest.qml
+       tests/manual/testSourceProxy.qml
+Copyright: 2017 Jolla Ltd.
 License: GPL-3 with Qt-1.0 exception
 
 Files: *.qdoc
-Copyright: 2015 The Qt Company Ltd.
+Copyright: 2017 The Qt Company Ltd.
 License: GFDL-NIV-1.3
 
 License: GPL-2
@@ -118,31 +113,3 @@ License: GFDL-NIV-1.3
  .
  On Debian systems, the complete text of the GNU Free Documentation
  License version 1.3 can be found in /usr/share/common-licenses/GFDL-1.3.
-
-License: BSD-3-clause
- You may use this file under the terms of the BSD license as follows:
- .
- "Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are
- met:
-   * Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above copyright
-     notice, this list of conditions and the following disclaimer in
-     the documentation and/or other materials provided with the
-     distribution.
-   * 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
- "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."

-- 
qtgraphicaleffects packaging