[SCM] qttools packaging branch, kubuntu_unstable, updated. debian/5.5.0-1-1-g710169e

Tue Sep 8 16:16:57 UTC 2015

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

The following commit has been merged in the kubuntu_unstable branch:
commit 7b1cd4b635a7c81ff8e7431031a6afddcdfee0fa
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Mon Aug 24 11:41:35 2015 +0300

    Update debian/copyright.
---
 debian/changelog |  1 +
 debian/copyright | 54 ++++++++++++++++++++++++++++++++++--------------------
 2 files changed, 35 insertions(+), 20 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4dffff8..8662e55 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ qttools-opensource-src (5.5.0-1) UNRELEASED; urgency=medium
   * Bump Qt build-dependencies to 5.5.0.
   * Remove symbols missing with GCC 5 from libqt5designer5.symbols.
   * Update .install files for the new release.
+  * Update debian/copyright.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 24 Aug 2015 11:13:38 +0300
 
diff --git a/debian/copyright b/debian/copyright
index b147fb4..de4e7a7 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: 2012-2015 Digia Plc and/or its subsidiary(-ies).
-License: LGPL-2.1-or-3 with Digia-1.1 exception
+Copyright: 2015 The Qt Company Ltd.
+License: LGPL-2.1-or-3 with Qt-1.1 exception
 
 Files: debian/*
 Copyright: 2007-2012 Fathi Boudra <fabo at debian.org>
@@ -14,13 +14,26 @@ Copyright: 2007-2012 Fathi Boudra <fabo at debian.org>
            2005-2007 Brian Nelson <pyro at debian.org>,
            2012 Felix Geyer <fgeyer at debian.org>
            2012-2013 Timo Jyrinki <timo.jyrinki at canonical.com>
-           2013 Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>
-           2014 Dmitry Shachnev <mitya57 at debian.org>
+           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
 
-Files: tests/auto/cmake/test_translation_macros/myi18nobject.cpp tests/auto/cmake/test_translation_macros/some_dir/some_include.h
-Copyright: 2012 Klarälvdalens Datakonsult AB, a KDAB Group company, info at kdab.com
-License: LGPL-2.1-or-3 with Digia-1.1 exception
+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/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
+
+Files: src/qdbus/qdbusviewer/logviewer.*
+Copyright: 2013 Tasuku Suzuki <stasuku at gmail.com>
+License: LGPL-2.1-or-3 with Qt-1.1 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
 
 Files: src/linguist/Qt5LinguistToolsMacros.cmake
 Copyright: 2005-2011 Kitware, Inc.
@@ -54,7 +67,7 @@ Files: examples/*
        src/shared/corecon/corecon.cpp
        src/shared/corecon/ccapi.h
        src/shared/corecon/corecon.h
-Copyright: 2012 Digia Plc and/or its subsidiary(-ies)
+Copyright: 2015 The Qt Company Ltd.
 License: BSD-3-clause
 
 Files: src/assistant/3rdparty/clucene/*
@@ -65,15 +78,15 @@ Copyright: 2003-2006 Ben van Klinken and the CLucene Team
            2003-2006 The Apache Software Foundation
            2003-2006 Jos van den Oever
            2003-2006 Matt J. Weinstein
-           2012 Digia Plc and/or its subsidiary(-ies)
+           2015 The Qt Company Ltd.
 License: Apache-2.0 or LGPL-2.1
 
 Files: src/assistant/clucene/*
 Copyright: 2003-2006 Ben van Klinken and the CLucene Team
-           2012 Digia Plc and/or its subsidiary(-ies)
+           2015 The Qt Company Ltd.
 License: LGPL-2.1
 
-License: LGPL-2.1-or-3 with Digia-1.1 exception
+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
@@ -82,16 +95,17 @@ License: LGPL-2.1-or-3 with Digia-1.1 exception
  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, Digia gives you certain additional
- rights. These rights are described in the Digia Qt LGPL Exception
- version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+ 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`.
  .
- Digia Qt LGPL Exception version 1.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
@@ -143,9 +157,9 @@ License: BSD-3-clause
      notice, this list of conditions and the following disclaimer in
      the documentation and/or other materials provided with the
      distribution.
-   * Neither the name of Digia Plc 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.
+   * 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.
  .
  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -187,12 +201,12 @@ License: Apache-2.0
  can be found in `/usr/share/common-licenses/Apache-2.0`.
 
 Files: *.qdoc
-Copyright: 2012 Digia Plc and/or its subsidiary(-ies).
+Copyright: 2015 The Qt Company Ltd.
 License: GFDL-1.3
 
 Files: src/designer/src/designer/doc/src/designer-manual.qdoc
 Copyright: 2005 Bjoern Bergstroem
-           2012 Digia Plc and/or its subsidiary(-ies).
+           2015 The Qt Company Ltd.
 License: GFDL-1.3
 
 Files: src/makeqpf/Blocks.txt

-- 
qttools packaging

