[SCM] qtdeclarative packaging branch, experimental, updated. debian/5.9.2-1-4-gf1c0896

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit 46a25d2178e3898f6fd57a1b93a2d47247b4ec16
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Fri Oct 20 13:58:33 2017 +0300

    Update for Qt binaries location change in qtbase 5.9.2+dfsg-3.
    
    - Update .install files for qtdeclarative5-dev-tools, qmlscene and qml.
    - Provide compatibility symlinks for the old location.
---
 debian/changelog                        |  4 ++++
 debian/qml.install                      |  2 +-
 debian/qmlscene.install                 |  2 +-
 debian/qtdeclarative5-dev-tools.install | 16 ++++++++--------
 debian/rules                            |  7 +++++++
 5 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3b5f750..6ec09f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
 qtdeclarative-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 qtdeclarative5-dev-tools, qmlscene and qml.
+    - Provide compatibility symlinks for the old location.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 20 Oct 2017 13:57:32 +0300
 
diff --git a/debian/qml.install b/debian/qml.install
index f8b4aa5..4dc20e2 100644
--- a/debian/qml.install
+++ b/debian/qml.install
@@ -1 +1 @@
-usr/lib/*/qt5/bin/qml
+usr/lib/qt5/bin/qml
diff --git a/debian/qmlscene.install b/debian/qmlscene.install
index fdc1c45..137ec3d 100644
--- a/debian/qmlscene.install
+++ b/debian/qmlscene.install
@@ -1 +1 @@
-usr/lib/*/qt5/bin/qmlscene
+usr/lib/qt5/bin/qmlscene
diff --git a/debian/qtdeclarative5-dev-tools.install b/debian/qtdeclarative5-dev-tools.install
index 9a6895c..947d455 100644
--- a/debian/qtdeclarative5-dev-tools.install
+++ b/debian/qtdeclarative5-dev-tools.install
@@ -1,8 +1,8 @@
-usr/lib/*/qt5/bin/qmlcachegen
-usr/lib/*/qt5/bin/qmleasing
-usr/lib/*/qt5/bin/qmlimportscanner
-usr/lib/*/qt5/bin/qmllint
-usr/lib/*/qt5/bin/qmlmin
-usr/lib/*/qt5/bin/qmlplugindump
-usr/lib/*/qt5/bin/qmlprofiler
-usr/lib/*/qt5/bin/qmltestrunner
+usr/lib/qt5/bin/qmlcachegen
+usr/lib/qt5/bin/qmleasing
+usr/lib/qt5/bin/qmlimportscanner
+usr/lib/qt5/bin/qmllint
+usr/lib/qt5/bin/qmlmin
+usr/lib/qt5/bin/qmlplugindump
+usr/lib/qt5/bin/qmlprofiler
+usr/lib/qt5/bin/qmltestrunner
diff --git a/debian/rules b/debian/rules
index 8ddc836..ae31985 100755
--- a/debian/rules
+++ b/debian/rules
@@ -54,6 +54,13 @@ override_dh_missing:
 override_dh_makeshlibs:
 	dh_makeshlibs -V
 
+override_dh_link:
+	dh_link
+	ls debian/qtdeclarative5-dev-tools/usr/lib/qt5/bin | xargs -t -I {} \
+		dh_link -pqtdeclarative5-dev-tools usr/lib/qt5/bin/{} usr/lib/$(DEB_HOST_MULTIARCH)/qt5/bin/{}
+	dh_link -pqmlscene usr/lib/qt5/bin/qmlscene usr/lib/$(DEB_HOST_MULTIARCH)/qt5/bin/qmlscene
+	dh_link -pqml usr/lib/qt5/bin/qml usr/lib/$(DEB_HOST_MULTIARCH)/qt5/bin/qml
+
 override_dh_auto_test-arch:
 	$(MAKE) install -Csrc/imports INSTALL_ROOT=$(CURDIR)/test_root
 	mkdir -p $(CURDIR)/.local/share/QtProject/tst_qqmlengine

-- 
qtdeclarative packaging