[SCM] qtscript packaging branch, master, updated. 32368362713dd885ce337489a2ed170b843f6db5

[Timo Jyrinki]

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

The following commit has been merged in the master branch:
commit 32368362713dd885ce337489a2ed170b843f6db5
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Tue Jan 8 13:26:43 2013 +0000

    Update copyright for Nokia -> Digia
---
 debian/copyright |   55 ++++++++++++++++++++++++++---------------------------
 1 files changed, 27 insertions(+), 28 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index f0fe3bf..cb481a4 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,9 +3,10 @@ Upstream-Name: qtscript-opensource-src
 Source: http://releases.qt-project.org/qt5/5.0.0/submodules_tar/
 
 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 or GPL-3
+License: LGPL-2.1 with Digia Qt LGPL Exception 1.1 or GPL-3
 
 Files: debian/*
 Copyright: 2007-2012 Fathi Boudra <fabo at debian.org>
@@ -15,38 +16,35 @@ Copyright: 2007-2012 Fathi Boudra <fabo at debian.org>
            2005-2007 Brian Nelson <pyro at debian.org>
            2012 Zoltán Balogh <zoltan at bakter.hu>
            2012 Timo Jyrinki <timo.jyrinki at canonical.com>
-License: LGPL-2.1
+License: LGPL-2.1 with Digia Qt LGPL Exception 1.1
 
-License: LGPL-2.1 with Nokia Qt LGPL exception
- GNU Lesser General Public License Usage
- .
- Alternatively, this file may be used under the terms of the GNU Lesser
- General Public License version 2.1 as published by the Free Software
- Foundation and appearing in the file LICENSE.LGPL included in the
- packaging of this file.  Please review the following information to
- ensure the GNU Lesser General Public License version 2.1 requirements
- will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
- .
- In addition, as a special exception, Nokia gives you certain
- additional rights. These rights are described in the Nokia Qt LGPL
- Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
- package.
+License: LGPL-2.1 with Digia Qt LGPL Exception 1.1
+ GNU Lesser General Public License version 2.1:
+ This file may be used under the terms of the GNU Lesser General Public
+ License version 2.1 as published by the Free Software Foundation and
+ appearing in the file LICENSE.LGPL included in the packaging of this
+ file. Please review the following information to ensure the GNU Lesser
+ General Public License version 2.1 requirements will be met:
+ http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
  .
- On Debian systems, the complete text of the LGPL-2.1 license can be found in
- `/usr/share/common-licenses/LGPL-2.1`,
+ 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.
  .
- Nokia Qt LGPL Exception version 1.1
+ On Debian systems, the complete text of the GNU Lesser General Public License
+ can be found in `/usr/share/common-licenses/LGPL-2.1`.
  .
+ Digia Qt 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
  such object code under terms of your choice, provided that:
-    (i)   the header files of the Library have not been modified; and
-    (ii)  the incorporated material is limited to numerical parameters, data
-          structure layouts, accessors, macros, inline functions and
-          templates; and
-    (iii) you comply with the terms of Section 6 of the GNU Lesser General
-          Public License version 2.1.
+     (i)   the header files of the Library have not been modified; and
+     (ii)  the incorporated material is limited to numerical parameters, data
+           structure layouts, accessors, macros, inline functions and
+           templates; and
+     (iii) you comply with the terms of Section 6 of the GNU Lesser General
+           Public License version 2.1.
  .
  Moreover, you may apply this exception to a modified version of the Library,
  provided that such modification does not involve copying material from the
@@ -84,9 +82,10 @@ License: LGPL-2.1
 
 
 Files: examples/*
-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
+License: BSD-3-clause
  You may use this file under the terms of the BSD license as follows:
  .
  "Redistribution and use in source and binary forms, with or without

-- 
qtscript packaging