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

[Modestas Vainius]

The following commit has been merged in the master branch:
commit 5f44d4090756de0e258e9aeee26030bf39561979
Author: Modestas Vainius <modax at debian.org>
Date:   Thu May 26 22:00:14 2011 +0300

    Ship empty /usr/lib/kde4/plugins/marble/11 in libmarblewidget11.
    
    This should keep libmarblewidget from falling back to
    /usr/lib/kde4/plugins/marble as plugin dir.
---
 debian/changelog |    3 +++
 debian/rules     |    9 +++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 71cc79b..5491dfa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,9 @@ kdeedu (4:4.6.3-0r0) UNRELEASED; urgency=low
   * Confirm symbol files on more debian arches.
   * Install marble plugins into SOVERSION'ed subdirectory so binary
     incompatible libmarblewidget can't load them.
+  * Ship empty /usr/lib/kde4/plugins/marble/11 in libmarblewidget11
+    in order to keep it from falling back to /usr/lib/kde4/plugins/marble as
+    plugin dir.
 
   [ José Manuel Santamaría Lema ]
   * Bump kde-sc-dev-latest build dependency to 4:4.6.3.
diff --git a/debian/rules b/debian/rules
index a9fe408..67128e8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,15 +4,20 @@ 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}')
+marble_soversion := $(shell dh_listpackages | sed -n '/^libmarblewidget/{s/^libmarblewidget//p}')
+marble_plugin_path = /usr/lib/kde4/plugins/marble/$(marble_soversion)
 
 override_dh_auto_configure:
 	$(overridden_command) -- -DWITH_DESIGNER_PLUGIN=ON \
         -DKDEEDU_KTOUCH_BUILD_WITH_PHONON=ON \
-        -DMARBLE_PLUGIN_PATH=/usr/lib/kde4/plugins/marble/$(marble_soversion)
+        -DMARBLE_PLUGIN_PATH=$(marble_plugin_path)
 
 .PHONY: override_dh_auto_test
 
+override_dh_installdirs:
+	$(overridden_command) -plibmarblewidget$(marble_soversion) $(marble_plugin_path)
+	$(overridden_command) --remaining-packages
+
 override_dh_install:
 	$(overridden_command) -Xusr/share/kde4/apps/marble/data/LICENSE.txt
 

-- 
KDE Education module packaging