[SCM] qtbase packaging branch, experimental, updated. debian/5.9.2+dfsg-2-13-gf8d183e

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit f8d183eabc6a9a80b7c1e200bef43584f0045f52
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Thu Oct 19 17:04:07 2017 +0300

    Move all Qt binaries to a non-multiarch location, /usr/lib/qt5/bin/.
    
    Provide compatibility symlinks for the old location.
---
 debian/changelog                 |  3 +++
 debian/qt5-qmake-bin.install     |  2 +-
 debian/qt5-qmake-bin.links       |  2 ++
 debian/qtbase5-dev-tools.install | 16 ++++++++--------
 debian/qtbase5-dev-tools.links   |  9 +++++++++
 debian/rules                     |  2 +-
 6 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6ab9082..30e2ad5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ qtbase-opensource-src (5.9.2+dfsg-3) UNRELEASED; urgency=medium
 
   [ Dmitry Shachnev ]
   * Merge 5.9.1+dfsg-12 upload from unstable.
+  * Move all Qt binaries to a non-multiarch location, /usr/lib/qt5/bin/, for
+    improved cross-build support. Provide compatibility symlinks for the old
+    location.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 19 Oct 2017 16:23:43 +0300
 
diff --git a/debian/qt5-qmake-bin.install b/debian/qt5-qmake-bin.install
index 9e292b0..702f2f5 100644
--- a/debian/qt5-qmake-bin.install
+++ b/debian/qt5-qmake-bin.install
@@ -1 +1 @@
-usr/lib/*/qt5/bin/qmake
+usr/lib/qt5/bin/qmake
diff --git a/debian/qt5-qmake-bin.links b/debian/qt5-qmake-bin.links
new file mode 100755
index 0000000..583a2c3
--- /dev/null
+++ b/debian/qt5-qmake-bin.links
@@ -0,0 +1,2 @@
+#! /usr/bin/dh-exec
+usr/lib/qt5/bin/qmake usr/lib/${DEB_HOST_MULTIARCH}/qt5/bin/qmake
diff --git a/debian/qtbase5-dev-tools.install b/debian/qtbase5-dev-tools.install
index 063597c..7d99ec2 100644
--- a/debian/qtbase5-dev-tools.install
+++ b/debian/qtbase5-dev-tools.install
@@ -1,8 +1,8 @@
-usr/lib/*/qt5/bin/fixqt4headers.pl
-usr/lib/*/qt5/bin/moc
-usr/lib/*/qt5/bin/qdbuscpp2xml
-usr/lib/*/qt5/bin/qdbusxml2cpp
-usr/lib/*/qt5/bin/qlalr
-usr/lib/*/qt5/bin/rcc
-usr/lib/*/qt5/bin/syncqt.pl
-usr/lib/*/qt5/bin/uic
+usr/lib/qt5/bin/fixqt4headers.pl
+usr/lib/qt5/bin/moc
+usr/lib/qt5/bin/qdbuscpp2xml
+usr/lib/qt5/bin/qdbusxml2cpp
+usr/lib/qt5/bin/qlalr
+usr/lib/qt5/bin/rcc
+usr/lib/qt5/bin/syncqt.pl
+usr/lib/qt5/bin/uic
diff --git a/debian/qtbase5-dev-tools.links b/debian/qtbase5-dev-tools.links
new file mode 100755
index 0000000..d3e4785
--- /dev/null
+++ b/debian/qtbase5-dev-tools.links
@@ -0,0 +1,9 @@
+#! /usr/bin/dh-exec
+usr/lib/qt5/bin/fixqt4headers.pl usr/lib/${DEB_HOST_MULTIARCH}/qt5/bin/fixqt4headers.pl
+usr/lib/qt5/bin/moc              usr/lib/${DEB_HOST_MULTIARCH}/qt5/bin/moc
+usr/lib/qt5/bin/qdbuscpp2xml     usr/lib/${DEB_HOST_MULTIARCH}/qt5/bin/qdbuscpp2xml
+usr/lib/qt5/bin/qdbusxml2cpp     usr/lib/${DEB_HOST_MULTIARCH}/qt5/bin/qdbusxml2cpp
+usr/lib/qt5/bin/qlalr            usr/lib/${DEB_HOST_MULTIARCH}/qt5/bin/qlalr
+usr/lib/qt5/bin/rcc              usr/lib/${DEB_HOST_MULTIARCH}/qt5/bin/rcc
+usr/lib/qt5/bin/syncqt.pl        usr/lib/${DEB_HOST_MULTIARCH}/qt5/bin/syncqt.pl
+usr/lib/qt5/bin/uic              usr/lib/${DEB_HOST_MULTIARCH}/qt5/bin/uic
diff --git a/debian/rules b/debian/rules
index ae7495b..8b8dc05 100755
--- a/debian/rules
+++ b/debian/rules
@@ -67,7 +67,7 @@ override_dh_auto_configure:
 	        ./configure \
 	            -confirm-license \
 	            -prefix "/usr" \
-	            -bindir "/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/bin" \
+	            -bindir "/usr/lib/qt5/bin" \
 	            -libdir "/usr/lib/$(DEB_HOST_MULTIARCH)" \
 	            -docdir "/usr/share/qt5/doc" \
 	            -headerdir "/usr/include/$(DEB_HOST_MULTIARCH)/qt5" \

-- 
qtbase packaging