[SCM] qtconnectivity packaging branch, kubuntu_unstable, updated. debian/5.4.1-2

[Rohan Garg]

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

The following commit has been merged in the kubuntu_unstable branch:
commit f4f3b7fceb1d0880b4be94cda56d1031c34d504d
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Wed Mar 4 13:25:40 2015 +0000

    Update debian/copyright.
---
 debian/changelog |  1 +
 debian/copyright | 17 ++---------------
 2 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2d5a5cb..ce0744f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ qtconnectivity-opensource-src (5.4.1-1) UNRELEASED; urgency=medium
   * Update watch file to qt.io
   * Bump Qt build-dependencies to 5.4.1.
   * Update *.symbols for GCC 5. (Closes: #778086)
+  * Update debian/copyright.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 04 Mar 2015 13:03:28 +0000
 
diff --git a/debian/copyright b/debian/copyright
index a577719..125a2f0 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,12 +1,12 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: qtconnectivity-opensource-src
-Source: http://qt.gitorious.org/qt/qtconnectivity
+Source: https://download.qt.io/official_releases/qt/*/submodules/
 
 Files: *
 Copyright: 2013-2014 Digia Plc and/or its subsidiary(-ies)
            2011-2014 Research In Motion (aka Blackberry)
            2012 Klarälvdalens Datakonsult AB, a KDAB Group company
-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: examples/*
        src/nfc/doc/snippets/*
@@ -81,19 +81,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

-- 
qtconnectivity packaging