[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=04d5b12

The following commit has been merged in the master branch:
commit 04d5b12f8be51c286d7123c1412bffccb42bd1eb
Merge: 70d447f58faa35f27e20d57fd49833f57ae43863 75e6e3b2f8025e8704a3b9096152219edee0b906
Author: Albert Vaca <albertvaka at gmail.com>
Date:   Wed Jun 1 12:20:07 2016 +0200

    Merge branch 'master' into sslrefactor

 KDEConnectMacros.cmake                  | 31 ++-----------------------------
 plugins/runcommand/runcommandplugin.cpp |  7 +++----
 tests/networkpackagetests.cpp           | 18 +++++++-----------
 tests/networkpackagetests.h             |  1 -
 4 files changed, 12 insertions(+), 45 deletions(-)

diff --cc tests/networkpackagetests.cpp
index 3456787,8b660ee..8f8d283
--- a/tests/networkpackagetests.cpp
+++ b/tests/networkpackagetests.cpp
@@@ -23,8 -23,14 +23,15 @@@
  #include "core/networkpackage.h"
  
  #include <QtTest>
 +#include <QtCrypto>
  
+ static void initEnv()
+ {
+     // Force LC_TIME=C to make sure longMonthName returns as en_US.
+     setenv("LC_TIME", "C", 1);
+ }
+ Q_CONSTRUCTOR_FUNCTION(initEnv)
+ 
  QTEST_GUILESS_MAIN(NetworkPackageTests);
  
  void NetworkPackageTests::initTestCase()
diff --cc tests/networkpackagetests.h
index 9174828,b8185ea..973e916
--- a/tests/networkpackagetests.h
+++ b/tests/networkpackagetests.h
@@@ -30,10 -30,9 +30,9 @@@ class NetworkPackageTests : public QObj
  private Q_SLOTS:
      void initTestCase();
  
-     void dummyTest();
      void networkPackageTest();
      void networkPackageIdentityTest();
 -    void networkPackageEncryptionTest();
 +    //void networkPackageEncryptionTest();
  
      void cleanupTestCase();
  

-- 
kdeconnect packaging