[SCM] marble packaging branch, kubuntu_stable, updated. ubuntu/15.08.0-0ubuntu4-2-g967518d

[Harald Sitter]

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

The following commit has been merged in the kubuntu_stable branch:
commit 967518d6e1c7a03224c3025ec172b9486a11a622
Author: Harald Sitter <sitter at kde.org>
Date:   Tue Sep 1 10:40:54 2015 +0200

    fix install paths
    
    marble now uses multiarch properly
---
 debian/libastro-dev.install           | 2 +-
 debian/libastro1.install              | 4 ++--
 debian/libmarblewidget-qt5-22.install | 4 ++--
 debian/marble-plugins.install         | 8 ++++----
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/debian/libastro-dev.install b/debian/libastro-dev.install
index 5cd627e..dad2bf5 100644
--- a/debian/libastro-dev.install
+++ b/debian/libastro-dev.install
@@ -5,4 +5,4 @@ usr/include/astro/attlib.h
 usr/include/astro/eclsolar.h
 usr/include/astro/planetarySats.h
 usr/include/astro/solarsystem.h
-usr/lib/libastro.so
+usr/lib/*/libastro.so
diff --git a/debian/libastro1.install b/debian/libastro1.install
index 0e35fa7..e65a84c 100644
--- a/debian/libastro1.install
+++ b/debian/libastro1.install
@@ -1,2 +1,2 @@
-usr/lib/libastro.so.0.*
-usr/lib/libastro.so.1
+usr/lib/*/libastro.so.0.*
+usr/lib/*/libastro.so.1
diff --git a/debian/libmarblewidget-qt5-22.install b/debian/libmarblewidget-qt5-22.install
index 4b81a01..fafc468 100644
--- a/debian/libmarblewidget-qt5-22.install
+++ b/debian/libmarblewidget-qt5-22.install
@@ -1,2 +1,2 @@
-usr/lib/libmarblewidget-qt5.so.0.*
-usr/lib/libmarblewidget-qt5.so.22
+usr/lib/*/libmarblewidget-qt5.so.0.*
+usr/lib/*/libmarblewidget-qt5.so.22
diff --git a/debian/marble-plugins.install b/debian/marble-plugins.install
index f4d6469..9c80a02 100644
--- a/debian/marble-plugins.install
+++ b/debian/marble-plugins.install
@@ -1,4 +1,4 @@
-usr/lib/marble/plugins/lib*
-usr/lib/marble/plugins/org/kde/edu/marble/MarbleSettings.qml
-usr/lib/marble/plugins/org/kde/edu/marble/libMarbleDeclarativePlugin.so
-usr/lib/marble/plugins/org/kde/edu/marble/qmldir
+usr/lib/*/marble/plugins/lib*
+usr/lib/*/marble/plugins/org/kde/edu/marble/MarbleSettings.qml
+usr/lib/*/marble/plugins/org/kde/edu/marble/libMarbleDeclarativePlugin.so
+usr/lib/*/marble/plugins/org/kde/edu/marble/qmldir

-- 
marble packaging