[SCM] qtbase packaging branch, master, updated. 299ffdcd69be6743ffeed4f8ac648507e90fb111

[Fathi Boudra]

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

The following commit has been merged in the master branch:
commit 299ffdcd69be6743ffeed4f8ac648507e90fb111
Author: Fathi Boudra <fathi.boudra at linaro.org>
Date:   Sun Jan 6 14:11:35 2013 +0200

    Update copyright: Qt has been transferred to Digia.
---
 debian/copyright |   17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 7964ce1..b4a98ba 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,24 +3,26 @@ Upstream-Name: qtbase-opensource-src
 Source: http://origin.releases.qt-project.org/qt5
 
 Files: *
-Copyright: 2008-2012 Nokia Corporation and/or its subsidiary(-ies)
+Copyright: 2012-2013 Digia Plc and/or its subsidiary(-ies)
+           2008-2012 Nokia Corporation and/or its subsidiary(-ies)
            1994-2008 Trolltech ASA.
-License: LGPL-2.1 with Nokia Qt LGPL Exception 1.1 or GPL-3
+License: LGPL-2.1 with Digia Qt LGPL Exception 1.1 or GPL-3
 
 Files: examples/* src/*/doc/snippets/* tests/manual/qlocale/*
        src/winmain/qtmain_win.cpp
-Copyright: 2008-2012 Nokia Corporation and/or its subsidiary(-ies)
+Copyright: 2012-2013 Digia Plc and/or its subsidiary(-ies)
+           2008-2012 Nokia Corporation and/or its subsidiary(-ies)
            1994-2008 Trolltech ASA.
 License: BSD-3-clause
 
 Files: debian/*
-Copyright: 2007-2012 Fathi Boudra <fabo at debian.org>
-           2007-2012 Sune Vuorela <debian at pusling.com>
+Copyright: 2007-2013 Fathi Boudra <fabo at debian.org>
+           2007-2013 Sune Vuorela <debian at pusling.com>
            2008-2012 Modestas Vainius <modax at debian.org>
            2007-2009 Ana Beatriz Guerrero Lopez <ana at debian.org>
            2005-2007 Brian Nelson <pyro at debian.org>
-           2012 Zoltán Balogh <zoltan at bakter.hu>
-           2012 Timo Jyrinki <timo at debian.org>
+           2012-2013 Zoltán Balogh <zoltan at bakter.hu>
+           2012-2013 Timo Jyrinki <timo at debian.org>
 License: LGPL-2.1 with Nokia Qt LGPL Exception 1.1
 
 Files: src/testlib/3rdparty/callgrind_p.h
@@ -38,6 +40,7 @@ Copyright: 1998-2005 David Turner
            2000-2007 Red Hat, Inc
            2006 Behdad Esfahbod
            2008-2012 Nokia Corporation and/or its subsidiary(-ies)
+           2012-2013 Digia Plc and/or its subsidiary(-ies)
 License:
  Permission is hereby granted, without written agreement and without
  license or royalty fees, to use, copy, modify, and distribute this

-- 
qtbase packaging