[SCM] qttools packaging branch, experimental, updated. debian/5.9.2-1-2-gec8ddcb

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit ec8ddcbbcebfab20de6245fbd03c51769068a161
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Thu Oct 19 23:16:59 2017 +0300

    Update for Qt binaries location change in qtbase 5.9.2+dfsg-3.
    
    - Update .install files for qttools5-dev-tools and qdbus-qt5.
    - Make these packages Multi-Arch: foreign.
    - Provide compatibility symlinks for the old location.
    - Bump qtbase5-dev build-dependency to 5.9.2+dfsg-3.
---
 debian/changelog                     |  6 ++++++
 debian/control                       |  5 +++--
 debian/qdbus-qt5.install             |  2 +-
 debian/qttools5-dev-tools.install.in | 32 ++++++++++++++++----------------
 debian/rules                         |  6 ++++++
 5 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ad03e18..7506f03 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,11 @@
 qttools-opensource-src (5.9.2-2) UNRELEASED; urgency=medium
 
+  [ Dmitry Shachnev ]
+  * Update for Qt binaries location change in qtbase 5.9.2+dfsg-3.
+    - Update .install files for qttools5-dev-tools and qdbus-qt5.
+    - Make these packages Multi-Arch: foreign.
+    - Provide compatibility symlinks for the old location.
+    - Bump qtbase5-dev build-dependency to 5.9.2+dfsg-3.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 19 Oct 2017 22:49:02 +0300
 
diff --git a/debian/control b/debian/control
index 85f1cde..4fa242d 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Build-Depends: debhelper (>= 10),
                libqt5opengl5-dev (>= 5.9.2+dfsg~),
                libqt5sql5-sqlite (>= 5.9.2+dfsg~),
                pkg-kde-tools,
-               qtbase5-private-dev (>= 5.9.2+dfsg~),
+               qtbase5-private-dev (>= 5.9.2+dfsg-3~),
                qtdeclarative5-private-dev (>= 5.9.2~),
                zlib1g-dev
 Build-Depends-Indep: qtbase5-doc-html (>= 5.9.2+dfsg~)
@@ -47,6 +47,7 @@ Description: Qt 5 Designer components module
 
 Package: qdbus-qt5
 Architecture: any
+Multi-Arch: foreign
 Section: utils
 Depends: qtchooser, ${misc:Depends}, ${shlibs:Depends}
 Description: Qt 5 D-Bus tool
@@ -100,7 +101,7 @@ Description: Qt 5 tools private development files
 
 Package: qttools5-dev-tools
 Architecture: any
-Multi-Arch: same
+Multi-Arch: foreign
 Section: devel
 Depends: qtchooser, ${misc:Depends}, ${shlibs:Depends}
 Recommends: libqt5sql5-sqlite
diff --git a/debian/qdbus-qt5.install b/debian/qdbus-qt5.install
index 0f9631a..826a8b8 100644
--- a/debian/qdbus-qt5.install
+++ b/debian/qdbus-qt5.install
@@ -1 +1 @@
-usr/lib/*/qt5/bin/qdbus
+usr/lib/qt5/bin/qdbus
diff --git a/debian/qttools5-dev-tools.install.in b/debian/qttools5-dev-tools.install.in
index 2360f10..4d355ff 100644
--- a/debian/qttools5-dev-tools.install.in
+++ b/debian/qttools5-dev-tools.install.in
@@ -1,22 +1,22 @@
 usr/lib/*/cmake/Qt5LinguistTools/Qt5LinguistToolsConfig.cmake
 usr/lib/*/cmake/Qt5LinguistTools/Qt5LinguistToolsConfigVersion.cmake
 usr/lib/*/cmake/Qt5LinguistTools/Qt5LinguistToolsMacros.cmake
-usr/lib/*/qt5/bin/assistant
-usr/lib/*/qt5/bin/designer
-usr/lib/*/qt5/bin/lconvert
-usr/lib/*/qt5/bin/linguist
-usr/lib/*/qt5/bin/lrelease
-usr/lib/*/qt5/bin/lupdate
-usr/lib/*/qt5/bin/pixeltool
-usr/lib/*/qt5/bin/qcollectiongenerator
-usr/lib/*/qt5/bin/qdbusviewer
-usr/lib/*/qt5/bin/qdoc
-usr/lib/*/qt5/bin/qhelpconverter
-usr/lib/*/qt5/bin/qhelpgenerator
-usr/lib/*/qt5/bin/qtattributionsscanner
-usr/lib/*/qt5/bin/qtdiag
-usr/lib/*/qt5/bin/qtpaths
-usr/lib/*/qt5/bin/qtplugininfo
+usr/lib/qt5/bin/assistant
+usr/lib/qt5/bin/designer
+usr/lib/qt5/bin/lconvert
+usr/lib/qt5/bin/linguist
+usr/lib/qt5/bin/lrelease
+usr/lib/qt5/bin/lupdate
+usr/lib/qt5/bin/pixeltool
+usr/lib/qt5/bin/qcollectiongenerator
+usr/lib/qt5/bin/qdbusviewer
+usr/lib/qt5/bin/qdoc
+usr/lib/qt5/bin/qhelpconverter
+usr/lib/qt5/bin/qhelpgenerator
+usr/lib/qt5/bin/qtattributionsscanner
+usr/lib/qt5/bin/qtdiag
+usr/lib/qt5/bin/qtpaths
+usr/lib/qt5/bin/qtplugininfo
 usr/lib/*/qt5/plugins/designer/libqquickwidget.so
 usr/lib/*/qt5/plugins/designer/libqwebview.so
 usr/share/qt5/phrasebooks/danish.qph
diff --git a/debian/rules b/debian/rules
index 355e4da..27dbcd5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -58,6 +58,12 @@ override_dh_install:
 	install -D -p -m0644 src/linguist/linguist/images/icons/linguist-128-32.png \
 		debian/qttools5-dev-tools/usr/share/pixmaps/linguist-qt5.png
 
+override_dh_link:
+	dh_link
+	ls debian/qttools5-dev-tools/usr/lib/qt5/bin | xargs -t -I {} \
+		dh_link -pqttools5-dev-tools usr/lib/qt5/bin/{} usr/lib/$(DEB_HOST_MULTIARCH)/qt5/bin/{}
+	dh_link -pqdbus-qt5 usr/lib/qt5/bin/qdbus usr/lib/$(DEB_HOST_MULTIARCH)/qt5/bin/qdbus
+
 override_dh_strip:
 	dh_strip -pqttools5-examples --dbgsym-migration='qttools5-examples-dbg (<< 5.7.1-1~)'
 	dh_strip --remaining-packages --dbgsym-migration='qttools5-dbg (<< 5.7.1-1~)'

-- 
qttools packaging