[SCM] qtwebengine packaging branch, master, updated. a5ca8c1854bce2621d4ed6277cbee8f04843005a

[Sandro Knauß]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtwebengine.git;a=commitdiff;h=5a55bfa

The following commit has been merged in the master branch:
commit 5a55bfadf907bf933311ff346f95db73737ef1cc
Author: Sandro Knauß <sknauss at kde.org>
Date:   Sat Dec 24 02:37:48 2016 +0100

    Update copyright file.
---
 debian/changelog |  1 +
 debian/copyright | 20 ++++++--------------
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 659b624..d81cbc8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ qtwebengine-opensource-src (5.7.1+dfsg-1) UNRELEASED; urgency=medium
   * add patch to use current system re2 package.
   * remove minified javascript files
   * update source/linitian-overrides
+  * Update copyright file.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 21 Nov 2016 18:49:48 +0100
 
diff --git a/debian/copyright b/debian/copyright
index 8f26943..a42e07d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -63,12 +63,14 @@ Copyright: 2011-2014, Christopher Jeffrey.
            Twitter Inc
 License: MIT/X11
 
-Files: examples/webenginewidgets/contentmanipulation/jquery.min.js
+Files: debian/missing-sources/jquery-1.3.2.js
+       examples/webenginewidgets/contentmanipulation/jquery.min.js
 Copyright: 2009, John Resig
            2009, The Dojo Foundation
-License: GPL
+License: GPL or Expat
 
-Files: examples/webenginewidgets/markdowneditor/3RDPARTY.md
+Files: debian/missing-sources/marked-v0.3.6.tar.gz
+       examples/webenginewidgets/markdowneditor/resources/marked.min.js
 Copyright: 2011-2014, Christopher Jeffrey (https://github.com/chjj/)
 License: Expat
 
@@ -384,15 +386,6 @@ Files: src/3rdparty/chromium/third_party/blanketjs/*
 Copyright: 2013, Alex Seville
 License: Expat
 
-Files: src/3rdparty/chromium/third_party/blanketjs/src/blanket.js
-Copyright: 2011-2012, Ariya Hidayat <ariya.hidayat at gmail.com>
-           2012, Arpad Borsos <arpad.borsos at googlemail.com>
-           2012, Joost-Wim Boekesteijn <joost-wim at boekesteijn.nl>
-           2012, Kris Kowal <kris.kowal at cixar.com>
-           2012, Mathias Bynens <mathias at qiwi.be>
-           2012, Yusuke Suzuki <utatane.tea at gmail.com>
-License: BSD-2-clause
-
 Files: src/3rdparty/chromium/third_party/boringssl/*
 Copyright: 1995-1998, Eric Young <eay at cryptsoft.com>
            2006, Network Resonance, Inc
@@ -6501,8 +6494,7 @@ Files: src/3rdparty/chromium/third_party/WebKit/Source/build/scripts/rjsmin.py
 Copyright: 2009-2014, The Closure Compiler Authors
 License: Apache-2.0
 
-Files: src/3rdparty/chromium/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/coverage/htmlfiles/jquery-1.4.3.min.js
-       src/3rdparty/chromium/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/coverage/htmlfiles/jquery.hotkeys.js
+Files: src/3rdparty/chromium/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/coverage/htmlfiles/jquery.hotkeys.js
 Copyright: 2010, John Resig
            2010, The Dojo Foundation
 License: GPL-2

-- 
qtwebengine packaging