[SCM] KDE Education module packaging branch, master, updated. debian/4.6.2-1-5-g2c14ac6

[Modestas Vainius]

The following commit has been merged in the master branch:
commit 2c14ac6e957bb258bb13a15ecb4e1da6de48356e
Author: Modestas Vainius <modax at debian.org>
Date:   Thu May 26 02:17:42 2011 +0300

    Install marble plugins into SOVERSION'ed subdirectory.
    
    As a result, binary incompatible libmarblewidget can't load them.
---
 debian/changelog              |    2 +
 debian/marble-plugins.install |   54 ++++++++++++++++++++--------------------
 debian/rules                  |    5 +++-
 3 files changed, 33 insertions(+), 28 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8072fbb..3f7db45 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ kdeedu (4:4.6.3-0r0) UNRELEASED; urgency=low
 
   [ Modestas Vainius ]
   * Confirm symbol files on more debian arches.
+  * Install marble plugins into SOVERSION'ed subdirectory so binary
+    incompatible libmarblewidget can't load them.
 
   [ José Manuel Santamaría Lema ]
   * Bump kde-sc-dev-latest build dependency to 4:4.6.3.
diff --git a/debian/marble-plugins.install b/debian/marble-plugins.install
index 4f178ee..70a14f3 100644
--- a/debian/marble-plugins.install
+++ b/debian/marble-plugins.install
@@ -1,27 +1,27 @@
-usr/lib/kde4/plugins/marble/AprsPlugin.so
-usr/lib/kde4/plugins/marble/CompassFloatItem.so
-usr/lib/kde4/plugins/marble/CrosshairsPlugin.so
-usr/lib/kde4/plugins/marble/GosmorePlugin.so
-usr/lib/kde4/plugins/marble/GpsdPositionProviderPlugin.so
-usr/lib/kde4/plugins/marble/GraticulePlugin.so
-usr/lib/kde4/plugins/marble/HostipPlugin.so
-usr/lib/kde4/plugins/marble/LatLonPlugin.so
-usr/lib/kde4/plugins/marble/LocalDatabasePlugin.so
-usr/lib/kde4/plugins/marble/MapScaleFloatItem.so
-usr/lib/kde4/plugins/marble/MonavPlugin.so
-usr/lib/kde4/plugins/marble/NavigationFloatItem.so
-usr/lib/kde4/plugins/marble/NominatimPlugin.so
-usr/lib/kde4/plugins/marble/OpenRouteServicePlugin.so
-usr/lib/kde4/plugins/marble/OverviewMap.so
-usr/lib/kde4/plugins/marble/Photo.so
-usr/lib/kde4/plugins/marble/PositionMarker.so
-usr/lib/kde4/plugins/marble/ProgressFloatItem.so
-usr/lib/kde4/plugins/marble/QNamNetworkPlugin.so
-usr/lib/kde4/plugins/marble/RoutingPlugin.so
-usr/lib/kde4/plugins/marble/RoutinoPlugin.so
-usr/lib/kde4/plugins/marble/StarsPlugin.so
-usr/lib/kde4/plugins/marble/Weather.so
-usr/lib/kde4/plugins/marble/Wikipedia.so
-usr/lib/kde4/plugins/marble/YoursPlugin.so
-usr/lib/kde4/plugins/marble/org/kde/edu/marble/libMarbleDeclarativePlugin.so
-usr/lib/kde4/plugins/marble/org/kde/edu/marble/qmldir
+usr/lib/kde4/plugins/marble/11/AprsPlugin.so
+usr/lib/kde4/plugins/marble/11/CompassFloatItem.so
+usr/lib/kde4/plugins/marble/11/CrosshairsPlugin.so
+usr/lib/kde4/plugins/marble/11/GosmorePlugin.so
+usr/lib/kde4/plugins/marble/11/GpsdPositionProviderPlugin.so
+usr/lib/kde4/plugins/marble/11/GraticulePlugin.so
+usr/lib/kde4/plugins/marble/11/HostipPlugin.so
+usr/lib/kde4/plugins/marble/11/LatLonPlugin.so
+usr/lib/kde4/plugins/marble/11/LocalDatabasePlugin.so
+usr/lib/kde4/plugins/marble/11/MapScaleFloatItem.so
+usr/lib/kde4/plugins/marble/11/MonavPlugin.so
+usr/lib/kde4/plugins/marble/11/NavigationFloatItem.so
+usr/lib/kde4/plugins/marble/11/NominatimPlugin.so
+usr/lib/kde4/plugins/marble/11/OpenRouteServicePlugin.so
+usr/lib/kde4/plugins/marble/11/OverviewMap.so
+usr/lib/kde4/plugins/marble/11/Photo.so
+usr/lib/kde4/plugins/marble/11/PositionMarker.so
+usr/lib/kde4/plugins/marble/11/ProgressFloatItem.so
+usr/lib/kde4/plugins/marble/11/QNamNetworkPlugin.so
+usr/lib/kde4/plugins/marble/11/RoutingPlugin.so
+usr/lib/kde4/plugins/marble/11/RoutinoPlugin.so
+usr/lib/kde4/plugins/marble/11/StarsPlugin.so
+usr/lib/kde4/plugins/marble/11/Weather.so
+usr/lib/kde4/plugins/marble/11/Wikipedia.so
+usr/lib/kde4/plugins/marble/11/YoursPlugin.so
+usr/lib/kde4/plugins/marble/11/org/kde/edu/marble/libMarbleDeclarativePlugin.so
+usr/lib/kde4/plugins/marble/11/org/kde/edu/marble/qmldir
diff --git a/debian/rules b/debian/rules
index 27ddafd..7ac9a78 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,8 +4,11 @@ include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk
 libpkgs_gen_strict_local_shlibs = $(libpkgs_all_packages)
 include /usr/share/pkg-kde-tools/qt-kde-team/2/library-packages.mk
 
+marble_soversion = $(shell dh_listpackages | sed -n '/^libmarblewidget/{s/^libmarblewidget//p}')
+
 override_dh_auto_configure:
-	$(overridden_command) -- -DWITH_DESIGNER_PLUGIN=ON
+	$(overridden_command) -- -DWITH_DESIGNER_PLUGIN=ON \
+        -DMARBLE_PLUGIN_PATH=/usr/lib/kde4/plugins/marble/$(marble_soversion)
 
 .PHONY: override_dh_auto_test
 

-- 
KDE Education module packaging