[SCM] qtwebsockets packaging branch, master, updated. debian/5.6.1-2-3-g9f8bd62
Simon Quigley
tsimonq2-guest at moszumanska.debian.org
Sat Sep 10 11:15:38 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtwebsockets.git;a=commitdiff;h=9f8bd62
The following commit has been merged in the master branch:
commit 9f8bd621b60368f99a5b397bcc235f348137ca04
Author: Simon Quigley <tsimonq2 at ubuntu.com>
Date: Sat Sep 10 06:15:33 2016 -0500
Update debian/copyright
---
debian/changelog | 1 +
debian/copyright | 163 ++++++++++++++++++++++++++++++++++---------------------
2 files changed, 101 insertions(+), 63 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index e208fc2..4ed085e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ qtwebsockets-opensource-src (5.7.0-1) UNRELEASED; urgency=medium
[ Simon Quigley ]
* New upstream release.
* Bump Qt build-dependencies to 5.7.0.
+ * Update debian/copyright.
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Sat, 10 Sep 2016 05:25:12 -0500
diff --git a/debian/copyright b/debian/copyright
index 5ce1f5e..a70b752 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,8 +3,8 @@ Upstream-Name: qtwebsockets-opensource-src
Source: https://download.qt.io/official_releases/qt/*/submodules/
Files: *
-Copyright: 2014 Kurt Pattyn <pattyn.kurt at gmail.com>
-License: LGPL-2.1-or-3 with Qt-1.1 exception
+Copyright: 2016 Kurt Pattyn <pattyn.kurt at gmail.com>
+License: LGPL-3 or GPL-2
Files: debian/*
Copyright: 2007-2012 Fathi Boudra <fabo at debian.org>
@@ -15,87 +15,124 @@ Copyright: 2007-2012 Fathi Boudra <fabo at debian.org>
2012 Zoltán Balogh <zoltan.balogh at canonical.com>
2012-2013 Timo Jyrinki <timo.jyrinki at canonical.com>
2013-2014 Dmitry Shachnev <mitya57 at debian.org>
-License: LGPL-2.1
+ 2016 Simon Quigley <tsimonq2 at ubuntu.com>
+License: LGPL-3 or GPL-2
Files: src/websockets/doc/src/*.qdoc
-Copyright: 2013-2014 Kurt Pattyn <pattyn.kurt at gmail.com>
+Copyright: 2013-2016 Kurt Pattyn <pattyn.kurt at gmail.com>
License: GFDL-NIV-1.3
Files: examples/websockets/doc/*.qdoc
-Copyright: 2015 The Qt Company Ltd.
+Copyright: 2016 The Qt Company Ltd.
License: GFDL-NIV-1.3
Files: tests/auto/qml/qmlwebsockets/tst_qmlwebsockets.*
tests/auto/qml/qmlwebsockets_compat/tst_qmlwebsockets_compat.*
-Copyright: 2015 The Qt Company Ltd.
-License: LGPL-2.1-or-3 with Qt-1.1 exception
+Copyright: 2016 The Qt Company Ltd.
+License: GPL-3 with Qt-1.0 exception
Files: examples/websockets/doc/qmlwebsocketserver.qdoc
examples/websockets/qmlwebsocketserver/*
- src/imports/qmlwebsockets/qqmlwebsocketserver.*
-Copyright: 2014 Klarälvdalens Datakonsult AB, a KDAB Group company
-License: LGPL-2.1-or-3 with Qt-1.1 exception
+Copyright: 2016 Klarälvdalens Datakonsult AB, a KDAB Group company
+License: BSD-3-clause
-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.
+Files: src/imports/qmlwebsockets/qqmlwebsocketserver.*
+Copyright: 2016 Klarälvdalens Datakonsult AB, a KDAB Group company
+License: LGPL-3 or GPL-2
+
+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 version 2 as
+ published by the Free Software Foundation.
.
- 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.
+ 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 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`.
+ 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:
.
- 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.
+ 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.
.
- 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.
+ Exception 2:
.
- Furthermore, you are not required to apply this additional permission to a
- modified version of the Library.
+ 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: 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.
+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: BSD-3-clause
+ You may use this file under the terms of the BSD license as follows:
+ .
+ "Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in
+ the documentation and/or other materials provided with the
+ distribution.
+ * 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.
.
- On Debian systems, the complete text of the LGPL-2.1 license can be found in
- `/usr/share/common-licenses/LGPL-2.1`,
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
License: GFDL-NIV-1.3
- GNU Free Documentation License Usage
- Alternatively, this file may be used under the terms of the GNU Free
- Documentation License version 1.3 as published by the Free Software
- Foundation and appearing in the file included in the packaging of
- this file. Please review the following information to ensure
- the GNU Free Documentation License version 1.3 requirements
- will be met: http://www.gnu.org/copyleft/fdl.html.
+ Permission is granted to copy, distribute and/or modify this document
+ under the terms of the GNU Free Documentation License, Version 1.3
+ or any later version published by the Free Software Foundation;
+ with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
.
- 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.
--
qtwebsockets packaging
More information about the pkg-kde-commits
mailing list