diff -Nru qtwebkit-examples-opensource-src-5.5.1+dfsg/debian/changelog qtwebkit-examples-opensource-src-5.9.1+dfsg/debian/changelog --- qtwebkit-examples-opensource-src-5.5.1+dfsg/debian/changelog 2015-11-30 14:22:36.000000000 +0000 +++ qtwebkit-examples-opensource-src-5.9.1+dfsg/debian/changelog 2019-11-20 17:12:16.000000000 +0000 @@ -1,8 +1,64 @@ -qtwebkit-examples-opensource-src (5.5.1+dfsg-2build1) xenial; urgency=medium +qtwebkit-examples-opensource-src (5.9.1+dfsg-2~16.04.sav0) xenial; urgency=medium - * Rebuild against Qt 5.5.1. + * Backport to Xenial - -- Timo Jyrinki Mon, 30 Nov 2015 16:22:36 +0200 + -- Rob Savoury Wed, 20 Nov 2019 09:12:16 -0800 + +qtwebkit-examples-opensource-src (5.9.1+dfsg-2) unstable; urgency=medium + + * Release to unstable. + + -- Lisandro Damián Nicanor Pérez Meyer Wed, 16 Aug 2017 14:27:59 -0300 + +qtwebkit-examples-opensource-src (5.9.1+dfsg-1) experimental; urgency=medium + + [ Dmitry Shachnev ] + * New upstream release. + * Update debian/watch to track official releases again. + * Bump Standards-Version to 4.0.0, no changes needed. + + -- Lisandro Damián Nicanor Pérez Meyer Wed, 26 Jul 2017 18:59:11 -0300 + +qtwebkit-examples-opensource-src (5.9.0+dfsg-1) experimental; urgency=medium + + * Team upload. + * New upstream release. + * Update debian/watch to reflect the new upstream location of the tarball. + + -- Simon Quigley Thu, 15 Jun 2017 09:29:42 -0500 + +qtwebkit-examples-opensource-src (5.7.1+dfsg-1) unstable; urgency=medium + + * Repack the tarball to remove the non-DFSG file. + * Update the debian/watch file. + * Migrate to an automatic dbgsym package. + * Drop unused pkg-kde-tools build-dependency. + * Update debian/copyright. + * Use packaged jQuery properly (packaged_jquery.diff). + * Bump Qt build-dependencies to 5.7.1 final. + + -- Dmitry Shachnev Wed, 04 Jan 2017 22:03:38 +0300 + +qtwebkit-examples-opensource-src (5.7.1~20161021-2) unstable; urgency=medium + + * Release to unstable. + + -- Lisandro Damián Nicanor Pérez Meyer Tue, 01 Nov 2016 09:11:14 -0300 + +qtwebkit-examples-opensource-src (5.7.1~20161021-1) experimental; urgency=medium + + * New upstream snapshot. + - Bump Qt build dependencies. + + -- Lisandro Damián Nicanor Pérez Meyer Wed, 26 Oct 2016 18:55:05 -0300 + +qtwebkit-examples-opensource-src (5.6.1+dfsg-1) unstable; urgency=medium + + * New upstream release (Closes: #828783). + * Bump Standards-Version to 3.9.8, no changes required. + * Use https in Vcs-[Git Browser] URLs. + + -- Lisandro Damián Nicanor Pérez Meyer Tue, 28 Jun 2016 12:48:20 -0300 qtwebkit-examples-opensource-src (5.5.1+dfsg-2) unstable; urgency=medium diff -Nru qtwebkit-examples-opensource-src-5.5.1+dfsg/debian/control qtwebkit-examples-opensource-src-5.9.1+dfsg/debian/control --- qtwebkit-examples-opensource-src-5.5.1+dfsg/debian/control 2015-10-22 00:48:48.000000000 +0000 +++ qtwebkit-examples-opensource-src-5.9.1+dfsg/debian/control 2017-08-16 17:27:18.000000000 +0000 @@ -8,27 +8,26 @@ Felix Geyer , Timo Jyrinki , Dmitry Shachnev -Build-Depends: debhelper (>= 9), +Build-Depends: debhelper (>= 9.20160114~), libglib2.0-dev, libicu-dev, - libqt5opengl5-dev (>= 5.5.1+dfsg~), - libqt5webkit5-dev (>= 5.5.1+dfsg~), - libqt5xmlpatterns5-dev (>= 5.5.1~), + libqt5opengl5-dev (>= 5.9.0+dfsg~), + libqt5webkit5-dev (>= 5.9.0+dfsg~), + libqt5xmlpatterns5-dev (>= 5.9.0~), libsqlite3-dev, libxslt1-dev, - pkg-kde-tools, - qtbase5-dev (>= 5.5.1+dfsg~), - qtdeclarative5-dev (>= 5.5.1~) -Build-Depends-Indep: libqt5sql5-sqlite (>= 5.5.1+dfsg~), - qtbase5-doc-html (>= 5.5.1+dfsg~), - qtdeclarative5-doc-html (>= 5.5.1~), - qttools5-dev-tools (>= 5.5.1~), - qtwebkit5-doc-html (>= 5.5.1+dfsg~), - qtxmlpatterns5-doc-html (>= 5.5.1~) -Standards-Version: 3.9.6 + qtbase5-dev (>= 5.9.0+dfsg~), + qtdeclarative5-dev (>= 5.9.0~) +Build-Depends-Indep: libqt5sql5-sqlite (>= 5.9.0+dfsg~), + qtbase5-doc-html (>= 5.9.0+dfsg~), + qtdeclarative5-doc-html (>= 5.9.0~), + qttools5-dev-tools (>= 5.9.0~), + qtwebkit5-doc-html (>= 5.9.0+dfsg~), + qtxmlpatterns5-doc-html (>= 5.9.0~) +Standards-Version: 4.0.0 Homepage: http://qt-project.org/ -Vcs-Git: git://anonscm.debian.org/pkg-kde/qt/qtwebkit-examples.git -Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/qt/qtwebkit-examples.git +Vcs-Git: https://anonscm.debian.org/git/pkg-kde/qt/qtwebkit-examples.git +Vcs-Browser: https://anonscm.debian.org/cgit/pkg-kde/qt/qtwebkit-examples.git Package: qtwebkit5-examples Architecture: any @@ -42,19 +41,6 @@ . This package contains examples of the Qt 5 webkit module. -Package: qtwebkit5-examples-dbg -Architecture: any -Priority: extra -Multi-Arch: same -Section: debug -Pre-Depends: dpkg (>= 1.15.6~) -Depends: qtwebkit5-examples (= ${binary:Version}), ${misc:Depends} -Description: Qt 5 webkit examples debugging symbols - Qt is a cross-platform C++ application framework. Qt's primary feature - is its rich set of widgets that provide standard GUI functionality. - . - This package contains the debugging symbols for the Qt 5 webkit examples. - Package: qtwebkit5-examples-doc Priority: extra Architecture: all diff -Nru qtwebkit-examples-opensource-src-5.5.1+dfsg/debian/copyright qtwebkit-examples-opensource-src-5.9.1+dfsg/debian/copyright --- qtwebkit-examples-opensource-src-5.5.1+dfsg/debian/copyright 2015-10-22 00:48:48.000000000 +0000 +++ qtwebkit-examples-opensource-src-5.9.1+dfsg/debian/copyright 2017-08-16 17:27:18.000000000 +0000 @@ -1,6 +1,6 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: qtwebkit-examples-opensource-src -Source: https://download.qt.io/official_releases/qt/*/submodules/ +Source: https://download.qt.io/community_releases/ Files-Excluded: examples/webkitwidgets/fancybrowser/jquery.min.js Files: * @@ -16,7 +16,7 @@ 2012 Felix Geyer 2012-2013 Timo Jyrinki 2013 Lisandro Damián Nicanor Pérez Meyer - 2014-2015 Dmitry Shachnev + 2014-2017 Dmitry Shachnev License: LGPL-2.1 Files: examples/webkitwidgets/browser/* @@ -24,6 +24,10 @@ Copyright: 2015 The Qt Company Ltd. License: LGPL-2.1-or-3 with Qt-1.1 exception +Files: *.qdoc +Copyright: 2015 The Qt Company Ltd. +License: GFDL-NIV-1.3 + License: LGPL-2.1-or-3 with Qt-1.1 exception GNU Lesser General Public License: This file may be used under the terms of the GNU Lesser General Public @@ -94,12 +98,23 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." License: LGPL-2.1 - This file may be used under the terms of the GNU Lesser General Public - License version 2.1 as published by the Free Software Foundation and - appearing in the file LICENSE.LGPL included in the packaging of this file. - Please review the following information to ensure the GNU Lesser General - Public License version 2.1 requirements will be met: - http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License version 2.1 + as published by the Free Software Foundation. + . + This program 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. + . + 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. + +License: GFDL-NIV-1.3 + Permission is granted to copy, distribute and/or modify this document + under the terms of the GNU Free Documentation License, Version 1.3 + or any later version published by the Free Software Foundation; + with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. . - On Debian systems, the complete text of the GNU Lesser General Public License - can be found in `/usr/share/common-licenses/LGPL-2.1`. + On Debian systems, the complete text of the GNU Free Documentation + License version 1.3 can be found in /usr/share/common-licenses/GFDL-1.3. diff -Nru qtwebkit-examples-opensource-src-5.5.1+dfsg/debian/patches/packaged_jquery.diff qtwebkit-examples-opensource-src-5.9.1+dfsg/debian/patches/packaged_jquery.diff --- qtwebkit-examples-opensource-src-5.5.1+dfsg/debian/patches/packaged_jquery.diff 1970-01-01 00:00:00.000000000 +0000 +++ qtwebkit-examples-opensource-src-5.9.1+dfsg/debian/patches/packaged_jquery.diff 2017-07-26 21:47:25.000000000 +0000 @@ -0,0 +1,26 @@ +Description: update to use packaged jQuery +Author: Dmitry Shachnev +Forwarded: not-needed +Last-Update: 2017-01-04 + +--- a/examples/webkitwidgets/fancybrowser/fancybrowser.pro ++++ b/examples/webkitwidgets/fancybrowser/fancybrowser.pro +@@ -2,7 +2,6 @@ + HEADERS = mainwindow.h + SOURCES = main.cpp \ + mainwindow.cpp +-RESOURCES = jquery.qrc + + # install + target.path = $$[QT_INSTALL_EXAMPLES]/webkitwidgets/fancybrowser +--- a/examples/webkitwidgets/fancybrowser/mainwindow.cpp ++++ b/examples/webkitwidgets/fancybrowser/mainwindow.cpp +@@ -50,7 +50,7 @@ + progress = 0; + + QFile file; +- file.setFileName(":/jquery.min.js"); ++ file.setFileName("/usr/share/javascript/jquery/jquery.min.js"); + file.open(QIODevice::ReadOnly); + jQuery = file.readAll(); + jQuery.append("\nvar qt = { 'jQuery': jQuery.noConflict(true) };"); diff -Nru qtwebkit-examples-opensource-src-5.5.1+dfsg/debian/patches/series qtwebkit-examples-opensource-src-5.9.1+dfsg/debian/patches/series --- qtwebkit-examples-opensource-src-5.5.1+dfsg/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ qtwebkit-examples-opensource-src-5.9.1+dfsg/debian/patches/series 2017-07-26 21:47:25.000000000 +0000 @@ -0,0 +1 @@ +packaged_jquery.diff diff -Nru qtwebkit-examples-opensource-src-5.5.1+dfsg/debian/rules qtwebkit-examples-opensource-src-5.9.1+dfsg/debian/rules --- qtwebkit-examples-opensource-src-5.5.1+dfsg/debian/rules 2015-10-22 00:48:48.000000000 +0000 +++ qtwebkit-examples-opensource-src-5.9.1+dfsg/debian/rules 2017-07-26 21:47:25.000000000 +0000 @@ -11,36 +11,25 @@ export QT_SELECT := qt5 %: - dh $@ --dbg-package=qtwebkit5-examples-dbg --with pkgkde_symbolshelper --parallel + dh $@ --parallel override_dh_auto_configure: qmake - # The build system needs to find the file but doesn't seems to use it later - # as part of the build process. We create a fake one and will replace it later - # for the system-provided one. - touch $(CURDIR)/examples/webkitwidgets/fancybrowser/jquery.min.js override_dh_auto_clean: dh_auto_clean rm -rf doc/qtwebkitexamples doc/qtwebkitexamples.qch .qmake.cache - rm -fv examples/webkitwidgets/fancybrowser/jquery.min.js override_dh_auto_build-indep: dh_auto_build -Smakefile -- docs override_dh_auto_install-arch: - # We will replace the fake jquery.min.js with a symbolic link to a packaged version. - rm -f $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/examples/webkitwidgets/fancybrowser/jquery.min.js dh_auto_install find $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/examples/ \ -perm /u+x,g+x,o+x -type f \ -regex '.*\.\(app\|conf\|cpp\|h\|html\|js\|php\|png\|pro\|xml\|xsl\)$$' \ -exec chmod a-x {} \; -override_dh_link: - dh_link -p qtwebkit5-examples /usr/share/javascript/jquery/jquery.min.js \ - usr/lib/$(DEB_HOST_MULTIARCH)/qt5/examples/webkitwidgets/fancybrowser/jquery.min.js - override_dh_auto_install-indep: make INSTALL_ROOT=$(CURDIR)/debian/tmp install_docs @@ -48,3 +37,6 @@ dh_install --fail-missing override_dh_auto_test: + +override_dh_strip: + dh_strip --dbgsym-migration='qtwebkit5-examples-dbg (<< 5.7.1+dfsg-1~)' diff -Nru qtwebkit-examples-opensource-src-5.5.1+dfsg/debian/watch qtwebkit-examples-opensource-src-5.9.1+dfsg/debian/watch --- qtwebkit-examples-opensource-src-5.5.1+dfsg/debian/watch 2015-06-24 20:58:10.000000000 +0000 +++ qtwebkit-examples-opensource-src-5.9.1+dfsg/debian/watch 2017-08-16 17:27:18.000000000 +0000 @@ -1,3 +1,3 @@ version=3 -opts=dversionmangle=s/\+dfsg// \ -https://download.qt.io/official_releases/qt/([\d\.]*)/([\d\.]*)/submodules/qtwebkit-examples-opensource-src-([^-]*)\.tar.xz +opts=dversionmangle=s/\+dfsg//,repacksuffix=+dfsg \ +https://download.qt.io/official_releases/qt/([\d\.]*)/([\d\.]*)/submodules/qtwebkit-examples-opensource-src-([^-]*)\.tar\.xz diff -Nru qtwebkit-examples-opensource-src-5.5.1+dfsg/examples/webkitwidgets/browser/browsermainwindow.cpp qtwebkit-examples-opensource-src-5.9.1+dfsg/examples/webkitwidgets/browser/browsermainwindow.cpp --- qtwebkit-examples-opensource-src-5.5.1+dfsg/examples/webkitwidgets/browser/browsermainwindow.cpp 2015-10-13 04:37:32.000000000 +0000 +++ qtwebkit-examples-opensource-src-5.9.1+dfsg/examples/webkitwidgets/browser/browsermainwindow.cpp 2017-05-10 17:07:37.000000000 +0000 @@ -678,7 +678,7 @@ QList windows = BrowserApplication::instance()->mainWindows(); for (int i = 0; i < windows.count(); ++i) { BrowserMainWindow *window = windows.at(i); - window->m_lastSearch = QString::null; + window->m_lastSearch = QString(); window->tabWidget()->clear(); } } diff -Nru qtwebkit-examples-opensource-src-5.5.1+dfsg/examples/webkitwidgets/browser/browser.pro qtwebkit-examples-opensource-src-5.9.1+dfsg/examples/webkitwidgets/browser/browser.pro --- qtwebkit-examples-opensource-src-5.5.1+dfsg/examples/webkitwidgets/browser/browser.pro 2015-10-13 04:37:32.000000000 +0000 +++ qtwebkit-examples-opensource-src-5.9.1+dfsg/examples/webkitwidgets/browser/browser.pro 2017-05-10 17:07:37.000000000 +0000 @@ -89,10 +89,6 @@ } } -wince*: { - DEPLOYMENT_PLUGIN += qjpeg qgif -} - EXAMPLE_FILES = Info_mac.plist browser.icns browser.ico browser.rc # install diff -Nru qtwebkit-examples-opensource-src-5.5.1+dfsg/examples/webkitwidgets/browser/tabwidget.cpp qtwebkit-examples-opensource-src-5.9.1+dfsg/examples/webkitwidgets/browser/tabwidget.cpp --- qtwebkit-examples-opensource-src-5.5.1+dfsg/examples/webkitwidgets/browser/tabwidget.cpp 2015-10-13 04:37:32.000000000 +0000 +++ qtwebkit-examples-opensource-src-5.9.1+dfsg/examples/webkitwidgets/browser/tabwidget.cpp 2017-05-10 17:07:37.000000000 +0000 @@ -712,7 +712,7 @@ if (WebView *tab = qobject_cast(widget(i))) { tabs.append(tab->url().toString()); } else { - tabs.append(QString::null); + tabs.append(QString()); } } stream << tabs; diff -Nru qtwebkit-examples-opensource-src-5.5.1+dfsg/examples/webkitwidgets/imageanalyzer/imageanalyzer.pro qtwebkit-examples-opensource-src-5.9.1+dfsg/examples/webkitwidgets/imageanalyzer/imageanalyzer.pro --- qtwebkit-examples-opensource-src-5.5.1+dfsg/examples/webkitwidgets/imageanalyzer/imageanalyzer.pro 2015-10-13 04:37:32.000000000 +0000 +++ qtwebkit-examples-opensource-src-5.9.1+dfsg/examples/webkitwidgets/imageanalyzer/imageanalyzer.pro 2017-05-10 17:07:37.000000000 +0000 @@ -11,4 +11,5 @@ EXAMPLE_FILES += html/index.html ../webkit-bridge-tutorial.qdoc outline.txt - +target.path = $$[QT_INSTALL_EXAMPLES]/webkitwidgets/imageanalyzer +INSTALLS += target diff -Nru qtwebkit-examples-opensource-src-5.5.1+dfsg/.qmake.conf qtwebkit-examples-opensource-src-5.9.1+dfsg/.qmake.conf --- qtwebkit-examples-opensource-src-5.5.1+dfsg/.qmake.conf 2015-10-13 04:37:32.000000000 +0000 +++ qtwebkit-examples-opensource-src-5.9.1+dfsg/.qmake.conf 2017-05-10 17:07:37.000000000 +0000 @@ -1,4 +1,3 @@ load(qt_build_config) -CONFIG += qt_example_installs -MODULE_VERSION = 5.5.1 +MODULE_VERSION = 5.9.1 diff -Nru qtwebkit-examples-opensource-src-5.5.1+dfsg/sync.profile qtwebkit-examples-opensource-src-5.9.1+dfsg/sync.profile --- qtwebkit-examples-opensource-src-5.5.1+dfsg/sync.profile 2015-10-13 04:37:32.000000000 +0000 +++ qtwebkit-examples-opensource-src-5.9.1+dfsg/sync.profile 2017-05-10 17:07:37.000000000 +0000 @@ -1,16 +1,2 @@ -# Module dependencies. -# Every module that is required to build this module should have one entry. -# Each of the module version specifiers can take one of the following values: -# - A specific Git revision. -# - any git symbolic ref resolvable from the module's repository (e.g. "refs/heads/master" to track master branch) -# - an empty string to use the same branch under test (dependencies will become "refs/heads/master" if we are in the master branch) -# -%dependencies = ( - "qtbase" => "", - "qtwebkit" => "", - "qtscript" => "", - "qtsvg" => "", - "qtxmlpatterns" => "", - "qtdeclarative" => "", - "qttools" => "", +%modules = ( # path to module name map ); diff -Nru qtwebkit-examples-opensource-src-5.5.1+dfsg/.tag qtwebkit-examples-opensource-src-5.9.1+dfsg/.tag --- qtwebkit-examples-opensource-src-5.5.1+dfsg/.tag 2015-10-13 04:37:32.000000000 +0000 +++ qtwebkit-examples-opensource-src-5.9.1+dfsg/.tag 2017-05-10 17:07:37.000000000 +0000 @@ -1 +1 @@ -df729f9f284df2d30db432de351e7e80360097c8 +f544b2eec0c18b7674ac4df629ae98e8cacce5c7