[SCM] qtimageformats packaging branch, kubuntu_unstable, updated. debian/5.4.0-1

[Rohan Garg]

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

The following commit has been merged in the kubuntu_unstable branch:
commit 12446f1d66112e6f9c696d9c533a1f4a06632d00
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Tue Dec 23 19:15:00 2014 +0300

    Clean debian/copyright a bit up.
---
 debian/copyright | 20 +++-----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 19532a7..fa99f75 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,8 +3,8 @@ Upstream-Name: qtimageformats-opensource-src
 Source: http://releases.qt-project.org/qt5/*/submodules/
 
 Files: *
-Copyright: 2013 Digia Plc and/or its subsidiary(-ies)
-License: BSD-3-clause
+Copyright: 2013-2014 Digia Plc and/or its subsidiary(-ies)
+License: LGPL-2.1-or-3 with Digia-1.1 exception or GPL-3
 
 Files: debian/*
 Copyright: 2007-2012 Fathi Boudra <fabo at debian.org>
@@ -16,20 +16,6 @@ Copyright: 2007-2012 Fathi Boudra <fabo at debian.org>
            2013-2014 Dmitry Shachnev <mitya57 at debian.org>
 License: LGPL-2.1
 
-Files: tools/pngdumper/*
-       tests/system/auto/tst_imagecompare.cpp
-       tests/system/auto/tst_imagecompare.h
-       tests/system/auto/imagecompare.cpp
-       tests/system/auto/imagecompare.h
-       tests/system/auto/main.cpp
-       tests/auto/tst_qtimageformats.cpp
-Copyright: 2013 Digia Plc and/or its subsidiary(-ies)
-License: LGPL-2.1-or-3 with Digia-1.1 exception or GPL-3
-
-Files: tools/pngdumper/*.qml
-Copyright: 2013 Digia Plc and/or its subsidiary(-ies)
-License: BSD-3-clause
-
 Files: src/3rdparty/jasper/*
 Copyright: 2001-2006 Michael David Adams
            1999-2000 Image Power, Inc.
@@ -57,7 +43,7 @@ Files: libtiff/port/strtoull.c
 Copyright: 1992-1993 The Regents of the University of California.
 License: BSD-4-clause
 
-Files: src/3rdparty/libwep/*
+Files: src/3rdparty/libwebp/*
 Copyright: 2010 Google Inc.
 License: BSD-3-clause-Google
 

-- 
qtimageformats packaging