[SCM] qtdeclarative packaging branch, experimental, updated. debian/5.4.0-2-7-ga791ec0

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit a791ec04cd2cd3b115d5981c2edd005df57beddf
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sun Dec 28 21:10:54 2014 +0300

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

diff --git a/debian/changelog b/debian/changelog
index 23c5585..f302b85 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ qtdeclarative-opensource-src (5.4.0-4) UNRELEASED; urgency=medium
   [ Dmitry Shachnev ]
   * Update symbols files with buildds’ logs.
   * Enable qml-module-qtqml-statemachine package.
+  * Update debian/copyright.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 28 Dec 2014 21:05:22 +0300
 
diff --git a/debian/copyright b/debian/copyright
index 99e5e7c..77451b7 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,10 +3,10 @@ Upstream-Name: qtdeclarative-opensource-src
 Source: http://releases.qt-project.org/qt5/*/submodules/
 
 Files: *
-Copyright: 2012-2013 Digia Plc and/or its subsidiary(-ies)
+Copyright: 2012-2014 Digia Plc and/or its subsidiary(-ies)
            2008-2012 Nokia Corporation and/or its subsidiary(-ies)
            1994-2008 Trolltech ASA.
-License: LGPL-2.1-or-3 with Digia-1.1 exception or GPL-3
+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>
@@ -20,6 +20,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 debian.org>
 License: LGPL-2.1
 
 Files: src/3rdparty/masm/assembler/*
@@ -78,7 +79,7 @@ Files: examples/quick/customitems/painteditem/TextBalloonPlugin/plugin.h
  examples/quick/scenegraph/*
 Copyright: 2012-2014 Digia Plc and/or its subsidiary(-ies)
            2013 Jolla Ltd.
-License: LGPL-2.1-or-3 with Digia-1.1 exception or GPL-3
+License: LGPL-2.1-or-3 with Digia-1.1 exception
 
 Files: examples/quick/demos/stocqt/content/CheckBox.qml
  examples/quick/demos/samegame/content/SamegameText.qml
@@ -88,7 +89,7 @@ License: BSD-3-clause
 Files: tests/auto/qml/qqmlnotifier/tst_qqmlnotifier.cpp
  tests/benchmarks/qml/qquickwindow/tst_qquickwindow.cpp
 Copyright: 2012 Research In Motion
-License: LGPL-2.1-or-3 with Digia-1.1 exception or GPL-3
+License: LGPL-2.1-or-3 with Digia-1.1 exception
 
 Files: tests/auto/qml/parserstress/tests/*
 Copyright: 1998-2003 Netscape Communications Corporation
@@ -99,8 +100,8 @@ Files: src/qml/qml/qqmllocale.cpp
 Copyright: 1991 AT&T
            2012 Digia Plc and/or its subsidiary(-ies).
 License: custom-qqmllocale
- A portion of the file is LGPL-2.1-or-3 with Digia-1.1 exception or
- GPL-3. A portion is however BSD licensed:
+ A portion of the file is LGPL-2.1-or-3 with Digia-1.1 exception.
+ A portion is however BSD licensed:
  .
  Permission to use, copy, modify, and distribute this software for any
  purpose without fee is hereby granted, provided that this entire notice
@@ -119,7 +120,7 @@ License: custom-qqmllocale
 Files: src/qml/animations/*
        tests/auto/quick/qquickanimations/*
 Copyright: 2014 Jolla Ltd.
-License: LGPL-2.1-or-3 with Digia-1.1 exception or GPL-3
+License: LGPL-2.1-or-3 with Digia-1.1 exception
 
 
 Files: *.qdoc
@@ -244,19 +245,6 @@ License: LGPL-2.1-or-3 with Digia-1.1 exception
  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

-- 
qtdeclarative packaging