[SCM] qtxmlpatterns packaging branch, experimental, updated. debian/5.4.0-1-3-gd34c2fd

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit 5b1cc6ae2d9222b74502924e7d77ce90ca2fd11f
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sat Jan 17 15:46:58 2015 +0300

    Update debian/copyright.
---
 debian/changelog |  2 ++
 debian/copyright | 16 ++--------------
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b5ff99c..cac816a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 qtxmlpatterns-opensource-src (5.4.0-2) UNRELEASED; urgency=medium
 
+  [ Dmitry Shachnev ]
+  * Update debian/copyright.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 17 Jan 2015 15:45:51 +0300
 
diff --git a/debian/copyright b/debian/copyright
index 64eb02a..8c02464 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,7 +4,7 @@ Source: http://releases.qt-project.org/qt5/*/submodules/
 
 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>
@@ -18,6 +18,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>
+           2014-2015 Dmitry Shachnev <mitya57 at debian.org>
 License: LGPL-2.1
 
 License: LGPL-2.1-or-3 with Digia-1.1 exception
@@ -60,19 +61,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

-- 
qtxmlpatterns packaging