[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=06d8b3c

The following commit has been merged in the master branch:
commit 06d8b3c54e8e4c73382584faab1abab309dd1df9
Merge: 2824e736172f2533a56e54ff0c3eee6930ab0f91 b37582308af20f57de96567109fe3bb8448308de
Author: Vineet Garg <grgvineet at gmail.com>
Date:   Mon Jul 27 21:00:05 2015 +0530

    Merge branch 'master' into pairinghandler

 app/qml/main.qml                                   |  15 ++-
 app/qml/{mpris.qml => mousepad.qml}                |  56 +++++------
 app/qml/mpris.qml                                  |  18 ++--
 app/resources.qrc                                  |   1 +
 cli/kdeconnect-cli.cpp                             |   1 +
 interfaces/CMakeLists.txt                          |  16 +--
 interfaces/dbusinterfaces.cpp                      |  22 +++++
 interfaces/dbusinterfaces.h                        |  24 +++++
 kcm/kcm_kdeconnect.desktop                         |   2 +-
 .../kdeconnectdeclarativeplugin.cpp                |  18 ++++
 plugins/CMakeLists.txt                             |   2 +
 plugins/battery/kdeconnect_battery.json            |   1 +
 plugins/clipboard/kdeconnect_clipboard.json        |   1 +
 plugins/lockdevice/CMakeLists.txt                  |   9 ++
 plugins/lockdevice/kdeconnect_lockdevice.json      |  48 +++++++++
 plugins/lockdevice/lockdeviceplugin.cpp            | 108 +++++++++++++++++++++
 .../pingplugin.h => lockdevice/lockdeviceplugin.h} |  36 ++++---
 plugins/lockdevice/org.freedesktop.ScreenSaver.xml |  41 ++++++++
 plugins/mousepad/CMakeLists.txt                    |   2 +-
 plugins/mousepad/kdeconnect_mousepad.json          |   4 +-
 .../notifications/kdeconnect_notifications.json    |   1 +
 plugins/remotecontrol/CMakeLists.txt               |   7 ++
 .../remotecontrol/kdeconnect_remotecontrol.json    |  44 +++++++++
 .../remotecontrolplugin.cpp}                       |  60 ++++++------
 .../remotecontrolplugin.h}                         |  23 +++--
 25 files changed, 453 insertions(+), 107 deletions(-)

diff --cc cli/kdeconnect-cli.cpp
index 94c49e4,536c754..cfcb70d
--- a/cli/kdeconnect-cli.cpp
+++ b/cli/kdeconnect-cli.cpp
@@@ -56,8 -55,8 +56,9 @@@ int main(int argc, char** argv
      parser.addOption(QCommandLineOption("ping-msg", i18n("Same as ping but you can set the message to display"), i18n("message")));
      parser.addOption(QCommandLineOption("share", i18n("Share a file to a said device"), "path"));
      parser.addOption(QCommandLineOption("list-notifications", i18n("Display the notifications on a said device")));
+     parser.addOption(QCommandLineOption("lock", i18n("Lock the specified device")));
      parser.addOption(QCommandLineOption(QStringList("device") << "d", i18n("Device ID"), "dev"));
 +    parser.addOption(QCommandLineOption("encryption-info", i18n("Get encryption info about said device")));
      about.setupCommandLine(&parser);
  
      parser.addHelpOption();

-- 
kdeconnect packaging