[SCM] qtwayland packaging branch, experimental, updated. debian/5.9.2-1-5-g9522c79

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit 9522c79cdeb3a5a351e57c0720e2ca6c7932ff1d
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Mon Oct 23 22:08:36 2017 +0300

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

diff --git a/debian/changelog b/debian/changelog
index fa1f4ea..c4248be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,10 @@
 qtwayland-opensource-src (5.9.2-3) UNRELEASED; urgency=medium
 
+  [ Dmitry Shachnev ]
+  * Update for Qt binaries location change in qtbase 5.9.2+dfsg-3.
+    - Install qtwaylandscanner to the new location.
+    - Provide a compatibility symlink in the old location.
+    - Bump qtbase5-private-dev and qttools5-dev-tools build-dependencies.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 23 Oct 2017 22:02:17 +0300
 
diff --git a/debian/control b/debian/control
index b3262f1..ae71e4f 100644
--- a/debian/control
+++ b/debian/control
@@ -23,11 +23,11 @@ Build-Depends: debhelper (>= 10.3),
                pkg-config,
                pkg-kde-tools,
                qtbase5-dev (>= 5.9.2+dfsg~),
-               qtbase5-private-dev (>= 5.9.2+dfsg~),
+               qtbase5-private-dev (>= 5.9.2+dfsg-3~),
                qtdeclarative5-private-dev (>= 5.9.2~)
 Build-Depends-Indep: libqt5sql5-sqlite (>= 5.9.2+dfsg~) <!nodoc>,
                      qtbase5-doc-html (>= 5.9.2+dfsg~) <!nodoc>,
-                     qttools5-dev-tools (>= 5.9.2~) <!nodoc>
+                     qttools5-dev-tools (>= 5.9.2-2~) <!nodoc>
 Standards-Version: 4.1.1
 Homepage: http://qt-project.org/
 Vcs-Git: https://anonscm.debian.org/git/pkg-kde/qt/qtwayland.git
diff --git a/debian/qtwayland5-dev-tools.install b/debian/qtwayland5-dev-tools.install
index 127cf1a..9046349 100644
--- a/debian/qtwayland5-dev-tools.install
+++ b/debian/qtwayland5-dev-tools.install
@@ -1 +1 @@
-usr/lib/*/qt5/bin
+usr/lib/qt5/bin
diff --git a/debian/rules b/debian/rules
index 3894c3a..9019915 100755
--- a/debian/rules
+++ b/debian/rules
@@ -44,5 +44,9 @@ override_dh_auto_install-arch:
 override_dh_missing:
 	dh_missing --fail-missing
 
+override_dh_link:
+	dh_link -pqtwayland5-dev-tools \
+		usr/lib/qt5/bin/qtwaylandscanner usr/lib/$(DEB_HOST_MULTIARCH)/qt5/bin/qtwaylandscanner
+
 override_dh_strip:
 	dh_strip --dbgsym-migration='qtwayland5-dbg (<< 5.7.0-1~)'

-- 
qtwayland packaging