[SCM] qtbase packaging branch, master, updated. debian/5.7.1-20161021+dfsg-5-5-g503ccdd

[Dmitry Shachnev]

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

The following commit has been merged in the master branch:
commit 503ccddbb1df74a7240dcca2535f35e0f460ca1d
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Tue Nov 15 14:57:41 2016 +0300

    Merge some more entries in the update-copyright script.
---
 debian/changelog                |  1 +
 debian/copyright                | 22 ++++++----------------
 debian/scripts/update-copyright |  4 ++++
 3 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c498806..146b084 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ qtbase-opensource-src (5.7.1~20161021+dfsg-6) UNRELEASED; urgency=medium
   * Make libqt5network5 depend on libssl1.0.2. It will crash when
     only newer libssl versions are installed.
   * Backport upstream patch to fix build on x32 (fix_build_on_x32.diff).
+  * Merge some more entries in the update-copyright script.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 04 Nov 2016 20:29:15 +0300
 
diff --git a/debian/copyright b/debian/copyright
index 37d739f..91e0469 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -433,12 +433,14 @@ Copyright: 2013 Laszlo Papp <lpapp at kde.org>
 License: GPL-3 with Qt-1.0 exception
 
 Files: tests/auto/corelib/kernel/qmetaenum/tst_qmetaenum.cpp
+       tests/auto/tools/moc/cxx11-enums.h
        tests/auto/tools/moc/dollars.h
-Copyright: 2013-2015 Olivier Goffart <ogoffart at woboq.com>
+Copyright: 2011-2015 Olivier Goffart <ogoffart at woboq.com>
 License: GPL-3 with Qt-1.0 exception
 
 Files: src/tools/moc/generator.cpp
        src/tools/moc/moc.cpp
+       src/tools/moc/preprocessor.cpp
        src/tools/moc/symbols.h
        tests/auto/corelib/global/qlogging/tst_qlogging.cpp
        tests/auto/corelib/kernel/qmetamethod/tst_qmetamethod.cpp
@@ -449,33 +451,21 @@ Copyright: 2013-2016 Olivier Goffart <ogoffart at woboq.com>
            2016 The Qt Company Ltd.
 License: GPL-3 with Qt-1.0 exception
 
-Files: src/tools/moc/preprocessor.cpp
-Copyright: 2014 Olivier Goffart <ogoffart at woboq.org>
-           2016 The Qt Company Ltd.
-License: GPL-3 with Qt-1.0 exception
-
-Files: tests/auto/tools/moc/cxx11-enums.h
-Copyright: 2011 Olivier Goffart.
-License: GPL-3 with Qt-1.0 exception
-
 Files: tests/auto/corelib/tools/qdatetime/tst_qdatetime_mac.mm
 Copyright: 2014 Petroules Corporation.
            2016 The Qt Company Ltd.
 License: GPL-3 with Qt-1.0 exception
 
 Files: tests/benchmarks/corelib/kernel/qcoreapplication/main.cpp
-Copyright: 2011 Robin Burchell <robin+qt at viroteck.net>
+       tests/benchmarks/corelib/tools/qstack/main.cpp
+Copyright: 2011-2015 Robin Burchell <robin.burchell at viroteck.net>
 License: GPL-3 with Qt-1.0 exception
 
 Files: tests/benchmarks/corelib/tools/qalgorithms/tst_qalgorithms.cpp
-Copyright: 2012 Robin Burchell <robin+qt at viroteck.net>
+Copyright: 2012 Robin Burchell <robin.burchell at viroteck.net>
            2016 The Qt Company Ltd.
 License: GPL-3 with Qt-1.0 exception
 
-Files: tests/benchmarks/corelib/tools/qstack/main.cpp
-Copyright: 2015 Robin Burchell <robin.burchell at viroteck.net>
-License: GPL-3 with Qt-1.0 exception
-
 Files: tests/auto/corelib/tools/qmessageauthenticationcode/tst_qmessageauthenticationcode.cpp
 Copyright: 2013 Ruslan Nigmatullin <euroelessar at yandex.ru>
 License: GPL-3 with Qt-1.0 exception
diff --git a/debian/scripts/update-copyright b/debian/scripts/update-copyright
index 9f0d7a7..1cc6172 100755
--- a/debian/scripts/update-copyright
+++ b/debian/scripts/update-copyright
@@ -69,6 +69,10 @@ def canonicalize_author_name(author):
         return 'Ivan Komissarov <ABBAPOH at gmail.com>'
     if 'Martsum - tmartsum[at]gmail.com' in author:
         return 'Thorbjørn Lund Martsum <tmartsum at gmail.com>'
+    if 'Olivier Goffart' in author:
+        return 'Olivier Goffart <ogoffart at woboq.com>'
+    if 'Robin Burchell' in author:
+        return 'Robin Burchell <robin.burchell at viroteck.net>'
     return author
 
 

-- 
qtbase packaging