[med-svn] [ugene] 05/10: d/rules: force QT5

[Gert Wollny]

This is an automated email from the git hooks/post-receive script.

gert-guest pushed a commit to branch master
in repository ugene.

commit 4f82d93079c5cda56ee4a837ec4b6b43555767b2
Author: Gert Wollny <gw.fossdev at gmail.com>
Date:   Thu Dec 3 12:41:58 2015 +0100

    d/rules: force QT5
---
 debian/control | 1 +
 debian/rules   | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/debian/control b/debian/control
index 0bc0cbe..ebe0a58 100644
--- a/debian/control
+++ b/debian/control
@@ -11,6 +11,7 @@ Build-Depends: qtbase5-dev,
                libqt5webkit5-dev,
                libqt5opengl5-dev,
                qtscript5-dev,
+	       qt5-qmake, 
                zlib1g-dev,
                debhelper (>= 9),
                libxtst-dev,
diff --git a/debian/rules b/debian/rules
index 0c20192..19b9e72 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,6 +5,9 @@ export DH_OPTIONS
 export DEB_BUILD_HARDENING=1
 export DEB_BUILD_HARDENING_FORTIFY=1
 
+#even with qt4-qmake deinstalled, qtchooser tries to use qmake from qt4
+export QT_SELECT=qt5 
+
 include /usr/share/hardening-includes/hardening.make
 
 CPPFLAGS=$(shell dpkg-buildflags --get CPPFLAGS)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/ugene.git