[SCM] qtwebengine packaging branch, master, updated. 51b5160e2220ff423aeef7e4780b3a9bc93cf608
Sandro Knauß
hefee-guest at moszumanska.debian.org
Mon Aug 1 19:47:01 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtwebengine.git;a=commitdiff;h=51b5160
The following commit has been merged in the master branch:
commit 51b5160e2220ff423aeef7e4780b3a9bc93cf608
Author: Sandro Knauß <sknauss at kde.org>
Date: Mon Aug 1 21:46:48 2016 +0200
run cme fix dpkg
---
debian/control | 39 +++++++++++++++-------------
debian/copyright | 79 ++++++++++++++++++++++++++++----------------------------
2 files changed, 61 insertions(+), 57 deletions(-)
diff --git a/debian/control b/debian/control
index 309bedb..92f91b0 100644
--- a/debian/control
+++ b/debian/control
@@ -1,9 +1,10 @@
Source: qtwebengine-opensource-src
-Priority: optional
Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
Uploaders: Scarlett Clark <sgclark at kubuntu.org>,
Sandro Knauß <bugs at sandroknauss.de>,
Simon Quigley <tsimonq2 at ubuntu.com>
+Section: libs
+Priority: optional
Build-Depends: autotools-dev,
bison,
chrpath,
@@ -57,12 +58,12 @@ Build-Depends: autotools-dev,
libxtst-dev,
mesa-common-dev,
pkg-config,
- pkg-kde-tools (>= 0.6.4),
+ pkg-kde-tools,
python-minimal,
python2.7,
qtbase5-private-dev (>= 5.6.0+dfsg~),
qtdeclarative5-private-dev (>= 5.6.0~),
- qtlocation5-dev (>= 5.6.0~),
+ qtlocation5-dev,
qtscript5-private-dev (>= 5.6.0+dfsg~),
re2c,
ruby
@@ -70,16 +71,14 @@ Build-Depends-Indep: libqt5sql5-sqlite (>= 5.6.0+dfsg~),
qtbase5-doc-html (>= 5.6.0+dfsg~),
qttools5-dev-tools (>= 5.6.0~)
Standards-Version: 3.9.8
-Section: libs
-Homepage: https://doc.qt.io/qt-5/qtwebengine-index.html
-Vcs-Git: https://anonscm.debian.org/git/pkg-kde/qt/qt5webengine.git
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-kde/qt/qt5webengine.git
+Vcs-Git: https://anonscm.debian.org/git/pkg-kde/qt/qt5webengine.git
+Homepage: https://doc.qt.io/qt-5/qtwebengine-index.html
Package: libqt5webengine5-dev
-Section: libdevel
Architecture: any
Multi-Arch: same
-Pre-Depends: dpkg (>= 1.15.6~)
+Section: libdevel
Depends: libqt5webengine5 (= ${binary:Version}),
qtbase5-dev,
qtdeclarative5-dev,
@@ -94,8 +93,9 @@ Description: Web content engine library for Qt - development files
Package: libqt5webengine5
Architecture: any
Multi-Arch: same
-Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: ${misc:Depends},
+ ${shlibs:Depends}
+Pre-Depends: ${misc:Pre-Depends}
Description: Web content engine library for Qt
QtWebEngine provides a Web browser engine that makes it easy to embed content
from the World Wide Web into your Qt application.
@@ -105,8 +105,9 @@ Description: Web content engine library for Qt
Package: qml-module-qtwebengine
Architecture: any
Multi-Arch: same
-Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: ${misc:Depends},
+ ${shlibs:Depends}
+Pre-Depends: ${misc:Pre-Depends}
Breaks: libqt5webengine5-qmlwebkitplugin (<< 5.2.1+dfsg-6~)
Replaces: libqt5webengine5-qmlwebkitplugin (<< 5.2.1+dfsg-6~)
Description: Qt WebEngine QML module
@@ -118,8 +119,9 @@ Description: Qt WebEngine QML module
Package: qt5webengine-examples
Architecture: any
Multi-Arch: same
-Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: ${misc:Depends},
+ ${shlibs:Depends}
+Pre-Depends: ${misc:Pre-Depends}
Breaks: libqt5webengine5-qmlwebkitplugin (<< 5.2.1+dfsg-6~)
Replaces: libqt5webengine5-qmlwebkitplugin (<< 5.2.1+dfsg-6~)
Description: Qt WebEngine - Examples
@@ -129,11 +131,12 @@ Description: Qt WebEngine - Examples
This package contains the WebEngine examples.
Package: libqt5webengine5-dbg
-Priority: extra
Architecture: amd64 i386 powerpc s390x
Multi-Arch: same
Section: debug
-Depends: libqt5webengine5 (= ${binary:Version}), ${misc:Depends}
+Priority: extra
+Depends: libqt5webengine5 (= ${binary:Version}),
+ ${misc:Depends}
Description: Web content engine library for Qt - debugging symbols
QtWebEngine provides a Web browser engine that makes it easy to embed content
from the World Wide Web into your Qt application.
@@ -141,9 +144,9 @@ Description: Web content engine library for Qt - debugging symbols
This package contains the debugging symbols for the Qt WebEngine library.
Package: qtwebengine5-doc
-Priority: extra
Architecture: all
Section: doc
+Priority: extra
Depends: ${misc:Depends}
Description: Qt 5 webengine documentation
Qt is a cross-platform C++ application framework. Qt's primary feature
@@ -152,9 +155,9 @@ Description: Qt 5 webengine documentation
This package contains the documentation for the Qt 5 webengine libraries.
Package: qtwebengine5-doc-html
-Priority: extra
Architecture: all
Section: doc
+Priority: extra
Depends: ${misc:Depends}
Description: Qt 5 webengine HTML documentation
Qt is a cross-platform C++ application framework. Qt's primary feature
diff --git a/debian/copyright b/debian/copyright
index 34ee24a..70d3a7e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,7 +6,6 @@ Copyright: 2016 Scarlett Clark <sgclark at kubuntu.org>
License: LGPL-2+
Files: *
-
examples/webengine/quicknanobrowser/*
examples/webenginewidgets/contentmanipulation/* excluding:
-? examples/webenginewidgets/contentmanipulation/jquery.min.js
@@ -3616,7 +3615,7 @@ License: GPL-2
GNU General Public License version 2 can be found in
/usr/share/common-licenses/GPL-2
-Files: src/3rdparty/chromium/third_party/devscripts/*
+Files: src/3rdparty/chromium/third_party/devscripts/*
src/3rdparty/chromium/third_party/ffmpeg/compat/avisynth/*
src/3rdparty/chromium/third_party/ffmpeg/compat/avisynth/avs/*
+ src/3rdparty/chromium/third_party/ffmpeg/doc/texi2pod.pl
@@ -3695,18 +3694,18 @@ License: GPL-2+
GNU General Public License version 2 can be found in
/usr/share/common-licenses/GPL-2
- Files: examples/webenginewidgets/cookiebrowser/*
- tests/auto/core/qwebenginecookiestore/*
- tests/auto/core/qwebengineurlrequestinterceptor/*
- tests/auto/quick/inspectorserver/*
- tests/auto/quick/publicapi/*
- tests/auto/quick/qmltests/*
- + tests/auto/quick/qmltests/data/titleupdate.js
- tests/auto/quick/qquickwebengineviewgraphics/*
- + tests/auto/quick/shared/qt_webengine_quicktest.h
- tests/quicktestbrowser/*
- tools/buildscripts/*
- tools/scripts/*
+Files: examples/webenginewidgets/cookiebrowser/*
+ tests/auto/core/qwebenginecookiestore/*
+ tests/auto/core/qwebengineurlrequestinterceptor/*
+ tests/auto/quick/inspectorserver/*
+ tests/auto/quick/publicapi/*
+ tests/auto/quick/qmltests/*
+ + tests/auto/quick/qmltests/data/titleupdate.js
+ tests/auto/quick/qquickwebengineviewgraphics/*
+ + tests/auto/quick/shared/qt_webengine_quicktest.h
+ tests/quicktestbrowser/*
+ tools/buildscripts/*
+ tools/scripts/*
Copyright: 2014 The Chromium Authors. All rights reserved.
2013 Google Inc. All rights reserved.
License: GPL-3
@@ -3807,7 +3806,7 @@ License: LGPL-2
GNU Library General Public License version 2 can be found in
/usr/share/common-licenses/LGPL-2
-Files: src/3rdparty/chromium/base/third_party/xdg_mime/*
+Files: src/3rdparty/chromium/base/third_party/xdg_mime/*
src/3rdparty/chromium/third_party/WebKit/Source/*
src/3rdparty/chromium/third_party/WebKit/Source/build/mac/*
+ src/3rdparty/chromium/third_party/WebKit/Source/build/scripts/hasher.py
@@ -4899,23 +4898,6 @@ Files: src/3rdparty/chromium/base/third_party/xdg_mime/*
Copyright: 2014 The Chromium Authors. All rights reserved.
2013 Google Inc. All rights reserved.
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
- version 2 of the License, or (at your option) any later version.
- .
- This library 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
- Library General Public License for more details.
- .
- You should have received a copy of the GNU Library General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- .
- On Debian systems, the complete text of the
- GNU Library General Public License version 2 can be found in
- /usr/share/common-licenses/LGPL-2
Files: + src/3rdparty/chromium/third_party/WebKit/Tools/Scripts/webkitperl/VCSUtils_unittest/parseDiffWithMockFiles.pl
+ src/3rdparty/chromium/third_party/WebKit/Tools/Scripts/webkitperl/VCSUtils_unittest/parseFirstEOL.pl
@@ -5090,16 +5072,16 @@ License: LGPL-2.1+
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
- .
+ .
This library 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.
- .
+ .
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- .
+ .
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
@@ -5127,16 +5109,16 @@ License: LGPL-3+
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 3 of the License, or (at your option) any later version.
- .
+ .
This library 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.
- .
+ .
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- .
+ .
On Debian systems, the complete text of the
GNU Lesser General Public License version 3 can be found in
/usr/share/common-licenses/LGPL-3
@@ -5499,7 +5481,7 @@ Files: src/3rdparty/chromium/base/third_party/*
+ src/3rdparty/chromium/v8/benchmarks/navier-stokes.js
Copyright: 2014 The Chromium Authors. All rights reserved.
2013 Google Inc. All rights reserved.
-License: MIT
+License: Expat
| Permission is hereby granted, free of charge, to any person
| obtaining a copy of this software and associated documentation
| files (the "Software"), to deal in the Software without
@@ -5520,3 +5502,22 @@ License: MIT
| WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
| FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
| OTHER DEALINGS IN THE SOFTWARE.
+
+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
+ version 2 of the License, or (at your option) any later version.
+ .
+ This library 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
+ Library General Public License for more details.
+ .
+ You should have received a copy of the GNU Library General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ .
+ On Debian systems, the complete text of the
+ GNU Library General Public License version 2 can be found in
+ /usr/share/common-licenses/LGPL-2
--
qtwebengine packaging
More information about the pkg-kde-commits
mailing list