[SCM] qtxmlpatterns packaging branch, experimental, updated. debian/5.6.1-2-3-gbd303c2
Dmitry Shachnev
mitya57 at moszumanska.debian.org
Wed Jun 29 16:20:25 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtxmlpatterns.git;a=commitdiff;h=fb7d357
The following commit has been merged in the experimental branch:
commit fb7d357afc4c11426eb73e4da580383f28924456
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date: Wed Jun 29 19:18:20 2016 +0300
Update debian/copyright.
---
debian/changelog | 1 +
debian/copyright | 150 ++++++++++++++++++++++++++++++++-----------------------
2 files changed, 88 insertions(+), 63 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 2fe7dcc..6c5c131 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ qtxmlpatterns-opensource-src (5.7.0-1) UNRELEASED; urgency=medium
[ Dmitry Shachnev ]
* New upstream release.
+ * Update debian/copyright.
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Wed, 29 Jun 2016 19:01:12 +0300
diff --git a/debian/copyright b/debian/copyright
index 8739b6a..3472ea3 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: 2015 The Qt Company Ltd.
-License: LGPL-2.1-or-3 with Qt-1.1 exception
+Copyright: 2016 The Qt Company Ltd.
+License: LGPL-3 or GPL-2+
Files: debian/*
Copyright: 2007-2012 Fathi Boudra <fabo at debian.org>
@@ -16,60 +16,12 @@ 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 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
- 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, 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`.
- .
- 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
- such object code under terms of your choice, provided that:
- (i) the header files of the Library have not been modified; and
- (ii) the incorporated material is limited to numerical parameters, data
- structure layouts, accessors, macros, inline functions and
- templates; and
- (iii) you comply with the terms of Section 6 of the GNU Lesser General
- Public License version 2.1.
- .
- Moreover, you may apply this exception to a modified version of the Library,
- provided that such modification does not involve copying material from the
- Library into the modified Library's header files unless such material is
- limited to (i) numerical parameters; (ii) data structure layouts;
- (iii) accessors; and (iv) small macros, templates and inline functions of
- five lines or less in length.
- .
- Furthermore, you are not required to apply this additional permission to a
- modified version of the Library.
-
-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
- 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.
- .
- On Debian systems, the complete text of the LGPL-2.1 license can be found in
- `/usr/share/common-licenses/LGPL-2.1`,
+Files: tests/auto/* tools/*
+Copyright: 2016 The Qt Company Ltd.
+License: GPL-3 with Qt-1.0 exception
Files: examples/* src/xmlpatterns/doc/snippets/*
-Copyright: 2015 The Qt Company Ltd.
+Copyright: 2016 The Qt Company Ltd.
License: BSD-3-clause
You may use this file under the terms of the BSD license as follows:
.
@@ -101,23 +53,95 @@ License: BSD-3-clause
Files: src/xmlpatterns/parser/qquerytransformparser.cpp
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
+ 2016 The Qt Company Ltd.
+License: LGPL-3 or GPL-2+
Files: src/xmlpatterns/api/qtxmlpatternsglobal.h
-Copyright: 2012 Intel Corporation.
-License: LGPL-2.1-or-3 with Qt-1.1 exception
+Copyright: 2016 Intel Corporation.
+License: LGPL-3 or GPL-2+
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.
-License: LGPL-2.1-or-3 with Qt-1.1 exception
+ 2016 The Qt Company Ltd.
+License: LGPL-3 or GPL-2+
Files: *.qdoc
-Copyright: 2015 The Qt Company Ltd.
+Copyright: 2016 The Qt Company Ltd.
License: GFDL-1.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
+ 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.
+ .
+ On Debian systems, the complete text of the GNU Lesser General Public
+ License version 3 can be found in /usr/share/common-licenses/LGPL-3.
+
+License: LGPL-3
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Lesser General Public License version 3
+ as published by the Free Software Foundation.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU Lesser General Public License for more details.
+ .
+ On Debian systems, the complete text of the GNU Lesser General Public
+ License version 3 can be found in /usr/share/common-licenses/LGPL-3.
+
+License: GPL-2+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ On Debian systems, the complete text of the GNU General Public
+ License version 2 can be found in /usr/share/common-licenses/GPL-2.
+
+License: GPL-3 with Qt-1.0 exception
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License version 3 as
+ published by the Free Software Foundation.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ On Debian systems, the complete text of the GNU General Public License
+ version 3 can be found in /usr/share/common-licenses/GPL-3.
+ .
+ The Qt Company GPL Exception 1.0
+ Exception 1:
+ .
+ As a special exception you may create a larger work which contains the
+ output of this application and distribute that work under terms of your
+ choice, so long as the work is not otherwise derived from or based on
+ this application and so long as the work does not in itself generate
+ output that contains the output from this application in its original
+ or modified form.
+ .
+ Exception 2:
+ .
+ As a special exception, you have permission to combine this application
+ with Plugins licensed under the terms of your choice, to produce an
+ executable, and to copy and distribute the resulting executable under
+ the terms of your choice. However, the executable must be accompanied
+ by a prominent notice offering all users of the executable the entire
+ source code to this application, excluding the source code of the
+ independent modules, but including any changes you have made to this
+ application, under the terms of this license.
+
License: GFDL-1.3
GNU Free Documentation License Usage
Alternatively, this file may be used under the terms of the GNU Free
@@ -127,5 +151,5 @@ License: GFDL-1.3
the GNU Free Documentation License version 1.3 requirements
will be met: http://www.gnu.org/copyleft/fdl.html.
.
- On Debian systems, the complete text of the GFDL-1.3 license can be found in
- `/usr/share/common-licenses/GFDL-1.3`,
+ On Debian systems, the complete text of the GNU Free Documentation
+ License version 1.3 can be found in /usr/share/common-licenses/GFDL-1.3.
--
qtxmlpatterns packaging
More information about the pkg-kde-commits
mailing list