[SCM] qtbase packaging branch, experimental, updated. debian/5.9.0+dfsg-1-12-g1256dd7

Dmitry Shachnev mitya57 at moszumanska.debian.org
Sat Jul 1 07:30:51 UTC 2017


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

The following commit has been merged in the experimental branch:
commit c9f0d2c86317e7fd6ab6143e3b12d35ce4425e9b
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sat Jul 1 10:28:18 2017 +0300

    Update debian/copyright.
---
 debian/changelog |  1 +
 debian/copyright | 21 ++++++++++++---------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 053ea5a..6b35265 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ qtbase-opensource-src (5.9.1+dfsg-1) UNRELEASED; urgency=medium
   * Add a patch to fix ATSPI enablement condition (fix_atspi_condition.diff).
   * Update install files for the new release.
   * Bump Standards-Version to 4.0.0, no changes needed.
+  * Update debian/copyright.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 08 Jun 2017 13:48:28 +0300
 
diff --git a/debian/copyright b/debian/copyright
index 6d67eda..99c5221 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -17,7 +17,7 @@ Files-Excluded: src/3rdparty/zlib/doc/rfc*.txt
 # Manual rules for The Qt Company copyrights
 
 Files: *
-Copyright: 2016 The Qt Company Ltd.
+Copyright: 2016-2017 The Qt Company Ltd.
 License: LGPL-3 or GPL-2
 
 Files: configure
@@ -26,7 +26,7 @@ Files: configure
        src/tools/*
        tests/*
        util/*
-Copyright: 2016 The Qt Company Ltd.
+Copyright: 2016-2017 The Qt Company Ltd.
 License: GPL-3 with Qt-1.0 exception
 
 Files: examples/*
@@ -40,11 +40,11 @@ Files: examples/*
        src/winmain/qtmain_win.cpp
        src/winmain/qtmain_winrt.cpp
        tests/auto/corelib/global/qglobalstatic/tst_qglobalstatic.cpp
-Copyright: 2016 The Qt Company Ltd.
+Copyright: 2016-2017 The Qt Company Ltd.
 License: BSD-3-clause
 
 Files: *.qdoc
-Copyright: 2016 The Qt Company Ltd.
+Copyright: 2016-2017 The Qt Company Ltd.
 License: GFDL-NIV-1.3
 
 # Debian packaging copyright
@@ -57,7 +57,7 @@ Copyright: 2007-2013 Fathi Boudra <fabo at debian.org>
            2005-2007 Brian Nelson <pyro at debian.org>
            2012-2013 Zoltán Balogh <zoltan.balogh at canonical.com>
            2012-2013 Timo Jyrinki <timo.jyrinki at canonical.com>
-           2013-2016 Dmitry Shachnev <mitya57 at debian.org>
+           2013-2017 Dmitry Shachnev <mitya57 at debian.org>
 License: LGPL-3 or GPL-2+
 
 # Auto-generated rules for non-3rdparty code
@@ -287,7 +287,8 @@ Files: tests/auto/corelib/io/qipaddress/tst_qipaddress.cpp
        tests/benchmarks/corelib/tools/qcryptographichash/main.cpp
        tests/manual/qdesktopservices/tst_qdesktopservices.cpp
        tests/manual/qsysinfo/main.cpp
-Copyright: 2016 Intel Corporation.
+       util/includemocs/includemocs.pl
+Copyright: 2016-2017 Intel Corporation.
 License: GPL-3 with Qt-1.0 exception
 
 Files: tests/auto/network/kernel/qdnslookup/tst_qdnslookup.cpp
@@ -748,7 +749,7 @@ License: LGPL-3 or GPL-2
 
 Files: src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java
        src/plugins/platforms/android/qandroidinputcontext.cpp
-Copyright: 2012-2014 BogDan Vatra <bogdan at kde.org>
+Copyright: 2012-2017 BogDan Vatra <bogdan at kde.org>
            2016 Olivier Goffart <ogoffart at woboq.com>
            2016 The Qt Company Ltd.
 License: LGPL-3 or GPL-2
@@ -901,6 +902,8 @@ Files: mkspecs/common/integrity/qplatformdefs.h
        mkspecs/integrity-armv7-imx6/qplatformdefs.h
        mkspecs/integrity-armv7/qplatformdefs.h
        mkspecs/integrity-x86/qplatformdefs.h
+       src/platformsupport/input/integrityhid/qintegrityhidmanager.cpp
+       src/platformsupport/input/integrityhid/qintegrityhidmanager.h
        src/plugins/platforms/integrity/qintegrityhidmanager.cpp
        src/plugins/platforms/integrity/qintegrityhidmanager.h
 Copyright: 2015 Green Hills Software
@@ -928,8 +931,8 @@ Files: config.tests/common/atomic64/atomic64.cpp
        config.tests/unix/eventfd/main.cpp
        mkspecs/features/data/unix/findclasslist.pl
        src/corelib/global/qglobal_p.h
-       src/corelib/global/qglobalstatic.cpp
        src/corelib/global/qglobalstatic.h
+       src/corelib/global/qglobalstatic.qdoc
        src/corelib/global/qversiontagging.cpp
        src/corelib/global/qversiontagging.h
        src/corelib/io/forkfd_qt.cpp
@@ -1103,7 +1106,7 @@ Files: bin/syncqt.pl
        src/testlib/qtestcase.cpp
        src/widgets/kernel/qwidget.cpp
 Copyright: 2016 Intel Corporation.
-           2016 The Qt Company Ltd.
+           2016-2017 The Qt Company Ltd.
 License: LGPL-3 or GPL-2
 
 Files: src/corelib/tools/qbytearraylist.h

-- 
qtbase packaging



More information about the pkg-kde-commits mailing list