[SCM] qtquickcontrols packaging branch, experimental, updated. debian/5.3.2-2-6-g7e60b0a

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit d9c4d3379dc390d8447569ab2283a49946ea8e7d
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Mon Dec 22 15:17:22 2014 +0300

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

diff --git a/debian/changelog b/debian/changelog
index b433d9b..3490403 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ qtquickcontrols-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>  Mon, 22 Dec 2014 15:14:01 +0300
 
diff --git a/debian/copyright b/debian/copyright
index f3fd1d9..f6c167e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,7 +5,7 @@ Source: http://releases.qt-project.org/qt5/*/submodules/
 Files: *
 Copyright: 2012-2014 Digia Plc and/or its subsidiary(-ies)
            2013 Tasuku Suzuki <stasuku at gmail.com>
-License: LGPL-2.1 with Digia Qt LGPL Exception 1.1 or GPL-3
+License: LGPL-2.1-or-3 with Digia Qt LGPL Exception 1.1 or GPL-3
 
 Files: debian/*
 Copyright: 2007-2012 Fathi Boudra <fabo at debian.org>
@@ -14,7 +14,7 @@ Copyright: 2007-2012 Fathi Boudra <fabo at debian.org>
            2007-2009 Ana Beatriz Guerrero Lopez <ana at debian.org>
            2005-2007 Brian Nelson <pyro at debian.org>
            2012-2013 Timo Jyrinki <timo.jyrinki at canonical.com>
-           2013-2014 Dmitry Shachnev <mitya57 at gmail.com>
+           2013-2014 Dmitry Shachnev <mitya57 at debian.org>
            2013-2014 Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>
 License: LGPL-2.1
 
@@ -31,27 +31,29 @@ Comment: including all the qml files inside src/ and tests/ and their
 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 with Digia Qt LGPL Exception 1.1 or GPL-3
+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
 
-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 Qt LGPL Exception 1.1
+ 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

-- 
qtquickcontrols packaging