[SCM] qtconnectivity packaging branch, experimental, updated. debian/5.9.1-2-4-g61bd116

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit 5db32b26e9cade23f6df4fb27619a288f36586d1
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Fri Oct 20 15:39:26 2017 +0300

    Update for Qt binaries location change in qtbase 5.9.2+dfsg-3.
    
    - Update libqt5bluetooth5-bin.install.
    - Make libqt5bluetooth5-bin Multi-Arch: foreign.
    - Provide a compatibility symlink for old sdpscanner location.
    - Bump qtbase5-private-dev and qttools5-dev-tools build-dependencies.
---
 debian/changelog                    | 4 ++++
 debian/control                      | 6 +++---
 debian/libqt5bluetooth5-bin.install | 2 +-
 debian/rules                        | 4 ++++
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5dadbc1..8c31d8e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,10 @@ qtconnectivity-opensource-src (5.9.2-1) UNRELEASED; urgency=medium
   [ Dmitry Shachnev ]
   * New upstream release.
   * Update debian/libqt5bluetooth5.symbols from buildds’ logs.
+  * Update for Qt binaries location change in qtbase 5.9.2+dfsg-3.
+    - Update libqt5bluetooth5-bin.install.
+    - Make libqt5bluetooth5-bin Multi-Arch: foreign.
+    - Provide a compatibility symlink for old sdpscanner location.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 20 Oct 2017 15:29:05 +0300
 
diff --git a/debian/control b/debian/control
index 2e86647..310dd7d 100644
--- a/debian/control
+++ b/debian/control
@@ -13,11 +13,11 @@ Build-Depends: debhelper (>= 9.20160114~),
                pkg-config,
                pkg-kde-tools,
                qtbase5-dev (>= 5.9.1+dfsg~),
-               qtbase5-private-dev (>= 5.9.1+dfsg~),
+               qtbase5-private-dev (>= 5.9.2+dfsg-3~),
                qtdeclarative5-private-dev (>= 5.9.1~)
 Build-Depends-Indep: libqt5sql5-sqlite (>= 5.9.1~),
                      qtbase5-doc-html (>= 5.9.1+dfsg~),
-                     qttools5-dev-tools (>= 5.9.1~)
+                     qttools5-dev-tools (>= 5.9.2-2~)
 Standards-Version: 4.0.0
 Homepage: http://qt-project.org/
 Vcs-Git: https://anonscm.debian.org/git/pkg-kde/qt/qtconnectivity.git
@@ -37,7 +37,7 @@ Description: Qt Connectivity Bluetooth module
 Package: libqt5bluetooth5-bin
 Architecture: linux-any
 Section: utils
-Multi-Arch: same
+Multi-Arch: foreign
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: Qt Connectivity Bluetooth module helper binaries
diff --git a/debian/libqt5bluetooth5-bin.install b/debian/libqt5bluetooth5-bin.install
index ef8d54c..877d411 100644
--- a/debian/libqt5bluetooth5-bin.install
+++ b/debian/libqt5bluetooth5-bin.install
@@ -1 +1 @@
-usr/lib/*/qt5/bin/sdpscanner
+usr/lib/qt5/bin/sdpscanner
diff --git a/debian/rules b/debian/rules
index 210bf0b..ed45eda 100755
--- a/debian/rules
+++ b/debian/rules
@@ -34,6 +34,10 @@ override_dh_auto_install-arch:
 override_dh_auto_install-indep:
 	make INSTALL_ROOT=$(CURDIR)/debian/tmp install_docs
 
+override_dh_link:
+	dh_link
+	dh_link -plibqt5bluetooth5-bin usr/lib/qt5/bin/sdpscanner usr/lib/$(DEB_HOST_MULTIARCH)/qt5/bin/sdpscanner
+
 override_dh_auto_test-indep:
 
 override_dh_strip:

-- 
qtconnectivity packaging