[SCM] qtwebkit-examples packaging branch, master, updated. debian/5.7.1-20161021-2-5-g7d10db6

[Dmitry Shachnev]

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

The following commit has been merged in the master branch:
commit 7d10db6f7a9bd5a5d3c4f4058629346470148dda
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Wed Jan 4 21:13:06 2017 +0300

    Update debian/copyright.
---
 debian/changelog |  1 +
 debian/copyright | 33 ++++++++++++++++++++++++---------
 2 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b587002..cc1f785 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ qtwebkit-examples-opensource-src (5.7.1+dfsg-1) UNRELEASED; urgency=medium
   * Update the debian/watch file.
   * Migrate to an automatic dbgsym package.
   * Drop unused pkg-kde-tools build-dependency.
+  * Update debian/copyright.
 
  -- Dmitry Shachnev <mitya57 at debian.org>  Wed, 04 Jan 2017 20:06:01 +0300
 
diff --git a/debian/copyright b/debian/copyright
index 566a84d..3039efb 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -16,7 +16,7 @@ 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>
+           2014-2017 Dmitry Shachnev <mitya57 at debian.org>
 License: LGPL-2.1
 
 Files: examples/webkitwidgets/browser/*
@@ -24,6 +24,10 @@ Files: examples/webkitwidgets/browser/*
 Copyright: 2015 The Qt Company Ltd.
 License: LGPL-2.1-or-3 with Qt-1.1 exception
 
+Files: *.qdoc
+Copyright: 2015 The Qt Company Ltd.
+License: GFDL-NIV-1.3
+
 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
@@ -94,12 +98,23 @@ License: BSD-3-clause
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 
 License: LGPL-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.
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Lesser General Public License version 2.1
+ as published by the Free Software Foundation.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU Lesser General Public License for more details.
+ .
+ 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.
+
+License: GFDL-NIV-1.3
+ Permission is granted to copy, distribute and/or modify this document
+ under the terms of the GNU Free Documentation License, Version 1.3
+ or any later version published by the Free Software Foundation;
+ with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
  .
- On Debian systems, the complete text of the GNU Lesser General Public License
- can be found in `/usr/share/common-licenses/LGPL-2.1`.
+ On Debian systems, the complete text of the GNU Free Documentation
+ License version 1.3 can be found in /usr/share/common-licenses/GFDL-1.3.

-- 
qtwebkit-examples packaging