[SCM] qtquick1 packaging branch, experimental, updated. debian/5.3.2-3-3-geb5f45d

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit eb5f45d3a858dcac32d330870c84737711bb4812
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sat Dec 27 16:23:58 2014 +0300

    Update debian/copyright.
---
 debian/changelog |  1 +
 debian/copyright | 46 +++++++++++++++++++---------------------------
 2 files changed, 20 insertions(+), 27 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d5a6701..639456f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ qtquick1-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>  Sat, 27 Dec 2014 16:17:54 +0300
 
diff --git a/debian/copyright b/debian/copyright
index e0bcbf9..e638c5a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,8 +3,8 @@ Upstream-Name: qtquick1-opensource-src
 Source: http://releases.qt-project.org/qt5/*/submodules/
 
 Files: *
-Copyright: 2012-2013 Digia Plc and/or its subsidiary(-ies)
-License: LGPL-2.1 with Digia Qt LGPL Exception 1.1 or GPL-3
+Copyright: 2012-2014 Digia Plc and/or its subsidiary(-ies)
+License: LGPL-2.1-or-3 with Digia-1.1 exception
 
 Files: debian/mark_private_symbols.sh
 Copyright: 2013 Sune Vuorela <sune at debian.org>
@@ -33,31 +33,33 @@ Files: examples/declarative/calculator/main.cpp
  examples/declarative/snake/*
  examples/declarative/twitter/*
 Copyright: 2012 Digia Plc and/or its subsidiary(-ies).
-License: LGPL-2.1 with Digia Qt LGPL Exception 1.1
+License: LGPL-2.1-or-3 with Digia-1.1 exception
 
 Files: tests/auto/declarative/qdeclarativeimportorder/tst_qdeclarativeimportorder.cpp
 Copyright: 2012 Jolla Mobile
-License: LGPL-2.1 with Digia Qt LGPL Exception 1.1
+License: LGPL-2.1-or-3 with Digia-1.1 exception
 
 Files: *.qdoc
 Copyright: 2012-2013 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-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
@@ -81,19 +83,6 @@ License: LGPL-2.1 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
@@ -105,7 +94,10 @@ License: LGPL-2.1
  On Debian systems, the complete text of the LGPL-2.1 license can be found in
  `/usr/share/common-licenses/LGPL-2.1`,
 
-Files: examples/* src/doc/src/snippets/* src/plugins/platforms/uikit/examples/qmltest/qml/main.qml src/imports/folderlistmodel/plugin.cpp
+Files: examples/*
+       src/doc/src/snippets/*
+       src/plugins/platforms/uikit/examples/qmltest/qml/main.qml
+       src/imports/folderlistmodel/plugin.cpp
 Copyright: 2012 Digia Plc and/or its subsidiary(-ies)
 License: BSD-3-clause
  You may use this file under the terms of the BSD license as follows:

-- 
qtquick1 packaging