[SCM] qtchooser packaging branch, master, updated. debian/64-ga1b6736-4-7-g55d91de

[Dmitry Shachnev]

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

The following commit has been merged in the master branch:
commit cef19482cf1a6c8df8ce65df22cbe538d24e1129
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Thu Dec 21 23:52:07 2017 +0300

    Use non-multiarch location of qmake for running the tests.
---
 debian/changelog | 1 +
 debian/control   | 2 +-
 debian/rules     | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f52c946..7ffb8ce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ qtchooser (64-ga1b6736-5) UNRELEASED; urgency=medium
   [ Dmitry Shachnev ]
   * Add Breaks/Replaces against qtchooser-bin (closes: #884823).
   * Update debian/copyright.
+  * Use non-multiarch location of qmake for running the tests.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 21 Dec 2017 23:30:31 +0300
 
diff --git a/debian/control b/debian/control
index 06a74bb..da3a00f 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Uploaders: Timo Jyrinki <timo at debian.org>,
            Dmitry Shachnev <mitya57 at debian.org>
 Build-Depends: debhelper (>= 9.20141010),
                dpkg-dev (>= 1.17.14),
-               qtbase5-dev <!stage1 !nocheck>
+               qtbase5-dev (>= 5.9.2+dfsg-3~) <!stage1 !nocheck>
 Standards-Version: 4.1.1
 Homepage: https://qt-project.org/
 Vcs-Git: https://anonscm.debian.org/git/pkg-kde/qt/qtchooser.git
diff --git a/debian/rules b/debian/rules
index 290df28..4ff3532 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,7 +9,7 @@ ifeq ($(origin CXX),default)
 endif
 
 %:
-	dh $@ 
+	dh $@
 
 override_dh_auto_build:
 	make QTCHOOSER_GLOBAL_DIR=/usr/share:/usr/lib/$(DEB_HOST_MULTIARCH):/usr/lib/$(DEB_HOST_MULTIARCH)/qt-default CXX=$(CXX)
@@ -33,6 +33,6 @@ override_dh_auto_install:
 override_dh_auto_test:
 ifeq (,$(filter stage1,$(DEB_BUILD_PROFILES)))
 ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
-	make check QMAKE=/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/bin/qmake
+	make check QMAKE=/usr/lib/qt5/bin/qmake
 endif
 endif

-- 
qtchooser packaging