[SCM] qtwayland packaging branch, experimental, updated. debian/5.6.1-2-16-g1b0292b
Dmitry Shachnev
mitya57 at moszumanska.debian.org
Fri Jul 8 20:10:47 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtwayland.git;a=commitdiff;h=41202a7
The following commit has been merged in the experimental branch:
commit 41202a72cb836cb6f4be218553ddcb53d4fe1ce6
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date: Fri Jul 8 22:50:54 2016 +0300
Massive debian/copyright update.
---
debian/changelog | 1 +
debian/copyright | 211 +++++++++++++++++++++++++++++++++++++++++++------------
2 files changed, 169 insertions(+), 43 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index ac934dd..6a67784 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,7 @@ qtwayland-opensource-src (5.7.0-1) UNRELEASED; urgency=medium
* Bump libwayland-dev build-dependency to 1.6.0, following upstream.
* Build and install the Qt Wayland Compositor documentation.
* Migrate to automatic dbgsym packages.
+ * Massive debian/copyright update.
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Tue, 28 Jun 2016 15:05:14 +0200
diff --git a/debian/copyright b/debian/copyright
index 75662fe..08ca17d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,102 +3,205 @@ Upstream-Name: qtwayland-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: 2015-2016 The Qt Company Ltd.
+License: LGPL-3 or GPL-2+
Files: debian/*
-Copyright: 2014-2015 Dmitry Shachnev <mitya57 at debian.org>
-License: LGPL-2.1
+Copyright: 2014-2016 Dmitry Shachnev <mitya57 at debian.org>
+License: LGPL-3 or GPL-2+
Files: config.tests/*
examples/*
- src/compositor/*
- src/hardwareintegration/compositor/*
-Copyright: 2015 The Qt Company Ltd.
+ src/extensions/*
+Copyright: 2015-2016 The Qt Company Ltd.
License: BSD-3-clause
Files: src/compositor/compositor_api/*
Copyright: 2015 The Qt Company Ltd.
2014 Jolla Ltd
-License: BSD-3-clause and LGPL-2.1-or-3 with Qt-1.1 exception
+License: LGPL-3 or GPL-2+
-Files: src/compositor/compositor_api/qwaylandinputpanel*
- src/compositor/compositor_api/qwaylanddrag*
-Copyright: 2013 Klarälvdalens Datakonsult AB (KDAB)
-License: BSD-3-clause
-
-Files: src/compositor/compositor_api/qwaylandcompositor.cpp
- src/compositor/compositor_api/qwaylandoutput.*
+Files: src/compositor/compositor_api/qwaylandclient.*
+ src/compositor/compositor_api/qwaylandcompositor*
src/compositor/compositor_api/qwaylandquickcompositor.cpp
src/compositor/compositor_api/qwaylandquickoutput.*
- src/compositor/compositor_api/qwaylandsurface.*
- src/compositor/wayland_wrapper/qwlcompositor_p.h
+ src/compositor/compositor_api/qwaylandsurface*
Copyright: 2014-2015 Pier Luigi Fiorini <pierluigi.fiorini at gmail.com>
2014 Jolla Ltd
-License: LGPL-2.1-or-3 with Qt-1.1 exception
+License: LGPL-3 or GPL-2+
+
+Files: examples/wayland/pure-qml/qml/Keyboard.qml
+ src/compositor/compositor_api/qwaylandkeyboard*
+ src/compositor/compositor_api/qwaylanddrag*
+ src/compositor/compositor_api/qwaylandinputmethodcontrol*
+ src/compositor/compositor_api/qwaylandpointer_p.h
+ src/compositor/compositor_api/qwaylandresource.*
+ src/compositor/compositor_api/qwaylandsurfacegrabber.*
+ src/compositor/compositor_api/qwaylandtouch_p.h
+ src/compositor/extensions/qwaylandtextinput*
+Copyright: 2013-2016 Klarälvdalens Datakonsult AB (KDAB)
+License: BSD-3-clause
+
+Files: src/compositor/compositor_api/qwaylandoutput*
+Copyright: 2014-2015 Pier Luigi Fiorini <pierluigi.fiorini at gmail.com>
+ 2013 Klarälvdalens Datakonsult AB (KDAB)
+License: LGPL-3 or GPL-2+
+
+Files: src/compositor/extensions/qwaylandwlshell.cpp
+Copyright: 2014 Pier Luigi Fiorini <pierluigi.fiorini at gmail.com>
+License: LGPL-3 or GPL-2+
+
+Files: examples/wayland/server-buffer/compositor/main.cpp
+Copyright: 2014 Pier Luigi Fiorini <pierluigi.fiorini at gmail.com>
+License: BSD-3-clause
Files: src/compositor/wayland_wrapper/*
Copyright: 2015 The Qt Company Ltd.
2013 Klarälvdalens Datakonsult AB (KDAB)
License: BSD-3-clause
-Files: src/compositor/wayland_wrapper/qwllistener*
-Copyright: 2014 Jolla Ltd
-License: LGPL-2.1-or-3 with Qt-1.1 exception
-
Files: src/client/shellintegration/*
src/hardwareintegration/*/libhybris-egl-server/*
src/plugins/hardwareintegration/*/libhybris-egl-server/main.cpp
-Copyright: 2014 Jolla Ltd
-License: LGPL-2.1-or-3 with Qt-1.1 exception
+ src/shared/qwaylandxkb*
+Copyright: 2014-2016 Jolla Ltd
+License: LGPL-3 or GPL-2
Files: config.tests/libhybris_egl_server/main.cpp
src/extensions/libhybris-egl-server-buffer.xml
Copyright: 2014 Jolla Ltd
License: BSD-3-clause
-Files: src/client/qwaylanddatadevice*
+Files: src/client/qwaylanddatadevice.cpp
+ src/client/qwaylanddatadevice_p.h
src/client/qwaylandinputcontext*
-Copyright: 2013 Klarälvdalens Datakonsult AB (KDAB)
-License: BSD-3-clause
+ src/shared/qwaylandinputmethodeventbuilder*
+Copyright: 2016 Klarälvdalens Datakonsult AB (KDAB)
+License: LGPL-3 or GPL-2
Files: src/client/qwaylandabstractdecoration*
src/client/qwaylanddecorationfactory*
src/client/qwaylanddecorationplugin*
src/plugins/decorations/bradient/main.cpp
-Copyright: 2014 Robin Burchell <robin.burchell at viroteck.net>
-License: LGPL-2.1-or-3 with Qt-1.1 exception
+Copyright: 2016 Robin Burchell <robin.burchell at viroteck.net>
+License: LGPL-3 or GPL-2
Files: src/client/qwaylandxdgshell*
Copyright: 2014 Eurogiciel
-License: LGPL-2.1-or-3 with Qt-1.1 exception
+License: LGPL-3 or GPL-2
Files: src/3rdparty/protocol/*
Copyright: 2008-2013 Kristian Høgsberg
2010-2013 Intel Corporation
+ 2012-2013 Collabora, Ltd.
2013 Rafael Antognolli
2013 Jasper St. Pierre
+ 2013 DENSO CORPORATION
+ 2013 BMW Car IT GmbH
+ 2015-2016 Jan Arne Petersen
License: Expat
Files: tests/auto/client/mockinput.h
-Copyright: 2013 Klarälvdalens Datakonsult AB (KDAB)
-License: LGPL-2.1-or-3 with Qt-1.1 exception
+Copyright: 2016 The Qt Company Ltd.
+ 2016 Klarälvdalens Datakonsult AB (KDAB)
+License: GPL-3 with Qt-1.0 exception
Files: src/client/inputdeviceintegration/qwaylandinputdeviceintegration*
- tests/auto/compositor/testkeyboardgrabber*
-Copyright: 2014 LG Electronics, Inc.
+ src/client/qwaylandshm*
+Copyright: 2016 LG Electronics, Inc.
+License: LGPL-3 or GPL-2
+
+Files: src/client/global/qwaylandclientextension*
+Copyright: 2016 Erik Larsson
+License: LGPL-3 or GPL-2+
+
+Files: examples/wayland/custom-extension/qmltestapp/main.cpp
+ examples/wayland/custom-extension/qmltestapp/main.cpp
+Copyright: 2016 Erik Larsson
+License: BSD-3-clause
+
+Files: src/client/qwaylandbuffer.cpp
+Copyright: 2015 Giulio Camuffo
+License: LGPL-2.1-or-3 with Qt-1.1 exception
+
+Files: src/plugins/shellintegration/ivi-shell/*
+Copyright: 2015 ITAGE Corporation
License: LGPL-2.1-or-3 with Qt-1.1 exception
-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.
+Files: tests/auto/compositor/mockseat.*
+ tests/auto/compositor/testinputdevice.*
+ tests/auto/compositor/testkeyboardgrabber.*
+Copyright: 2016 LG Electronics, Inc.
+License: GPL-3 with Qt-1.0 exception
+
+Files: tests/manual/subsurface/*
+Copyright: 2015 LG Electronics Inc
+License: BSD-3-clause
+
+Files: *.qdoc
+Copyright: 2015-2016 The Qt Company Ltd.
+License: GFDL-NIV-1.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 version 2 as
+ published by the Free Software Foundation.
.
- On Debian systems, the complete text of the GNU Lesser General Public
- License 2.1 can be found in `/usr/share/common-licenses/LGPL-2.1`.
+ 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-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: LGPL-2.1-or-3 with Qt-1.1 exception
GNU Lesser General Public License:
@@ -141,6 +244,28 @@ 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.
+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: GFDL-NIV-1.3
+ 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 GNU Free Documentation
+ License version 1.3 can be found in /usr/share/common-licenses/GFDL-1.3.
+
License: BSD-3-clause
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
--
qtwayland packaging
More information about the pkg-kde-commits
mailing list