[SCM] qtbase packaging branch, experimental, updated. debian/5.10.0+dfsg-2-3-g78791ca

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit 78791ca553344ae6ce36d68b26576639adece686
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sat Dec 16 20:00:13 2017 +0300

    Make ${DEB_HOST_GNU_TYPE}-qmake script set QMAKE_QMAKE to itself.
    
    This is needed for properly building configuration tests.
---
 debian/changelog | 2 ++
 debian/rules     | 1 +
 2 files changed, 3 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index e0bb8b6..3963463 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ qtbase-opensource-src (5.10.0+dfsg-3) UNRELEASED; urgency=medium
   [ Dmitry Shachnev ]
   * Rename gnukfreebsd_cloexec.diff to gnukfreebsd_linker_warnings.diff.
     Add two more places where config tests are currently false positives.
+  * Make ${DEB_HOST_GNU_TYPE}-qmake script set QMAKE_QMAKE to itself.
+    This is needed for properly building configuration tests.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 07 Dec 2017 19:16:38 +0300
 
diff --git a/debian/rules b/debian/rules
index 36890ec..24ee610 100755
--- a/debian/rules
+++ b/debian/rules
@@ -267,6 +267,7 @@ endif
 		'QMAKE_CC=$${CC:-$(DEB_HOST_GNU_TYPE)-gcc}' \
 		'QMAKE_CXX=$${CXX:-$(DEB_HOST_GNU_TYPE)-g++}' \
 		'QMAKE_LINK=$${CXX:-$(DEB_HOST_GNU_TYPE)-g++}' \
+		"QMAKE_QMAKE=/usr/bin/$(DEB_HOST_GNU_TYPE)-qmake" \
 		"PKG_CONFIG=$(DEB_HOST_GNU_TYPE)-pkg-config" \
 		'"$$@"' \
 		>> debian/tmp/usr/bin/$(DEB_HOST_GNU_TYPE)-qmake

-- 
qtbase packaging