[qgis] 04/06: Update copyright file.

[Bas Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository qgis.

commit be7a2ba0a352b739db1a67dcc81dc888bcf473da
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Sep 24 09:11:52 2016 +0200

    Update copyright file.
    
    Changes:
    - Add license & copyright for QtWebKit files.
---
 debian/changelog |  2 ++
 debian/copyright | 16 ++++++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index de49a0f..27451f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ qgis (2.14.7+dfsg-1) UNRELEASED; urgency=medium
 
   [ Bas Couwenberg ]
   * New upstream release.
+  * Update copyright file, changes:
+    - Add license & copyright for QtWebKit files.
 
  -- Bas Couwenberg <sebastic at debian.org>  Sat, 24 Sep 2016 08:49:21 +0200
 
diff --git a/debian/copyright b/debian/copyright
index 460ca6a..13bfe1b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -298,6 +298,22 @@ Comment: Voronoi diagram calculator/ Delaunay triangulator
  Steve Fortune's homepage: http://netlib.bell-labs.com/cm/cs/who/sjf/index.html
 License: GPL-2+
 
+Files: python/QtWebKit/*
+Copyright: 2015, Riverbank Computing Limited <info at riverbankcomputing.com>
+License: QtWebKit
+ This file may be used under the terms of the GNU General Public License
+ version 3.0 as published by the Free Software Foundation and appearing in
+ the file LICENSE included in the packaging of this file.  Please review the
+ following information to ensure the GNU General Public License version 3.0
+ requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+ .
+ If you do not wish to use this file under the terms of the GPL version 3.0
+ then you may purchase a commercial license.  For more information contact
+ info at riverbankcomputing.com.
+ .
+ This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+ WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+
 Files: src/app/gps/qwtpolar-0.1/*
  src/app/gps/qwtpolar-1.0/*
  src/app/gps/qwtpolar-1.1.1/*

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/qgis.git