[SCM] qttools packaging branch, master, updated. debian/5.4.2-1

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit ef0fcd71c0418a37cc564a5be4cc008daf11b305
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Mon Mar 2 18:06:15 2015 +0300

    Update debian/copyright.
---
 debian/changelog |  1 +
 debian/copyright | 21 +++++----------------
 2 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1c3bd02..e534ad5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ qttools-opensource-src (5.4.1-1) UNRELEASED; urgency=medium
   [ Dmitry Shachnev ]
   * New upstream release.
   * Update debian/watch to use https://download.qt.io/.
+  * Update debian/copyright.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 02 Mar 2015 18:01:55 +0300
 
diff --git a/debian/copyright b/debian/copyright
index 093792e..bd50245 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,10 +1,10 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: qttools-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).
-License: LGPL-2.1-or-3 with Digia-1.1 exception or GPL-3
+Copyright: 2012-2015 Digia Plc and/or its subsidiary(-ies).
+License: LGPL-2.1-or-3 with Digia-1.1 exception
 
 Files: debian/*
 Copyright: 2007-2012 Fathi Boudra <fabo at debian.org>
@@ -20,7 +20,7 @@ License: LGPL-2.1
 
 Files: tests/auto/cmake/test_translation_macros/myi18nobject.cpp tests/auto/cmake/test_translation_macros/some_dir/some_include.h
 Copyright: 2012 Klarälvdalens Datakonsult AB, a KDAB Group company, info at kdab.com
-License: LGPL-2.1-or-3 with Digia-1.1 exception or GPL-3
+License: LGPL-2.1-or-3 with Digia-1.1 exception
 
 Files: src/linguist/Qt5LinguistToolsMacros.cmake
 Copyright: 2005-2011 Kitware, Inc.
@@ -131,17 +131,6 @@ License: GPL-2+
  On Debian systems, the complete text of the GNU Public Licenses can be found
  in `/usr/share/common-licenses/GPL-2`.
 
-License: GPL-3
- 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 GNU Public Licenses can be found
- in `/usr/share/common-licenses/GPL-3`.
-
 License: BSD-3-clause
  You may use this file under the terms of the BSD license as follows:
  .
@@ -199,7 +188,7 @@ License: Apache-2.0
 
 Files: examples/designer/arthurplugin/plugin.cpp
 Copyright: 2012 Digia Plc and/or its subsidiary(-ies).
-License: LGPL-2.1-or-3 with Digia-1.1 exception or GPL-3
+License: LGPL-2.1-or-3 with Digia-1.1 exception
 
 Files: *.qdoc
 Copyright: 2012 Digia Plc and/or its subsidiary(-ies).

-- 
qttools packaging