[SCM] qtwayland packaging branch, experimental, updated. debian/5.7.1-20161021-2-11-gcfe3427

Dmitry Shachnev mitya57 at moszumanska.debian.org
Sun May 28 12:14:40 UTC 2017 

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

The following commit has been merged in the experimental branch:
commit c70b91ce45e832f32437bfb2f26ad78ae0789ba6
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sun May 28 14:59:32 2017 +0300

    Update debian/copyright.
---
 debian/changelog |   1 +
 debian/copyright | 143 +++++++++++++++++++------------------------------------
 2 files changed, 49 insertions(+), 95 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6b67fdf..cfb0e82 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ qtwayland-opensource-src (5.9.0~rc-1) UNRELEASED; urgency=medium
     - Qt Wayland Client library has no public API, all symbols are private.
   * Add debian/clean file.
   * Do not use gold linker, to keep the symbols versioned.
+  * Update debian/copyright.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 28 May 2017 10:56:28 +0300
 
diff --git a/debian/copyright b/debian/copyright
index 08ca17d..05f6741 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,35 +3,49 @@ Upstream-Name: qtwayland-opensource-src
 Source: https://download.qt.io/official_releases/qt/*/submodules/
 
 Files: *
-Copyright: 2015-2016 The Qt Company Ltd.
-License: LGPL-3 or GPL-2+
+Copyright: 2015-2017 The Qt Company Ltd.
+License: LGPL-3 or GPL-2
 
 Files: debian/*
-Copyright: 2014-2016 Dmitry Shachnev <mitya57 at debian.org>
-License: LGPL-3 or GPL-2+
+Copyright: 2014-2017 Dmitry Shachnev <mitya57 at debian.org>
+License: LGPL-3 or GPL-2
 
 Files: config.tests/*
        examples/*
        src/extensions/*
+       tests/manual/*
 Copyright: 2015-2016 The Qt Company Ltd.
 License: BSD-3-clause
 
+Files: tests/auto/*
+Copyright: 2016 The Qt Company Ltd.
+License: GPL-3 with Qt-1.0 exception
+
 Files: src/compositor/compositor_api/*
 Copyright: 2015 The Qt Company Ltd.
            2014 Jolla Ltd
-License: LGPL-3 or GPL-2+
+License: LGPL-3 or GPL-2
 
 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*
-Copyright: 2014-2015 Pier Luigi Fiorini <pierluigi.fiorini at gmail.com>
-           2014 Jolla Ltd
-License: LGPL-3 or GPL-2+
+       src/compositor/compositor_api/qwaylandsurface.*
+       src/compositor/extensions/qwaylandwlshell.cpp
+Copyright: 2017 Pier Luigi Fiorini <pierluigi.fiorini at gmail.com>
+           2017 The Qt Company Ltd.
+License: LGPL-3 or GPL-2
+
+Files: src/compositor/compositor_api/qwaylandquickcompositor.cpp
+       src/compositor/compositor_api/qwaylandsurface_p.h
+Copyright: 2017 Pier Luigi Fiorini <pierluigi.fiorini at gmail.com>
+           2017 Jolla Ltd
+License: LGPL-3 or GPL-2
 
 Files: examples/wayland/pure-qml/qml/Keyboard.qml
-       src/compositor/compositor_api/qwaylandkeyboard*
+Copyright: 2017 Klarälvdalens Datakonsult AB (KDAB)
+License: BSD-3-clause
+
+Files: src/compositor/compositor_api/qwaylandkeyboard*
        src/compositor/compositor_api/qwaylanddrag*
        src/compositor/compositor_api/qwaylandinputmethodcontrol*
        src/compositor/compositor_api/qwaylandpointer_p.h
@@ -39,26 +53,14 @@ Files: examples/wayland/pure-qml/qml/Keyboard.qml
        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
+Copyright: 2017 The Qt Company Ltd.
+           2017 Klarälvdalens Datakonsult AB (KDAB)
+License: LGPL-3 or GPL-2
 
 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
+Copyright: 2016-2017 Pier Luigi Fiorini <pierluigi.fiorini at gmail.com>
+           2017 Klarälvdalens Datakonsult AB (KDAB)
+License: LGPL-3 or GPL-2
 
 Files: src/client/shellintegration/*
        src/hardwareintegration/*/libhybris-egl-server/*
@@ -101,7 +103,7 @@ Copyright: 2008-2013 Kristian Høgsberg
            2015-2016 Jan Arne Petersen
 License: Expat
 
-Files: tests/auto/client/mockinput.h
+Files: tests/auto/client/client/mockinput.h
 Copyright: 2016 The Qt Company Ltd.
            2016 Klarälvdalens Datakonsult AB (KDAB)
 License: GPL-3 with Qt-1.0 exception
@@ -113,24 +115,30 @@ License: LGPL-3 or GPL-2
 
 Files: src/client/global/qwaylandclientextension*
 Copyright: 2016 Erik Larsson
-License: LGPL-3 or GPL-2+
+License: LGPL-3 or GPL-2
 
-Files: examples/wayland/custom-extension/qmltestapp/main.cpp
-       examples/wayland/custom-extension/qmltestapp/main.cpp
+Files: examples/wayland/custom-extension/qml-client/main.cpp
+       examples/wayland/custom-extension/qml-client/main.qml
 Copyright: 2016 Erik Larsson
 License: BSD-3-clause
 
+Files: examples/wayland/multi-screen/qml/*
+Copyright: 2017 The Qt Company Ltd.
+           2017 Pier Luigi Fiorini <pierluigi.fiorini at gmail.com>
+License: BSD-3-clause
+
 Files: src/client/qwaylandbuffer.cpp
-Copyright: 2015 Giulio Camuffo
-License: LGPL-2.1-or-3 with Qt-1.1 exception
+Copyright: 2017 The Qt Company Ltd.
+           2017 Giulio Camuffo
+License: LGPL-3 or GPL-2
 
 Files: src/plugins/shellintegration/ivi-shell/*
-Copyright: 2015 ITAGE Corporation
-License: LGPL-2.1-or-3 with Qt-1.1 exception
+Copyright: 2017 ITAGE Corporation
+License: LGPL-3 or GPL-2
 
-Files: tests/auto/compositor/mockseat.*
-       tests/auto/compositor/testinputdevice.*
-       tests/auto/compositor/testkeyboardgrabber.*
+Files: tests/auto/compositor/compositor/mockseat.*
+       tests/auto/compositor/compositor/testkeyboardgrabber.*
+       tests/auto/compositor/compositor/testseat.*
 Copyright: 2016 LG Electronics, Inc.
 License: GPL-3 with Qt-1.0 exception
 
@@ -155,20 +163,6 @@ License: GPL-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.
 
-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
@@ -203,47 +197,6 @@ License: GPL-3 with Qt-1.0 exception
  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:
- 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-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

-- 
qtwayland packaging

More information about the pkg-kde-commits mailing list