[SCM] qtwebkit-examples packaging branch, master, updated. debian/5.5.1+dfsg-1

[Lisandro Damián Nicanor Pérez]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtwebkit-examples.git;a=commitdiff;h=1a986ec

The following commit has been merged in the master branch:
commit 1a986ec229377260c38699131c654d626930b30a
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sat Aug 29 15:51:02 2015 +0300

    Update debian/copyright.
---
 debian/changelog |  1 +
 debian/copyright | 36 +++++++++++++++---------------------
 2 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d2e0c5e..2c77ba3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ qtwebkit-examples-opensource-src (5.5.0+dfsg-1) UNRELEASED; urgency=medium
   [ Dmitry Shachnev ]
   * New upstream release.
   * Bump Qt build-dependencies to 5.5.0.
+  * Update debian/copyright.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 29 Aug 2015 15:39:05 +0300
 
diff --git a/debian/copyright b/debian/copyright
index eebad96..566a84d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,8 +4,8 @@ Source: https://download.qt.io/official_releases/qt/*/submodules/
 Files-Excluded: examples/webkitwidgets/fancybrowser/jquery.min.js
 
 Files: *
-Copyright: 2012-2013 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: BSD-3-clause
 
 Files: debian/*
 Copyright: 2007-2012 Fathi Boudra <fabo at debian.org>
@@ -16,22 +16,15 @@ Copyright: 2007-2012 Fathi Boudra <fabo at debian.org>
            2012 Felix Geyer <fgeyer at debian.org>
            2012-2013 Timo Jyrinki <timo.jyrinki at canonical.com>
            2013 Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>
+           2014-2015 Dmitry Shachnev <mitya57 at debian.org>
 License: LGPL-2.1
 
-Files: examples/webkitqml/shared/main.cpp
- examples/webkitwidgets/imageanalyzer/*
- examples/webkitwidgets/framecapture/*
- examples/webkitwidgets/scroller/*
- examples/webkitwidgets/simpleselector/*
- examples/webkitwidgets/domtraversal/*
- examples/webkitwidgets/fancybrowser/*
- examples/webkitwidgets/previewer/*
- examples/webkitwidgets/formextractor/*
- examples/webkitwidgets/xmlpatterns/qobjectxmlmodel/*
-Copyright: 2012 Digia Plc and/or its subsidiary(-ies)
-License: BSD-3-clause
+Files: examples/webkitwidgets/browser/*
+       examples/webkitwidgets/embedded/*
+Copyright: 2015 The Qt Company Ltd.
+License: LGPL-2.1-or-3 with Qt-1.1 exception
 
-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
@@ -40,16 +33,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
@@ -83,8 +77,8 @@ 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
+   * Neither the name of The Qt Company Ltd 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

-- 
qtwebkit-examples packaging