[SCM] marble packaging branch, kubuntu_unstable, updated. ubuntu/4%15.08.1-0ubuntu1-20-gcd0e5f0

[Harald Sitter]

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

The following commit has been merged in the kubuntu_unstable branch:
commit cd0e5f0c64086294bfcccd361fba6049cb6cd2e4
Author: Harald Sitter <sitter at kde.org>
Date:   Thu Sep 24 10:14:36 2015 +0200

    fix name mangling and install path correctly
---
 debian/marble-plugins.install | 2 +-
 debian/rules                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/marble-plugins.install b/debian/marble-plugins.install
index 1b72f2c..334f2f5 100644
--- a/debian/marble-plugins.install
+++ b/debian/marble-plugins.install
@@ -1,2 +1,2 @@
 usr/lib/*/libmarbledeclarative.so
-usr/lib/*/marble/plugins/lib*
+usr/lib/*/marble/plugins/23/lib*.so
diff --git a/debian/rules b/debian/rules
index 81090d1..f2a320e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,7 @@ include /usr/share/pkg-kde-tools/qt-kde-team/3/library-packages.mk
 
 # Move plugins to a soversion specific directory to ease transitions
 # https://bugs.kde.org/show_bug.cgi?id=353078
-marble_soversion := $(shell dh_listpackages | sed -n '/^libmarblewidget/{s/^libmarblewidget//p}')
+marble_soversion := $(shell dh_listpackages | sed -n '/^libmarblewidget-qt5-/{s/^libmarblewidget-qt5-//p}')
 marble_plugin_path = /usr/lib/${DEB_HOST_MULTIARCH}/marble/plugins/$(marble_soversion)
 
 vendor := $(shell dpkg-vendor --query Vendor)

-- 
marble packaging