[SCM] qtwebchannel packaging branch, master, updated. debian/5.6.1-1-18-ga833ef2
Sandro Knauß
hefee at moszumanska.debian.org
Sun Oct 30 18:17:53 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtwebchannel.git;a=commitdiff;h=a833ef2
The following commit has been merged in the master branch:
commit a833ef28f355d284639c0d4c7fd6ffcaa5345051
Author: Sandro Knauß <hefee at debian.org>
Date: Sun Oct 30 19:12:54 2016 +0100
update copyright informations
---
debian/changelog | 2 +-
debian/copyright | 148 +++++++++++++++++++++++++++++++++++++++++++++++--------
2 files changed, 128 insertions(+), 22 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index eac922f..87da478 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,7 +15,7 @@ qtwebchannel-opensource-src (5.7.1~20161021-1) experimental; urgency=medium
* Update my mailaddress to hefee at debian.org one.
* Added Multi-Arch hinters for arch=all packages.
- -- Sandro Knauß <hefee at debian.org> Sun, 30 Oct 2016 16:11:42 +0100
+ -- Sandro Knauß <hefee at debian.org> Sun, 30 Oct 2016 19:12:58 +0100
qtwebchannel-opensource-src (5.6.1-1) unstable; urgency=medium
diff --git a/debian/copyright b/debian/copyright
index e0e6248..b062e32 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,10 +4,8 @@ Source: https://download.qt.io/official_releases/qt/*/submodules/
Files: *
Copyright: 2016, Klarälvdalens Datakonsult AB, a KDAB Group company, info at kdab.com, author Milian Wolff <milian.wolff at kdab.com>
2016, The Qt Company Ltd
- 2016, basysKom GmbH, author Bernd Lamecker <bernd.lamecker at basyskom.com>
2016, basysKom GmbH, author Lutz Schönemann <lutz.schoenemann at basyskom.com>
- 2016, basysKom GmbH, author Sumedha Widyadharma <sumedha.widyadharma at basyskom.com>
-License: LGPL-2.1-or-3 with Qt-1.1 exception
+License: GPL-3 with Qt-1.0 Exception
Files: debian/*
Copyright: 2016 Scarlett Clark <sgclark at kubuntu.org>
@@ -15,13 +13,74 @@ Copyright: 2016 Scarlett Clark <sgclark at kubuntu.org>
2016 Simon Quigley <tsimonq2 at ubuntu.com>
License: LGPL-2+
-Files: src/webchannel/doc/src/index.qdoc
+Files: src/*
+Copyright: 2016, Klarälvdalens Datakonsult AB, a KDAB Group company, info at kdab.com, author Milian Wolff <milian.wolff at kdab.com>
+ 2016, The Qt Company Ltd
+License: LGPL-3 or GPL-2-or-3 with KDE Exception
+
+Files: examples/*
+Copyright: 2016, Klarälvdalens Datakonsult AB, a KDAB Group company, info at kdab.com, author Milian Wolff <milian.wolff at kdab.com>
+ 2016, The Qt Company Ltd
+ 2016, basysKom GmbH, author Bernd Lamecker <bernd.lamecker at basyskom.com>
+ 2016, basysKom GmbH, author Lutz Schönemann <lutz.schoenemann at basyskom.com>
+ 2016, basysKom GmbH, author Sumedha Widyadharma <sumedha.widyadharma at basyskom.com>
+License: BSD-3-clause
+
+Files: tests/auto/qml/testobject.cpp
+ tests/auto/qml/testobject.h
+Copyright: 2016, Klarälvdalens Datakonsult AB, a KDAB Group company, info at kdab.com, author Milian Wolff <milian.wolff at kdab.com>
+License: LGPL-2.1-or-3 with Qt-1.1 Exception
+
+Files: src/webchannel/doc/src/external-resources.qdoc
+ src/webchannel/doc/src/index.qdoc
src/webchannel/doc/src/javascript.qdoc
src/webchannel/doc/src/module.qdoc
Copyright: 2014 Klarälvdalens Datakonsult AB, a KDAB Group company <info at kdab.com>
License: GFDL-NIV-1.3
-License: LGPL-2.1-or-3 with Qt-1.1 exception
+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 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
+ 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: LGPL-2+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+ .
+ This library 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
+ Library General Public License for more details.
+ .
+ The complete text of the GNU Library General Public License version 2 can be
+ found in `/usr/share/common-licenses/LGPL-2'.
+
+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
@@ -35,11 +94,6 @@ License: LGPL-2.1-or-3 with Qt-1.1 exception
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
@@ -61,20 +115,38 @@ License: LGPL-2.1-or-3 with Qt-1.1 exception
.
Furthermore, you are not required to apply this additional permission to a
modified version of the Library.
+ .
+ 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`.
-License: LGPL-2+
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
+License: LGPL-3
+ This file may be used under the terms of the GNU Lesser General Public
+ License version 3 as published by the Free Software Foundation and
+ appearing in the file LICENSE.LGPL3 included in the packaging of this file.
+ Please review the following information to ensure the GNU Lesser General
+ Public License version 3 requirements will be met:
+ https://www.gnu.org/licenses/lgpl-3.0.html.
.
- This library 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
- Library 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-or-3 with KDE Exception
+ This file may be used under the terms of the GNU General Public License
+ version 2.0 or (at your option) the GNU General Public license version 3
+ or any later version approved by the KDE Free Qt Foundation.
+ The licenses are as published by the Free Software Foundation and appearing
+ in the file LICENSE.GPL2 and LICENSE.GPL3 included in the packaging of this
+ file. Please review the following information to ensure the GNU General Public
+ License requirements will be met:
+ https://www.gnu.org/licenses/gpl-2.0.html and
+ https://www.gnu.org/licenses/gpl-3.0.html.
.
- The complete text of the GNU Library General Public License version 2 can be
- found in `/usr/share/common-licenses/LGPL-2'.
+ On Debian systems, the complete text of the GNU General Public License
+ version 2 can be found in `/usr/share/common-licenses/GPL-2`.
+ The complete text of the GNU General Public License version 3 can be found
+ in `/usr/share/common-licenses/GPL-3`.
License: GFDL-NIV-1.3
Permission is granted to copy, distribute and/or modify this document
@@ -84,3 +156,37 @@ License: GFDL-NIV-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.
+
+License: GPL-3 with Qt-1.0 Exception
+ GNU General Public License Usage
+ Alternatively, this file may be used under the terms of the GNU
+ General Public License version 3 as published by the Free Software
+ Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+ included in the packaging of this file. Please review the following
+ information to ensure the GNU General Public License requirements will
+ be met: https://www.gnu.org/licenses/gpl-3.0.html.
+ .
+ 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.
+ .
+ On Debian systems, the complete text of the GNU General Public License
+ version 3 can be found in `/usr/share/common-licenses/GPL-3`.
+
+
--
qtwebchannel packaging
More information about the pkg-kde-commits
mailing list