[SCM] qtxmlpatterns packaging branch, experimental, updated. debian/5.3.2-2-3-ge8f9357

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit e8f935778f895d4a54ee51519fbd7ab13faeff2e
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sat Dec 13 15:39:01 2014 +0300

    Update debian/copyright to reflect LGPLv3 addition.
---
 debian/changelog |  1 +
 debian/copyright | 24 +++++++++++++-----------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index acccc87..6754c73 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ qtxmlpatterns-opensource-src (5.4.0-1) UNRELEASED; urgency=medium
   [ Dmitry Shachnev ]
   * New upstream release.
   * Build-depend on qtbase 5.4.0.
+  * Update debian/copyright to reflect LGPLv3 addition.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 12 Dec 2014 18:32:02 +0300
 
diff --git a/debian/copyright b/debian/copyright
index aa824d5..64eb02a 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 with Digia Qt LGPL Exception 1.1 or GPL-3
+License: LGPL-2.1-or-3 with Digia-1.1 exception or GPL-3
 
 Files: debian/mark_private_symbols.sh
 Copyright: 2013 Sune Vuorela <sune at debian.org>
@@ -20,21 +20,23 @@ Copyright: 2007-2012 Fathi Boudra <fabo at debian.org>
            2012-2013 Timo Jyrinki <timo.jyrinki at canonical.com>
 License: LGPL-2.1
 
-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
@@ -115,7 +117,7 @@ License: BSD-3-clause
 Files: src/xmlpatterns/parser/qquerytransformparser.cpp
 Copyright: 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc
            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: *.qdoc
 Copyright: 2012 Digia Plc and/or its subsidiary(-ies).

-- 
qtxmlpatterns packaging