[SCM] telepathy-accounts-signon packaging branch, master, updated. debian/1.0-1-2-gc7f12bf

[Rohan Garg]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/telepathy-accounts-signon.git;a=commitdiff;h=c7f12bf

The following commit has been merged in the master branch:
commit c7f12bf9262374519083f70d0a6fb6d95b721866
Author: Rohan Garg <rohan at garg.io>
Date:   Thu Apr 28 21:05:06 2016 +0200

    We need to export QT_SELECT to pick the right qmake
    
    The qmake dh sequence pushes the -nocache flag causing qtchooser
    to incorrectly resolve to the qt4 qmake. We need to export QT_SELECT
    in order to resolve to the right one instead.
    
    We should also explicitly build-dep on qt5-qmake
---
 debian/control | 3 ++-
 debian/rules   | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index 6cc19bd..e3836fc 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,8 @@ Build-Depends: debhelper (>= 9),
  libmission-control-plugins-dev,
  libtelepathy-glib-dev,
  libsignon-glib-dev,
- libaccounts-glib-dev
+ libaccounts-glib-dev,
+ qt5-qmake
 Standards-Version: 3.9.6
 Homepage: https://gitlab.com/accounts-sso/telepathy-accounts-signon
 Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/kde-extras/telepathy-accounts-signon
diff --git a/debian/rules b/debian/rules
index b6c70b5..0f8f4aa 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,7 @@
 
 include /usr/share/dpkg/default.mk
 export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
+export QT_SELECT := qt5
 
 %:
 	dh $@ --buildsystem qmake

-- 
telepathy-accounts-signon packaging