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

[Rohan Garg]

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

The following commit has been merged in the kubuntu_unstable branch:
commit f274796f8843dc1904f799eab5445905554067af
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sun Dec 21 13:47:54 2014 +0300

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

diff --git a/debian/changelog b/debian/changelog
index 859b2ae..269f4cc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,9 +4,9 @@ qttools-opensource-src (5.4.0-1) UNRELEASED; urgency=medium
   * New upstream release.
   * Bump Qt build-dependencies to 5.4.0.
   * debian/copyright:
-    - Use correct syntax for exceptions.
-    - Make Unicode data license text readable, and give it
-      a short name without spaces (MIT-Unicode).
+    - Update for LGPL v3 addition, and use correct syntax for exceptions.
+    - Make Unicode data license text readable, and give it a short name
+      without spaces (MIT-Unicode).
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 08 Oct 2014 21:59:06 +0400
 
diff --git a/debian/copyright b/debian/copyright
index 2248d7e..fb5dda2 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/5.0.1/submodules_tar/
+Source: http://releases.qt-project.org/qt5/*/submodules/
 
 Files: *
 Copyright: 2012-2014 Digia Plc and/or its subsidiary(-ies).
-License: LGPL-2.1 with Digia-1.1 exception or GPL-3
+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>
@@ -15,11 +15,12 @@ Copyright: 2007-2012 Fathi Boudra <fabo at debian.org>
            2012 Felix Geyer <fgeyer at debian.org>
            2012-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
 
 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 with Digia-1.1 exception or GPL-3
+License: LGPL-2.1-or-3 with Digia-1.1 exception or GPL-3
 
 Files: src/linguist/Qt5LinguistToolsMacros.cmake
 Copyright: 2005-2011 Kitware, Inc.
@@ -72,21 +73,23 @@ Copyright: 2003-2006 Ben van Klinken and the CLucene Team
            2012 Digia Plc and/or its subsidiary(-ies)
 License: LGPL-2.1
 
-License: LGPL-2.1 with Digia-1.1 exception
- 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
@@ -196,7 +199,7 @@ License: Apache-2.0
 
 Files: examples/designer/arthurplugin/plugin.cpp
 Copyright: 2012 Digia Plc and/or its subsidiary(-ies).
-License: LGPL-2.1 with Digia-1.1 exception or GPL-3
+License: LGPL-2.1-or-3 with Digia-1.1 exception or GPL-3
 
 Files: *.qdoc
 Copyright: 2012 Digia Plc and/or its subsidiary(-ies).

-- 
qttools packaging