[SCM] qtscript packaging branch, experimental, updated. debian/5.4.0+dfsg-1-4-g69b4b36

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit 69b4b3639d86108c2bd76cbefa0e36dcc457b7f5
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Fri Jan 23 18:41:49 2015 +0300

    Update debian/copyright.
---
 debian/changelog |  3 +++
 debian/copyright | 20 ++++----------------
 2 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 656f989..d60fe6e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,9 @@ qtscript-opensource-src (5.4.0+dfsg-2) UNRELEASED; urgency=medium
     build on GNU/kFreeBSD, making sure that pthread_np.h is not used;
     patch upstream_Disable-pthread_np.h-on-BSD-w-GNU-libc.patch.
 
+  [ Dmitry Shachnev ]
+  * Update debian/copyright.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 27 Dec 2014 19:39:55 +0100
 
 qtscript-opensource-src (5.4.0+dfsg-1) experimental; urgency=medium
diff --git a/debian/copyright b/debian/copyright
index fe9b1bd..0dfb5c3 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,7 +6,7 @@ Files-Excluded: tests/benchmarks/script/sunspider
 
 Files: *
 Copyright: 2012-2013 Digia Plc and/or its subsidiary(-ies)
-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>
@@ -15,18 +15,19 @@ License: Expat
 
 Files: debian/*
 Copyright: 2007-2012 Fathi Boudra <fabo at debian.org>
-           2007-2012 Sune Vuorela <debian at pusling.com>
+           2007-2015 Sune Vuorela <debian at pusling.com>
            2008-2012 Modestas Vainius <modax at debian.org>
            2007-2009 Ana Beatriz Guerrero Lopez <ana at debian.org>
            2005-2007 Brian Nelson <pyro at debian.org>
            2012 Zoltán Balogh <zoltan.balogh at canonical.com>
            2012-2013 Timo Jyrinki <timo.jyrinki at canonical.com>
            2013 Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>
+           2014-2015 Dmitry Shachnev <mitya57 at debian.org>
 License: LGPL-2.1
 
 Files: tests/auto/qscriptqwidgets/tst_qscriptqwidgets.cpp
 Copyright: 2012 Klarälvdalens Datakonsult AB, a KDAB Group company
-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
 Copyright: 2012 Digia Plc and/or its subsidiary(-ies).
@@ -465,19 +466,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

-- 
qtscript packaging