[SCM] qttools packaging branch, experimental, updated. debian/5.6.1-2-4-g5d80c20

Dmitry Shachnev mitya57 at moszumanska.debian.org
Fri Jul 8 09:32:57 UTC 2016 

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

The following commit has been merged in the experimental branch:
commit 5d80c204959155e260be8472e886b528d8a455bc
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Fri Jul 8 12:32:09 2016 +0300

    Update debian/copyright.
---
 debian/changelog |   1 +
 debian/copyright | 232 ++++++++++++++++++++++++++++++-------------------------
 2 files changed, 127 insertions(+), 106 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bc8fae2..4c5f56f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ qttools-opensource-src (5.7.0-1) UNRELEASED; urgency=medium
   * New upstream release.
   * Bump Qt build-dependencies to 5.7.0.
   * Install upstream manpages for lrelease and lupdate.
+  * Update debian/copyright.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 08 Jul 2016 11:27:42 +0300
 
diff --git a/debian/copyright b/debian/copyright
index de4e7a7..f7c80a5 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,8 +3,8 @@ Upstream-Name: qttools-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: GPL-3 with Qt-1.0 exception
 
 Files: debian/*
 Copyright: 2007-2012 Fathi Boudra <fabo at debian.org>
@@ -15,32 +15,47 @@ Copyright: 2007-2012 Fathi Boudra <fabo at debian.org>
            2012 Felix Geyer <fgeyer at debian.org>
            2012-2013 Timo Jyrinki <timo.jyrinki at canonical.com>
            2013-2015 Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>
-           2014-2015 Dmitry Shachnev <mitya57 at debian.org>
-License: LGPL-2.1
+           2014-2016 Dmitry Shachnev <mitya57 at debian.org>
+License: LGPL-3 or GPL-2
+
+Files: src/assistant/help/*
+       src/assistant/shared/*
+       src/designer/src/lib/uilib/*
+       src/qtestlib/wince/*
+       src/shared/*
+       src/winrtrunner/*
+Copyright: 2015-2016 The Qt Company Ltd.
+License: LGPL-3 or GPL-2
 
 Files: src/linguist/lupdate/main.cpp
-       src/qtplugininfo/qtplugininfo.cpp
-       tests/auto/cmake/test_translation_macros/myi18nobject.cpp
-       tests/auto/cmake/test_translation_macros/some_dir/some_include.h
+       tests/auto/cmake/test_add_translation_macro/myi18nobject.cpp
+       tests/auto/cmake/test_add_translation_macro/some_dir/some_include.h
+       tests/auto/cmake/test_create_translation_macro/some_dir/some_include.h
+       tests/auto/cmake/test_create_translation_macro/myi18nobject.cpp
        tests/auto/linguist/lupdate/testdata/good/tr_function_alias/main.cpp
-Copyright: 2012-2015 Klarälvdalens Datakonsult AB, a KDAB Group company, info at kdab.com
-License: LGPL-2.1-or-3 with Qt-1.1 exception
+Copyright: 2016 Klarälvdalens Datakonsult AB, a KDAB Group company, info at kdab.com
+License: GPL-3 with Qt-1.0 exception
+
+Files: src/qtplugininfo/qtplugininfo.cpp
+Copyright: 2016 Klarälvdalens Datakonsult AB, a KDAB Group company, info at kdab.com
+           2016 Intel Corporation
+License: GPL-3 with Qt-1.0 exception
 
 Files: src/qdbus/qdbusviewer/logviewer.*
-Copyright: 2013 Tasuku Suzuki <stasuku at gmail.com>
-License: LGPL-2.1-or-3 with Qt-1.1 exception
+Copyright: 2016 Tasuku Suzuki <stasuku at gmail.com>
+License: GPL-3 with Qt-1.0 exception
 
 Files: tests/auto/cmake/test_uiplugin_module/my_designer_plugin.cpp
        tests/auto/cmake/test_uiplugin_via_designer/my_designer_plugin.cpp
-Copyright: 2015 Stephen Kelly <steveire at gmail.com>
-License: LGPL-2.1-or-3 with Qt-1.1 exception
+Copyright: 2016 Stephen Kelly <steveire at gmail.com>
+License: GPL-3 with Qt-1.0 exception
 
 Files: src/linguist/Qt5LinguistToolsMacros.cmake
 Copyright: 2005-2011 Kitware, Inc.
 License: BSD-3-clause
 
 Files: src/qtpaths/*
-Copyright: 2013 Sune Vuorela <sune at kde.org>
+Copyright: 2016 Sune Vuorela <sune at kde.org>
 License: BSD-3-clause
 
 Files: tests/auto/linguist/lconvert/data/*.po
@@ -49,25 +64,13 @@ Copyright: 2001, 2003 Free Software Foundation, Inc.
 License: GPL-2+
 
 Files: examples/*
-       src/linguist/linguist/doc/snippets/doc_src_linguist-manual.cpp
-       src/assistant/help/doc/snippets/doc_src_qthelp.cpp
-       src/assistant/assistant/doc/snippets/simpletextviewer/assistant.cpp
-       src/assistant/assistant/doc/snippets/simpletextviewer/mainwindow.cpp
-       src/assistant/assistant/doc/snippets/simpletextviewer/findfiledialog.cpp
-       src/designer/src/uitools/doc/snippets/quiloader/*
-       src/designer/src/designer/doc/snippets/manual/doc_src_designer-manual.cpp
-       src/designer/src/designer/doc/snippets/imagedialog/main.cpp
-       src/designer/src/designer/doc/snippets/multipleinheritance/*
-       src/designer/src/designer/doc/snippets/uitools/calculatorform/main.cpp
-       src/designer/src/designer/doc/snippets/singleinheritance/*
-       src/designer/src/designer/doc/snippets/noautoconnection/*
-       src/designer/src/designer/doc/snippets/plugins/doc_src_qtdesigner.cpp
-       src/designer/src/designer/doc/snippets/lib/*
-       src/designer/src/designer/doc/snippets/autoconnection/*
-       src/shared/corecon/corecon.cpp
-       src/shared/corecon/ccapi.h
-       src/shared/corecon/corecon.h
-Copyright: 2015 The Qt Company Ltd.
+       src/assistant/assistant/doc/snippets/*
+       src/assistant/help/doc/snippets/*
+       src/designer/src/designer/doc/snippets/*
+       src/designer/src/uitools/doc/snippets/*
+       src/linguist/linguist/doc/snippets/*
+       src/shared/corecon/*
+Copyright: 2016 The Qt Company Ltd.
 License: BSD-3-clause
 
 Files: src/assistant/3rdparty/clucene/*
@@ -83,67 +86,8 @@ License: Apache-2.0 or LGPL-2.1
 
 Files: src/assistant/clucene/*
 Copyright: 2003-2006 Ben van Klinken and the CLucene Team
-           2015 The Qt Company Ltd.
-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: 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.
- .
- You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- .
- On Debian systems, the complete text of the GNU Public Licenses can be found
- in `/usr/share/common-licenses/GPL-2`.
+           2016 The Qt Company Ltd.
+License: LGPL-3 or GPL-2
 
 License: BSD-3-clause
  You may use this file under the terms of the BSD license as follows:
@@ -173,16 +117,92 @@ License: BSD-3-clause
  (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: 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.
+ .
+ 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
- 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.
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Lesser General Public License version 2.1
+ 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-2.1.
+
+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
- can be found in `/usr/share/common-licenses/LGPL-2.1`.
+ 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: Apache-2.0
  Licensed under the Apache License, Version 2.0 (the "License");
@@ -201,12 +221,12 @@ License: Apache-2.0
  can be found in `/usr/share/common-licenses/Apache-2.0`.
 
 Files: *.qdoc
-Copyright: 2015 The Qt Company Ltd.
+Copyright: 2016 The Qt Company Ltd.
 License: GFDL-1.3
 
 Files: src/designer/src/designer/doc/src/designer-manual.qdoc
 Copyright: 2005 Bjoern Bergstroem
-           2015 The Qt Company Ltd.
+           2016 The Qt Company Ltd.
 License: GFDL-1.3
 
 Files: src/makeqpf/Blocks.txt
@@ -251,5 +271,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.

-- 
qttools packaging

More information about the pkg-kde-commits mailing list