[SCM] marble packaging branch, kubuntu_wily_archive, updated. debian/4.14.2-1-48-g2c39c33

[Philip Muškovac]

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

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

    fix qt4 configure
---
 debian/rules | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/rules b/debian/rules
index 9d6153f..7d8c280 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,8 @@ include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
 libpkgs_gen_strict_local_shlibs = $(libpkgs_all_packages)
 include /usr/share/pkg-kde-tools/qt-kde-team/3/library-packages.mk
 
-marble_soversion := $(shell dh_listpackages | sed -n '/^libmarblewidget/{s/^libmarblewidget//p}')
+#marble_soversion := $(shell dh_listpackages | sed -n '/^libmarblewidget/{s/^libmarblewidget//p}')
+marble_soversion := 21
 marble_plugin_path = /usr/lib/kde4/plugins/marble/$(marble_soversion)
 
 vendor := $(shell dpkg-vendor --query Vendor)
@@ -19,7 +20,7 @@ override_dh_auto_configure:
 	$(overridden_command) -- -DWITH_DESIGNER_PLUGIN=ON \
 				 -DWITH_KF5=TRUE \
 				 $(conf_args)
-	$(overridden_command) -- --builddirectory=obj-marble-qt4 \
+	$(overridden_command) --builddirectory=obj-marble-qt4 -- \
 				 -DQT5BUILD=FALSE \
 				 -DWITH_DESIGNER_PLUGIN=ON \
 				 -DMARBLE_PLUGIN_PATH=$(marble_plugin_path) \

-- 
marble packaging