[Pkg-owncloud-commits] [owncloud-client] 96/484: Merge branch 'dolphin-plugin'

[Sandro Knauß]

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

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

commit f8e68ae823ea8a2080d150793818f33ef540387f
Merge: 5cac90b 184412d
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Mon Oct 19 15:41:47 2015 +0200

    Merge branch 'dolphin-plugin'

 .../dolphin_kf5/0001-KOverlayIconPlugin.patch      | 267 ---------------------
 shell_integration/dolphin_kf5/CMakeLists.txt       |  48 ++--
 shell_integration/dolphin_kf5/README               |   7 +-
 .../dolphin_kf5/ownclouddolphinactionplugin.cpp    |  67 ++++++
 .../ownclouddolphinactionplugin.desktop            |   6 +
 .../dolphin_kf5/ownclouddolphinoverlayplugin.cpp   |  97 ++++++++
 .../dolphin_kf5/ownclouddolphinoverlayplugin.json  |   8 +
 .../dolphin_kf5/ownclouddolphinplugin.cpp          | 131 ----------
 .../dolphin_kf5/ownclouddolphinplugin.desktop      |   6 -
 .../dolphin_kf5/ownclouddolphinpluginhelper.cpp    |  98 ++++++++
 .../dolphin_kf5/ownclouddolphinpluginhelper.h      |  52 ++++
 11 files changed, 361 insertions(+), 426 deletions(-)

diff --cc shell_integration/dolphin_kf5/README
index 69553a3,8dc7897..f79615c
--- a/shell_integration/dolphin_kf5/README
+++ b/shell_integration/dolphin_kf5/README
@@@ -1,9 -1,6 +1,4 @@@
- 
--
- - The patch 0001-KOverlayIconPlugin.patch should be applied to kde-baseapps git repository
- (It should apply to frameworks branch)
--
- - Recompile and install dolphin (frameworks branch)
+ - Recompile and install recent enough version of dolphin and kio (git from oct 2015)
  
  - Build and install the plugin
  

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