[SCM] qtbase packaging branch, experimental, updated. debian/5.7.0+dfsg-3-8-g4669c77

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit ebc8a1ec07d53f07fd37053fc87d693eea0bbcfb
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Fri Oct 21 11:18:23 2016 +0300

    Merge copyright entries for one more upstream author.
---
 debian/copyright                | 16 +++++-----------
 debian/scripts/update-copyright |  2 ++
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 4497f64..0446015 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -166,10 +166,6 @@ License: GFDL-1.3
 
 ## GPL-3 with Qt-1.0 exception
 
-Files: tests/manual/dialogs/messageboxpanel.h
-Copyright: 2013 2013 Thorbjørn Lund Martsum - tmartsum[at]gmail.com
-License: GPL-3 with Qt-1.0 exception
-
 Files: tests/auto/cmake/test_add_binary_resources_delayed_file/main.cpp
 Copyright: 2015 André Klitzing <aklitzing at gmail.com>
 License: GPL-3 with Qt-1.0 exception
@@ -496,7 +492,7 @@ License: GPL-3 with Qt-1.0 exception
 
 Files: tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp
 Copyright: 2016 The Qt Company Ltd.
-           2012 Thorbjørn Lund Martsum - tmartsum[at]gmail.com
+           2012 Thorbjørn Lund Martsum <tmartsum at gmail.com>
 License: GPL-3 with Qt-1.0 exception
 
 Files: tests/auto/corelib/tools/qbytearraylist/tst_qbytearraylist.cpp
@@ -512,20 +508,18 @@ Files: tests/benchmarks/gui/itemviews/qheaderview/qheaderviewbench.cpp
        tests/manual/corelib/tools/qvarlengtharray/main.cpp
        tests/manual/corelib/tools/qvector/main.cpp
        tests/manual/dialogs/messageboxpanel.cpp
+       tests/manual/dialogs/messageboxpanel.h
        tests/manual/widgets/itemviews/autoResizePrecision/tablehorz/testtable1.cpp
        tests/manual/widgets/itemviews/autoResizePrecision/tablevert/testtable2.cpp
        tests/manual/widgets/itemviews/autoResizePrecision/treeview/testtree.cpp
        tests/manual/widgets/itemviews/delegate/example.cpp
        tests/manual/widgets/itemviews/qheaderview/qheaderviewtest1.cpp
        tests/manual/widgets/itemviews/qtreewidget/main.cpp
+       tests/manual/widgets/kernel/layoutreplace/main.cpp
        tests/manual/widgets/kernel/qtooltip/main.cpp
-       tests/manual/widgets/qgraphicsview/rubberband/rubberbandtest.cpp
-Copyright: 2012-2013 Thorbjørn Lund Martsum - tmartsum[at]gmail.com
-License: GPL-3 with Qt-1.0 exception
-
-Files: tests/manual/widgets/kernel/layoutreplace/main.cpp
        tests/manual/widgets/kernel/sizeonhide/main.cpp
-Copyright: 2013 Thorbjørn Martsum - tmartsum[at]gmail.com
+       tests/manual/widgets/qgraphicsview/rubberband/rubberbandtest.cpp
+Copyright: 2012-2013 Thorbjørn Lund Martsum <tmartsum at gmail.com>
 License: GPL-3 with Qt-1.0 exception
 
 ## LGPL-2.1-or-3 with Qt-1.1 exception
diff --git a/debian/scripts/update-copyright b/debian/scripts/update-copyright
index 6d66249..5e23129 100755
--- a/debian/scripts/update-copyright
+++ b/debian/scripts/update-copyright
@@ -67,6 +67,8 @@ def canonicalize_author_name(author):
         return 'BlackBerry Limited (formerly Research In Motion)'
     if 'Ivan Komissarov' in 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>'
     return author
 
 

-- 
qtbase packaging