[SCM] qtquickcontrols packaging branch, kubuntu_unstable, updated. debian/5.4.1-1

[Rohan Garg]

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

The following commit has been merged in the kubuntu_unstable branch:
commit c445ee98e44ee0e761651406f837bb6d5db7c81b
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Thu Mar 5 11:31:18 2015 +0300

    Clean up debian/copyright.
---
 debian/changelog |  1 +
 debian/copyright | 24 +++---------------------
 2 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e95d8b1..06993d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ qtquickcontrols-opensource-src (5.4.1-1) UNRELEASED; urgency=medium
   * Update debian/watch to use https://download.qt.io/.
   * Bump Qt build-dependencies to 5.4.1.
   * Add some additional dependencies to qtquickcontrols5-examples.
+  * Clean up debian/copyright.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 04 Mar 2015 19:55:37 +0300
 
diff --git a/debian/copyright b/debian/copyright
index f6c167e..87638dc 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,11 +1,11 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: qtquickcontrols-opensource-src
-Source: http://releases.qt-project.org/qt5/*/submodules/
+Source: https://download.qt.io/official_releases/qt/*/submodules/
 
 Files: *
 Copyright: 2012-2014 Digia Plc and/or its subsidiary(-ies)
            2013 Tasuku Suzuki <stasuku at gmail.com>
-License: LGPL-2.1-or-3 with Digia Qt LGPL Exception 1.1 or GPL-3
+License: LGPL-2.1-or-3 with Digia Qt LGPL Exception 1.1
 
 Files: debian/*
 Copyright: 2007-2012 Fathi Boudra <fabo at debian.org>
@@ -19,7 +19,7 @@ Copyright: 2007-2012 Fathi Boudra <fabo at debian.org>
 License: LGPL-2.1
 
 Files: examples/*
-       src/src/layouts/doc/src/snippets/*
+       src/layouts/doc/src/snippets/*
        src/*.qml
        tests/*.qml
 Copyright: 2012-2014 Digia Plc and/or its subsidiary(-ies)
@@ -28,11 +28,6 @@ License: BSD-3-clause
 Comment: including all the qml files inside src/ and tests/ and their
  subdirectories.
 
-Files: src/quickcontrols/parser/qquerytransformparser.cpp
-Copyright: 1984, 1989, 1990, 2000-2006 Free Software Foundation, Inc
-           2012 Digia Plc and/or its subsidiary(-ies).
-License: LGPL-2.1-or-3 with Digia Qt LGPL Exception 1.1 or GPL-3
-
 Files: *.qdoc
 Copyright: 2012 Digia Plc and/or its subsidiary(-ies).
 License: GFDL-NIV-1.3
@@ -77,19 +72,6 @@ License: LGPL-2.1-or-3 with Digia Qt LGPL Exception 1.1
  Furthermore, you are not required to apply this additional permission to a
  modified version of the Library.
 
-License: GPL-3
- GNU General Public License Usage
- .
- Alternatively, this file may be used under the terms of the GNU
- General Public License version 3.0 as published by the Free Software
- Foundation and appearing in the file LICENSE.GPL included in the
- packaging of this file.  Please review the following information to
- ensure the GNU General Public License version 3.0 requirements will be
- met: http://www.gnu.org/copyleft/gpl.html.
- .
- On Debian systems, the complete text of the license can be found in
- `/usr/share/common-licenses/GPL-3`.
-
 License: LGPL-2.1
  This file may be used under the terms of the GNU Lesser
  General Public License version 2.1 as published by the Free Software

-- 
qtquickcontrols packaging