[Pkg-owncloud-commits] [owncloud-client] 01/01: Install dolphin-plugin libraries to right places.

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch experimental
in repository owncloud-client.

commit 5c56eb18df51349be71365d0fd4ec8e1c697ca7d
Author: Sandro Knauß <bugs at sandroknauss.de>
Date:   Fri Feb 5 14:29:02 2016 +0100

    Install dolphin-plugin libraries to right places.
---
 debian/dolphin-owncloud.install                    |  6 ++--
 .../0009-fix-installpath-of-dolphin-plugin.patch   | 36 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 debian/rules                                       |  2 +-
 4 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/debian/dolphin-owncloud.install b/debian/dolphin-owncloud.install
index c7defd8..d8a9f12 100644
--- a/debian/dolphin-owncloud.install
+++ b/debian/dolphin-owncloud.install
@@ -1,4 +1,4 @@
-usr/lib/*/libownclouddolphinpluginhelper.so
-usr/lib/*/plugins/ownclouddolphinactionplugin.so
-usr/lib/*/plugins/kf5/overlayicon/ownclouddolphinoverlayplugin.so
+usr/lib/*/owncloud/libownclouddolphinpluginhelper.so
+usr/lib/*/qt5/plugins/ownclouddolphinactionplugin.so
+usr/lib/*/qt5/plugins/kf5/overlayicon/ownclouddolphinoverlayplugin.so
 usr/share/kservices5/ownclouddolphinactionplugin.desktop
diff --git a/debian/patches/0009-fix-installpath-of-dolphin-plugin.patch b/debian/patches/0009-fix-installpath-of-dolphin-plugin.patch
new file mode 100644
index 0000000..804695d
--- /dev/null
+++ b/debian/patches/0009-fix-installpath-of-dolphin-plugin.patch
@@ -0,0 +1,36 @@
+Description: Debianize installation folder for kde plugins
+ Inside debian we want that the kde plugins are directly found,
+ so we need to push them to known places.
+Author: Sandro Knauß <bugs at sandroknauss.de>
+Origin: Debian
+Forwarded: not-needed
+Last-Update: 2016-02-05
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: owncloud-client/shell_integration/dolphin/CMakeLists.txt
+===================================================================
+--- owncloud-client.orig/shell_integration/dolphin/CMakeLists.txt	2016-02-05 14:21:33.305527000 +0100
++++ owncloud-client/shell_integration/dolphin/CMakeLists.txt	2016-02-05 14:21:33.305527000 +0100
+@@ -32,15 +32,20 @@
+ add_library(ownclouddolphinpluginhelper SHARED ownclouddolphinpluginhelper.cpp)
+ target_link_libraries(ownclouddolphinpluginhelper Qt5::Network)
+ generate_export_header(ownclouddolphinpluginhelper)
+-install(TARGETS ownclouddolphinpluginhelper LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
++install(TARGETS ownclouddolphinpluginhelper LIBRARY DESTINATION "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE}")
+ 
+ #---OVERLAY PLUGIN---
+ kcoreaddons_add_plugin(ownclouddolphinoverlayplugin INSTALL_NAMESPACE "kf5/overlayicon"
+                        JSON ownclouddolphinoverlayplugin.json SOURCES ownclouddolphinoverlayplugin.cpp)
+ target_link_libraries(ownclouddolphinoverlayplugin KF5::CoreAddons KF5::KIOCore KF5::KIOWidgets ownclouddolphinpluginhelper)
++set_target_properties(ownclouddolphinoverlayplugin PROPERTIES
++	INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE}")
+ 
+ #---ACTION PLUGIN---
+ add_library(ownclouddolphinactionplugin MODULE ownclouddolphinactionplugin.cpp)
+ target_link_libraries(ownclouddolphinactionplugin KF5::CoreAddons KF5::KIOCore KF5::KIOWidgets ownclouddolphinpluginhelper)
+ install(FILES ownclouddolphinactionplugin.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
+-install(TARGETS ownclouddolphinactionplugin DESTINATION ${KDE_INSTALL_PLUGINDIR})
++install(TARGETS ownclouddolphinactionplugin DESTINATION "${PLUGIN_INSTALL_DIR}") 
++
++set_target_properties(ownclouddolphinactionplugin PROPERTIES
++	INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE}")
diff --git a/debian/patches/series b/debian/patches/series
index 846cf2d..dd3cdd0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@
 0006-move-configfile.patch
 0007-move-translations.patch
 0008-make-reproducable.patch
+0009-fix-installpath-of-dolphin-plugin.patch
diff --git a/debian/rules b/debian/rules
index 519720e..238fdd3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,7 +18,7 @@ else
 endif
 
 override_dh_auto_configure:
-	dh_auto_configure -- -DCMAKE_INSTALL_PREFIX=/usr -DUNIT_TESTING=ON -DDEBIAN_VERSION=$(DEB_VERSION)
+	dh_auto_configure -- -DCMAKE_INSTALL_PREFIX=/usr -DUNIT_TESTING=ON -DDEBIAN_VERSION=$(DEB_VERSION) -DPLUGIN_INSTALL_DIR=/usr/lib/$(DEB_HOST_GNU_TYPE)/qt5/plugins
 
 override_dh_auto_build:
 	optipng doc/images/*png

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git