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

[Rohan Garg]

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

The following commit has been merged in the kubuntu_unstable branch:
commit 5b71f98631d26c65093a300c2f0b3edf496c7949
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Wed Dec 24 21:11:30 2014 +0300

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

diff --git a/debian/changelog b/debian/changelog
index 13224d7..f9a8246 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ qtx11extras-opensource-src (5.4.0-1) UNRELEASED; urgency=medium
   [ Dmitry Shachnev ]
   * New upstream release.
   * Bump Qt build-dependencies to 5.4.0.
+  * Update debian/copyright.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 24 Dec 2014 15:56:18 +0300
 
diff --git a/debian/copyright b/debian/copyright
index 8700616..ce8d61e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,14 +1,14 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: qttools-opensource-src
-Source: http://releases.qt-project.org/qt5/5.0.1/submodules_tar/
+Upstream-Name: qtx11extras-opensource-src
+Source: http://releases.qt-project.org/qt5/*/submodules_tar/
 
 Files: *
-Copyright: 2012 Digia Plc and/or its subsidiary(-ies).
+Copyright: 2012-2014 Digia Plc and/or its subsidiary(-ies).
            2012 Intel Corporation
            2012 Richard Moore <rich at kde.org>
            2012 David Faure <david.faure at kdab.com>
            2012 Klarälvdalens Datakonsult AB, a KDAB Group company <info at kdab.com>
-License: LGPL-2.1 with Digia Qt LGPL Exception 1.1 or GPL-3
+License: LGPL-2.1-or-3 with Digia-1.1 exception or GPL-3
 
 Files: *.qdoc
 Copyright: 2012-2013 Digia Plc and/or its subsidiary(-ies).
@@ -23,23 +23,26 @@ Copyright: 2007-2012 Fathi Boudra <fabo at debian.org>
            2012 Felix Geyer <fgeyer at debian.org>
            2013 Timo Jyrinki <timo.jyrinki at canonical.com>
            2013 Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>
+           2014 Dmitry Shachnev <mitya57 at debian.org>
 License: LGPL-2.1
 
-License: LGPL-2.1 with Digia Qt LGPL Exception 1.1
- GNU Lesser General Public License version 2.1:
+License: LGPL-2.1-or-3 with Digia-1.1 exception
+ GNU Lesser General Public License:
  This file may be used under the terms of the GNU Lesser General Public
- License version 2.1 as published by the Free Software Foundation and
- appearing in the file LICENSE.LGPL included in the packaging of this
- file. Please review the following information to ensure the GNU Lesser
- General Public License version 2.1 requirements will be met:
- http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+ License version 2.1 or version 3 as published by the Free Software
+ Foundation and appearing in the file LICENSE.LGPLv21 and LICENSE.LGPLv3
+ included in the packaging of this file. Please review the following
+ information to ensure the GNU Lesser General Public License requirements
+ will be met: https://www.gnu.org/licenses/lgpl.html.
  .
  In addition, as a special exception, Digia gives you certain additional
  rights. These rights are described in the Digia Qt LGPL Exception
  version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
  .
- On Debian systems, the complete text of the GNU Lesser General Public License
- can be found in `/usr/share/common-licenses/LGPL-2.1`.
+ On Debian systems, the complete text of the GNU Lesser General Public
+ License version 2.1 can be found in `/usr/share/common-licenses/LGPL-2.1`.
+ The complete text of the GNU Lesser General Public License version 3 can be
+ found in `/usr/share/common-licenses/LGPL-3`.
  .
  Digia Qt LGPL Exception version 1.1:
  As an additional permission to the GNU Lesser General Public License version

-- 
qtx11extras packaging