[SCM] kdeconnect packaging branch, master, updated. debian/0.9g-1-1183-g9d69498

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=b618a64

The following commit has been merged in the master branch:
commit b618a64f51bd4ad38ecbf701e652012d0727cc9e
Merge: bf272ea3e72f45883ae5de32a3e73b7e86de7127 893378287494ad987f5100605103c0e45d9e1330
Author: Aleix Pol <aleixpol at kde.org>
Date:   Wed Jun 18 02:46:14 2014 +0200

    Merge remote-tracking branch 'origin/master' into frameworks
    
    Conflicts:
    	cli/kdeconnect-cli.cpp

 .reviewboardrc                                  |  3 +++
 cli/Messages.sh                                 |  3 +++
 cli/kdeconnect-cli.cpp                          |  2 +-
 core/Messages.sh                                | 10 ++--------
 core/daemon.cpp                                 |  3 +++
 fileitemactionplugin/Messages.sh                |  3 +++
 fileitemactionplugin/kdeconnectsendfile.desktop | 18 ++++++++++++++++++
 fileitemactionplugin/sendfileitemaction.cpp     |  2 +-
 kded/CMakeLists.txt                             |  3 +++
 kded/Messages.sh                                |  4 ++++
 plugins/Messages.sh                             |  4 ++++
 plugins/battery/batteryplugin.cpp               |  2 +-
 plugins/clipboard/clipboardplugin.cpp           |  2 +-
 plugins/mpriscontrol/mpriscontrolplugin.cpp     |  2 +-
 plugins/notifications/notificationsplugin.cpp   |  2 +-
 plugins/pausemusic/pausemusicplugin.cpp         |  2 +-
 plugins/ping/pingplugin.cpp                     |  2 +-
 plugins/sftp/sftpplugin.cpp                     |  2 +-
 plugins/share/shareplugin.cpp                   |  2 +-
 plugins/telephony/telephonyplugin.cpp           |  2 +-
 20 files changed, 54 insertions(+), 19 deletions(-)

diff --cc cli/kdeconnect-cli.cpp
index dcb7b82,184ef7e..be6a65e
--- a/cli/kdeconnect-cli.cpp
+++ b/cli/kdeconnect-cli.cpp
@@@ -30,8 -29,8 +30,8 @@@
  
  int main(int argc, char** argv)
  {
-     K4AboutData about("kctool", 0, ki18n(("kctool")), "1.0", ki18n("KDE Connect CLI tool"),
 -    KAboutData about("kctool", "kdeconnect-cli", ki18n(("kctool")), "1.0", ki18n("KDE Connect CLI tool"),
 -                     KAboutData::License_GPL, ki18n("(C) 2013 Aleix Pol Gonzalez"));
++    K4AboutData about("kctool", 0, ki18n(("kdeconnect-cli")), "1.0", ki18n("KDE Connect CLI tool"),
 +                     K4AboutData::License_GPL, ki18n("(C) 2013 Aleix Pol Gonzalez"));
      about.addAuthor( ki18n("Aleix Pol Gonzalez"), KLocalizedString(), "aleixpol at kde.org" );
      KCmdLineArgs::init(argc, argv, &about);
      KCmdLineOptions options;
diff --cc fileitemactionplugin/sendfileitemaction.cpp
index 36325c9,6b2dd72..2c3ddf3
--- a/fileitemactionplugin/sendfileitemaction.cpp
+++ b/fileitemactionplugin/sendfileitemaction.cpp
@@@ -36,10 -36,9 +36,10 @@@
  #include <KDebug>
  #include <KProcess>
  #include <KLocalizedString>
 +#include <KUrl>
  
  K_PLUGIN_FACTORY(SendFileItemActionFactory, registerPlugin<SendFileItemAction>();)
- K_EXPORT_PLUGIN(SendFileItemActionFactory("SendFileItemAction", "kdeconnectfiletiemaction"))
+ K_EXPORT_PLUGIN(SendFileItemActionFactory("SendFileItemAction", "kdeconnect-filetiemaction"))
  
  SendFileItemAction::SendFileItemAction(QObject* parent, const QVariantList& ): KFileItemActionPlugin(parent)
  {

-- 
kdeconnect packaging