[SCM] qtxmlpatterns packaging branch, experimental, updated. debian/5.4.2-2-2-ge800bdf

Wed Aug 5 17:02:47 UTC 2015

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

The following commit has been merged in the experimental branch:
commit e800bdf4992d7b8d7fadc6a612a4012d2bc82a04
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Wed Aug 5 20:02:40 2015 +0300

    Update debian/copyright.
---
 debian/changelog |  2 ++
 debian/copyright | 41 ++++++++++++++++++++++++++---------------
 2 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 65e0c46..ffb6991 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 qtxmlpatterns-opensource-src (5.5.0-1) UNRELEASED; urgency=medium
 
+  [ Dmitry Shachnev ]
+  * Update debian/copyright.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 05 Aug 2015 19:50:36 +0300
 
diff --git a/debian/copyright b/debian/copyright
index 7ecd45a..7006312 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,8 +3,8 @@ Upstream-Name: qtxmlpatterns-opensource-src
 Source: https://download.qt.io/official_releases/qt/*/submodules/
 
 Files: *
-Copyright: 2012-2014 Digia Plc and/or its subsidiary(-ies)
-License: LGPL-2.1-or-3 with Digia-1.1 exception
+Copyright: 2015 The Qt Company Ltd.
+License: LGPL-2.1-or-3 with Qt-1.1 exception
 
 Files: debian/*
 Copyright: 2007-2012 Fathi Boudra <fabo at debian.org>
@@ -16,7 +16,7 @@ Copyright: 2007-2012 Fathi Boudra <fabo at debian.org>
            2014-2015 Dmitry Shachnev <mitya57 at debian.org>
 License: LGPL-2.1
 
-License: LGPL-2.1-or-3 with Digia-1.1 exception
+License: LGPL-2.1-or-3 with Qt-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 or version 3 as published by the Free Software
@@ -25,16 +25,17 @@ License: LGPL-2.1-or-3 with Digia-1.1 exception
  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.
+ In addition, as a special exception, The Qt Company gives you certain
+ additional rights. These rights are described in The Qt Company 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 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:
+ The Qt Company LGPL Exception version 1.1:
  As an additional permission to the GNU Lesser General Public License version
  2.1, the object code form of a "work that uses the Library" may incorporate
  material from a header file that is part of the Library.  You may distribute
@@ -68,7 +69,7 @@ License: LGPL-2.1
  `/usr/share/common-licenses/LGPL-2.1`,
 
 Files: examples/* src/xmlpatterns/doc/snippets/*
-Copyright: 2012-2013 Digia Plc and/or its subsidiary(-ies)
+Copyright: 2015 The Qt Company Ltd.
 License: BSD-3-clause
  You may use this file under the terms of the BSD license as follows:
  .
@@ -81,9 +82,9 @@ License: BSD-3-clause
      notice, this list of conditions and the following disclaimer in
      the documentation and/or other materials provided with the
      distribution.
-   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-     of its contributors may be used to endorse or promote products derived
-     from this software without specific prior written permission.
+   * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) nor the
+     names of its contributors may be used to endorse or promote products
+     derived from this software without specific prior written permission.
  .
  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -98,12 +99,22 @@ License: BSD-3-clause
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 
 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-or-3 with Digia-1.1 exception
+       src/xmlpatterns/parser/qquerytransformparser_p.h
+Copyright: 1984, 1989-1990, 2000-2011 Free Software Foundation, Inc
+           2015 The Qt Company Ltd.
+License: LGPL-2.1-or-3 with Qt-1.1 exception
+
+Files: src/xmlpatterns/api/qtxmlpatternsglobal.h
+Copyright: 2012 Intel Corporation.
+License: LGPL-2.1-or-3 with Qt-1.1 exception
+
+Files: src/xmlpatterns/environment/qreportcontext_p.h
+       src/xmlpatterns/environment/createReportContext.xsl
+Copyright: 2005 W3C (MIT, ERCIM, Keio), All Rights Reserved
+           2015 The Qt Company Ltd.
 
 Files: *.qdoc
-Copyright: 2012 Digia Plc and/or its subsidiary(-ies).
+Copyright: 2015 The Qt Company Ltd.
 License: GFDL-1.3
 
 License: GFDL-1.3

-- 
qtxmlpatterns packaging

