[SCM] qtwebengine packaging branch, master, updated. e2309b047330b1ac75e1253beca29ba111f3095d
Sandro Knauß
hefee-guest at moszumanska.debian.org
Mon Jul 25 10:00:54 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtwebengine.git;a=commitdiff;h=9785495
The following commit has been merged in the master branch:
commit 978549588aae99dd7183d65bfc69e02b12ae6a33
Author: Simon Quigley <tsimonq2 at ubuntu.com>
Date: Mon Jul 25 04:30:29 2016 -0500
Ran wrap-and-sort
---
debian/copyright | 8 ++++----
debian/libqt5webengine5-dev.install | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/debian/copyright b/debian/copyright
index c4eea57..6fa57af 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3431,7 +3431,7 @@ License: BSD-BY-LC-NE
On Debian systems, the complete text of the
BSD-like License version BY-LC-NE can be found in
/usr/share/common-licenses/BSD-BY-LC-NE
-
+
Files: src/3rdparty/chromium/base/third_party/*
src/3rdparty/chromium/base/third_party/dynamic_annotations/*
src/3rdparty/chromium/base/third_party/valgrind/*
@@ -3505,7 +3505,7 @@ License: BSD-BY-LC
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
- .
+ .
On Debian systems, the complete text of the
BSD-like License version BY-LC can be found in
/usr/share/common-licenses/BSD-BY-LC
@@ -3725,7 +3725,7 @@ License: GPL-3
On Debian systems, the complete text of the
GNU General Public License version 2 can be found in
/usr/share/common-licenses/GPL-3
-
+
Files: + src/3rdparty/chromium/third_party/angle/src/compiler/preprocessor/ExpressionParser.cpp
+ src/3rdparty/chromium/third_party/angle/src/compiler/translator/glslang_tab.cpp
+ src/3rdparty/chromium/third_party/angle/src/compiler/translator/glslang_tab.h
@@ -3788,7 +3788,7 @@ Files: + src/3rdparty/chromium/third_party/WebKit/Source/core/layout/TableLayout
+ src/3rdparty/chromium/third_party/WebKit/Source/wtf/text/Base64.cpp
Copyright: 2014 The Chromium Authors. All rights reserved.
2013 Google Inc. All rights reserved.
-License: LGPL-2
+License: LGPL-2
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
License as published by the Free Software Foundation; either
diff --git a/debian/libqt5webengine5-dev.install b/debian/libqt5webengine5-dev.install
index 79f8fcd..b4be7d7 100644
--- a/debian/libqt5webengine5-dev.install
+++ b/debian/libqt5webengine5-dev.install
@@ -22,10 +22,10 @@ usr/include/*/qt5/QtWebKit/QtWebKitVersion
usr/include/*/qt5/QtWebKit/qtwebengineversion.h
usr/include/*/qt5/QtWebKit/qwebdatabase.h
usr/include/*/qt5/QtWebKit/qwebelement.h
-usr/include/*/qt5/QtWebKit/qwebhistory.h
-usr/include/*/qt5/QtWebKit/qwebhistoryinterface.h
usr/include/*/qt5/QtWebKit/qwebengineglobal.h
usr/include/*/qt5/QtWebKit/qwebengineplatformplugin.h
+usr/include/*/qt5/QtWebKit/qwebhistory.h
+usr/include/*/qt5/QtWebKit/qwebhistoryinterface.h
usr/include/*/qt5/QtWebKit/qwebpluginfactory.h
usr/include/*/qt5/QtWebKit/qwebsecurityorigin.h
usr/include/*/qt5/QtWebKit/qwebsettings.h
--
qtwebengine packaging
More information about the pkg-kde-commits
mailing list