[qgis] 05/07: Add license & copyright for qtwebkit.py.

[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 44ae36568b18b61062ab04a743e13a2b532039e2
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Jun 23 14:39:04 2017 +0200

    Add license & copyright for qtwebkit.py.
---
 debian/changelog |  1 +
 debian/copyright | 22 ++++++++++++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 8dfd9e1..1ac9cb3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ qgis (2.14.16+dfsg-1) UNRELEASED; urgency=medium
   * New upstream release.
   * Disable openscenegraph & osgearth build dependencies,
     osgEarth 2.8 is not supported (yet) by the globe plugin.
+  * Add license & copyright for qtwebkit.py.
 
  -- Bas Couwenberg <sebastic at debian.org>  Fri, 23 Jun 2017 14:28:06 +0200
 
diff --git a/debian/copyright b/debian/copyright
index 60b7fa5..9c3729e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -316,6 +316,11 @@ License: QtWebKit
  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: python/QtWebKit/qtwebkit.py
+Copyright: 2011, Riverbank Computing Limited
+           2006, Thorsten Marek
+License: GPL-2 or BSD-3-Clause
+
 Files: src/app/gps/qwtpolar-0.1/*
  src/app/gps/qwtpolar-1.0/*
  src/app/gps/qwtpolar-1.1.1/*
@@ -1862,6 +1867,23 @@ License: dxflib-Commercial-License
  Contact info at ribbonsoft.com if any conditions of this licensing are
  not clear to you.
 
+License: GPL-2
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License version 2 as
+ published by the Free Software Foundation.
+ .
+ This package 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 General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this package; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ .
+ On Debian systems, the complete text of the GNU General Public License
+ version 2 can be found in `/usr/share/common-licenses/GPL-2'.
+
 License: GPL-2+
  This program is free software; you can redistribute it and/or
  modify it under the terms of the GNU General Public License as

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