[SCM] marble packaging branch, kubuntu_wily_archive, updated. debian/4.14.2-1-52-gec42007

[Philip Muškovac]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/marble.git;a=commitdiff;h=ec42007

The following commit has been merged in the kubuntu_wily_archive branch:
commit ec4200771573fe0e535904da54bab3a239796103
Author: Philip Muškovac <yofel at gmx.net>
Date:   Tue Aug 18 00:56:41 2015 +0200

    make sure qt4 is really selected when running the commands
---
 debian/rules | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/rules b/debian/rules
index 0f01251..9886c48 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,7 +20,7 @@ override_dh_auto_configure:
 	$(overridden_command) -- -DWITH_DESIGNER_PLUGIN=ON \
 				 -DWITH_KF5=TRUE \
 				 $(conf_args)
-	QT_SELECT=qt4 $(overridden_command) --buildsystem=kde --builddirectory=obj-marble-qt4 -- \
+	export QT_SELECT=qt4; $(overridden_command) --buildsystem=kde --builddirectory=obj-marble-qt4 -- \
 				 -DQT5BUILD=FALSE \
 				 -DWITH_DESIGNER_PLUGIN=ON \
 				 -DMARBLE_PLUGIN_PATH=$(marble_plugin_path) \
@@ -28,7 +28,7 @@ override_dh_auto_configure:
 
 override_dh_auto_build:
 	$(overridden_command)
-	QT_SELECT=qt4 $(overridden_command) --builddirectory=obj-marble-qt4
+	export QT_SELECT=qt4; $(overridden_command) --builddirectory=obj-marble-qt4
 
 override_dh_installdirs:
 	$(overridden_command) -plibmarblewidget$(marble_soversion) $(marble_plugin_path)

-- 
marble packaging