[SCM] qtscript packaging branch, experimental, updated. debian/5.4.2+dfsg-4-4-g0cb7c50

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit 0cb7c5011a8aa0ca9a662a25813d3c832a3dfe36
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sat Aug 22 20:55:51 2015 +0300

    Update debian/copyright.
---
 debian/changelog |  1 +
 debian/copyright | 28 ++++++++++++++--------------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 067cfc5..b69d755 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ qtscript-opensource-src (5.5.0+dfsg-1) UNRELEASED; urgency=medium
   [ Dmitry Shachnev ]
   * New upstream release.
   * Bump qtbase5-private-dev build-dependency to 5.5.0.
+  * Update debian/copyright.
   * Simplify and update libqt5script5.symbols (and fix syntax errors).
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 22 Aug 2015 20:36:01 +0300
diff --git a/debian/copyright b/debian/copyright
index b759ca1..66a2c93 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,8 +5,8 @@ Files-Excluded: tests/benchmarks/script/sunspider
                 tests/benchmarks/script/v8
 
 Files: *
-Copyright: 2012-2014 Digia Plc and/or its subsidiary(-ies)
-License: LGPL-2.1-or-3 with Digia-1.1 exception
+Copyright: 2015 The Qt Company Ltd.
+License: LGPL-2.1-or-3 with Qt-1.1 exception
 
 Files: debian/*
 Copyright: 2007-2012 Fathi Boudra <fabo at debian.org>
@@ -22,10 +22,10 @@ License: LGPL-2.1
 
 Files: tests/auto/qscriptqwidgets/tst_qscriptqwidgets.cpp
 Copyright: 2012 Klarälvdalens Datakonsult AB, a KDAB Group company
-License: LGPL-2.1-or-3 with Digia-1.1 exception
+License: LGPL-2.1-or-3 with Qt-1.1 exception
 
 Files: *.qdoc
-Copyright: 2012 Digia Plc and/or its subsidiary(-ies).
+Copyright: 2015 The Qt Company Ltd.
 License: GFDL-NIV-1.3
 
 Files: src/3rdparty/ce-compat/*
@@ -164,7 +164,7 @@ Files: examples/*
  src/3rdparty/javascriptcore/JavaScriptCore/pcre/pcre_exec.cpp
  src/3rdparty/javascriptcore/JavaScriptCore/parser/SourceProvider.h
  src/3rdparty/javascriptcore/JavaScriptCore/parser/SourceCode.h
-Copyright: 2012-2013 Digia Plc and/or its subsidiary(-ies)
+Copyright: 2015 The Qt Company Ltd.
            2008 Cameron Zwarich <cwzwarich at uwaterloo.ca>
            2008-2009 Apple Inc. All rights reserved
            1997-2006 University of Cambridge
@@ -182,10 +182,9 @@ License: BSD-3-clause
      notice, this list of conditions and the following disclaimer in
      the documentation and/or other materials provided with the
      distribution.
-   * Neither the name of Digia Plc and its Subsidiary(-ies) nor
-     the names of its contributors may be used to endorse or promote
-     products derived from this software without specific prior written
-     permission.
+   * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) nor the
+     names of its contributors may be used to endorse or promote products
+     derived from this software without specific prior written permission.
  .
  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -421,7 +420,7 @@ License: LGPL-2.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`.
 
-License: LGPL-2.1-or-3 with Digia-1.1 exception
+License: LGPL-2.1-or-3 with Qt-1.1 exception
  GNU Lesser General Public License:
  This file may be used under the terms of the GNU Lesser General Public
  License version 2.1 or version 3 as published by the Free Software
@@ -430,16 +429,17 @@ License: LGPL-2.1-or-3 with Digia-1.1 exception
  information to ensure the GNU Lesser General Public License requirements
  will be met: https://www.gnu.org/licenses/lgpl.html.
  .
- 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.
+ In addition, as a special exception, The Qt Company gives you certain
+ additional rights. These rights are described in The Qt Company Qt LGPL
+ Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
+ package.
  .
  On Debian systems, the complete text of the GNU Lesser General Public
  License version 2.1 can be found in `/usr/share/common-licenses/LGPL-2.1`.
  The complete text of the GNU Lesser General Public License version 3 can be
  found in `/usr/share/common-licenses/LGPL-3`.
  .
- Digia Qt LGPL Exception version 1.1:
+ The Qt Company 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

-- 
qtscript packaging