[SCM] Calligra suite packaging branch, master, updated. debian/2.8.5+dfsg-1-55-g3a62007

[Dmitry Smirnov]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-std/calligra.git;a=commitdiff;h=dfc2467

The following commit has been merged in the master branch:
commit dfc24672f716db14598da00612d51e29644a5303
Author: Dmitry Smirnov <onlyjob at member.fsf.org>
Date:   Mon Sep 28 21:41:06 2015 +1000

    rules: explicitly select QT4 to fix FTBFS:
    
    ~~~~
     CMake Error: The following variables are used in this project, but they are set to NOTFOUND.
     Please set them or make sure they are set and tested correctly in the CMake files:
     QT_QT_INCLUDE_DIR
        used as include directory in directory /tmp/buildd/calligra-2.9.7+dfsg/obj-x86_64-linux-gnu/CMakeFiles/CMakeTmp
    
     CMake Error: Internal CMake error, TryCompile configure of cmake failed
    
     CMake Error at /usr/share/kde4/apps/cmake/modules/FindKDE4Internal.cmake:1316 (message):
       Unable to compile a basic Qt application.  Qt has not been found correctly.
     Call Stack (most recent call first):
       /usr/share/cmake-3.3/Modules/FindKDE4.cmake:108 (find_package)
       CMakeLists.txt:154 (find_package)
    ~~~~
---
 debian/rules | 1 +
 1 file changed, 1 insertion(+)

diff --git a/debian/rules b/debian/rules
index 6809337..f61faa3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,6 +7,7 @@ lib_pkgs := calligra-libs
 
 export DEB_LDFLAGS_MAINT_APPEND := -Wl,--as-needed
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+export QT_SELECT=4
 
 %:
 	dh $@ --parallel --with kde --with sodeps

-- 
Calligra suite packaging