[SCM] marble packaging branch, master, updated. eb1a3a01611f5b8cb28bfe96652f3bebbaecf9f8

[José Manuel Santamaría Lema]

The following commit has been merged in the master branch:
commit 0362a7c451e8c818e8ca5b564e6e7af6e3f4c859
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Wed Nov 16 10:47:22 2011 +0100

    Build the Qt Mobility positionp rovider plugin.
---
 debian/control                      |    3 ++-
 debian/marble-plugins.install.linux |    1 +
 debian/rules                        |    5 +++++
 3 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/debian/control b/debian/control
index 75f769f..1c9ce74 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,8 @@ Build-Depends: kde-sc-dev-latest (>= 4:4.7.2),
  pkg-config,
  libgps-dev (>= 2.90),
  libx11-dev,
- libqtwebkit-dev
+ libqtwebkit-dev,
+ qtmobility-dev [linux-any]
 Standards-Version: 3.9.2
 Homepage: http://edu.kde.org/
 Vcs-Browser: http://git.debian.org/?p=pkg-kde/kde-sc/marble.git
diff --git a/debian/marble-plugins.install.linux b/debian/marble-plugins.install.linux
new file mode 100644
index 0000000..b055aa5
--- /dev/null
+++ b/debian/marble-plugins.install.linux
@@ -0,0 +1 @@
+usr/lib/kde4/plugins/marble/12/QtMobilityPositionProviderPlugin.so
diff --git a/debian/rules b/debian/rules
index 9062715..b584833 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,8 +24,13 @@ override_dh_installdirs:
 	$(overridden_command) -plibmarblewidget$(marble_soversion) $(marble_plugin_path)
 	$(overridden_command) --remaining-packages
 
+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
+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)
+endif
 
 override_dh_makeshlibs:
 	$(overridden_command) -V -- -c0

-- 
marble packaging