[SCM] qtwebengine packaging branch, master, updated. debian/5.9.2+dfsg-1-2-gf528c60

[Dmitry Shachnev]

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

The following commit has been merged in the master branch:
commit f528c60808cd256a7ac6c427512a109411c736d0
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Fri Oct 20 21:19:18 2017 +0300

    Update for Qt binaries location change in qtbase 5.9.2+dfsg-3.
    
    - Install qwebengine_convert_dict tool into the new location.
    - Provide a compatibility symlink for the old location.
    - Bump qtbase5-private-dev and qttools5-dev-tools build-dependencies.
---
 debian/changelog                      | 5 +++++
 debian/control                        | 4 ++--
 debian/qtwebengine5-dev-tools.install | 2 +-
 debian/rules                          | 2 ++
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d70644a..cbbd140 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,10 @@
 qtwebengine-opensource-src (5.9.2+dfsg-2) UNRELEASED; urgency=medium
 
+  [ Dmitry Shachnev ]
+  * Update for Qt binaries location change in qtbase 5.9.2+dfsg-3.
+    - Install qwebengine_convert_dict tool into the new location.
+    - Provide a compatibility symlink for the old location.
+    - Bump qtbase5-private-dev and qttools5-dev-tools build-dependencies.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 20 Oct 2017 21:09:14 +0300
 
diff --git a/debian/control b/debian/control
index 2f6bbc8..b2090ab 100644
--- a/debian/control
+++ b/debian/control
@@ -66,7 +66,7 @@ Build-Depends: bison,
                pkg-kde-tools,
                protobuf-compiler,
                python,
-               qtbase5-private-dev (>= 5.9.2~),
+               qtbase5-private-dev (>= 5.9.2+dfsg-3~),
                qtdeclarative5-private-dev (>= 5.9.2~),
                qtpositioning5-dev,
                qtquickcontrols2-5-dev,
@@ -79,7 +79,7 @@ Build-Depends: bison,
                yui-compressor
 Build-Depends-Indep: libqt5sql5-sqlite (>= 5.9.2~),
                      qtbase5-doc-html (>= 5.9.2~),
-                     qttools5-dev-tools (>= 5.9.2~)
+                     qttools5-dev-tools (>= 5.9.2-2~)
 Standards-Version: 4.1.1
 Vcs-Browser: https://anonscm.debian.org/git/pkg-kde/qt/qtwebengine.git
 Vcs-Git: https://anonscm.debian.org/git/pkg-kde/qt/qtwebengine.git
diff --git a/debian/qtwebengine5-dev-tools.install b/debian/qtwebengine5-dev-tools.install
index 13b6414..7eec606 100644
--- a/debian/qtwebengine5-dev-tools.install
+++ b/debian/qtwebengine5-dev-tools.install
@@ -1 +1 @@
-usr/lib/*/qt5/bin/qwebengine_convert_dict
+usr/lib/qt5/bin/qwebengine_convert_dict
diff --git a/debian/rules b/debian/rules
index 46617d7..1cdf9df 100755
--- a/debian/rules
+++ b/debian/rules
@@ -215,6 +215,8 @@ override_dh_link:
 	dh_link --package=qtwebengine5-examples \
 		usr/share/javascript/jquery/jquery.min.js usr/lib/$(DEB_HOST_MULTIARCH)/qt5/examples/webenginewidgets/contentmanipulation/jquery.min.js \
 		usr/share/javascript/marked/marked.min.js usr/lib/$(DEB_HOST_MULTIARCH)/qt5/examples/webenginewidgets/markdowneditor/resources/marked.min.js
+	dh_link --package=qtwebengine5-dev-tools \
+		usr/lib/qt5/bin/qwebengine_convert_dict usr/lib/$(DEB_HOST_MULTIARCH)/qt5/bin/qwebengine_convert_dict
 	
 	dh_link --remaining-packages
 

-- 
qtwebengine packaging