[SCM] marble packaging branch, kubuntu_wily_archive, updated. debian/4.14.2-1-46-g21d6fd9

[Philip Muškovac]

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

The following commit has been merged in the kubuntu_wily_archive branch:
commit 21d6fd975b7f751a0bfa996f8572f5b05785bd94
Author: Philip Muškovac <yofel at gmx.net>
Date:   Mon Aug 17 23:51:43 2015 +0200

    attempt to double-build kf5 and qt4
---
 debian/changelog                      |  1 +
 debian/control                        |  4 ++++
 debian/libmarblewidget-qt5-22.install |  2 +-
 debian/rules                          | 12 +++++++++++-
 4 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ff4383c..672824f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ marble (4:15.08.0-0ubuntu1) UNRELEASED; urgency=medium
 
   [ Philip Muškovac ]
   * Add upstream_fix-vtable-linking.diff to fix vtable linking
+  * Double-build kf5 and qt4 to keep libmarblewidget21 package
 
  -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 13 Aug 2015 11:44:25 +0100
 
diff --git a/debian/control b/debian/control
index 2d3e951..994343b 100644
--- a/debian/control
+++ b/debian/control
@@ -14,9 +14,13 @@ Build-Depends: cmake,
                libkf5runner-dev,
                libkf5wallet-dev,
                libphonon4qt5-dev,
+               libqt4-dev,
+               libqt4-opengl-dev,
                libqt5opengl5-dev,
                libqt5svg5-dev,
                libqt5webkit5-dev,
+               libqtwebkit-dev,
+               libquazip-dev,
                libquazip-qt5-dev,
                libshp-dev,
                libwlocate-dev,
diff --git a/debian/libmarblewidget-qt5-22.install b/debian/libmarblewidget-qt5-22.install
index 2b04b1e..453fecd 100644
--- a/debian/libmarblewidget-qt5-22.install
+++ b/debian/libmarblewidget-qt5-22.install
@@ -1,2 +1,2 @@
-usr/lib/libmarblewidget-qt5.so.22
 usr/lib/libmarblewidget-qt5.so.*
+usr/lib/libmarblewidget-qt5.so.22
diff --git a/debian/rules b/debian/rules
index 02b6b3d..9d6153f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,9 +17,17 @@ endif
 
 override_dh_auto_configure:
 	$(overridden_command) -- -DWITH_DESIGNER_PLUGIN=ON \
-				 -DMARBLE_PLUGIN_PATH=$(marble_plugin_path) \
 				 -DWITH_KF5=TRUE \
 				 $(conf_args)
+	$(overridden_command) -- --builddirectory=obj-marble-qt4 \
+				 -DQT5BUILD=FALSE \
+				 -DWITH_DESIGNER_PLUGIN=ON \
+				 -DMARBLE_PLUGIN_PATH=$(marble_plugin_path) \
+				 $(conf_args)
+
+override_dh_auto_build:
+	$(overridden_command)
+	$(overridden_command) --builddirectory=obj-marble-qt4
 
 override_dh_installdirs:
 	$(overridden_command) -plibmarblewidget$(marble_soversion) $(marble_plugin_path)
@@ -28,6 +36,7 @@ override_dh_installdirs:
 pkgs_with_install_linux = $(patsubst debian/%.install.linux,%,$(wildcard debian/*.install.linux))
 override_dh_install:
 	$(overridden_command) -Xusr/share/kde4/apps/marble/data/LICENSE.txt
+	$(overridden_command) --sourcedir=obj-marble-qt4
 ifeq ($(DEB_HOST_ARCH_OS),linux)
 	# Also install common files in place of debian/*.install.linux variants
 	dh_install $(foreach p,$(pkgs_with_install_linux),-p$p --ignore=debian/$p.install.linux)
@@ -48,3 +57,4 @@ override_dh_auto_test:
 
 override_dh_clean:
 	$(overridden_command) -Xdata/mwdbii/PISLAND.PNT.orig -Xdata/mwdbii/PLAKE.PNT.orig
+	rm -rf obj-marble-qt4

-- 
marble packaging