Merge lp:~unity-api-team/libqtdbusmock/new-nm-methods into lp:libqtdbusmock

[Pete Woods]

Add new NM methods. Stop running valgrind by default.

Add new NM methods. Stop running valgrind by default.

[lp:~unity-api-team/libqtdbusmock/new-nm-methods]

41. By Pete Woods on 2015-10-06

Don't run valgrind under jenkins

=== modified file 'data/nm-manager-mock.xml'
--- data/nm-manager-mock.xml	2015-03-09 11:43:23 +0000
+++ data/nm-manager-mock.xml	2015-10-06 11:46:55 +0000
@@ -3,6 +3,13 @@
 <node name="/org/freedesktop/NetworkManager" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
 	<interface name="org.freedesktop.DBus.Mock">
 
+		<method name="AddEthernetDevice">
+			<arg direction="in" name="device_name" type="s" />
+			<arg direction="in" name="iface_name" type="s" />
+			<arg direction="in" name="state" type="i" />
+			<arg direction="out" type="s" />
+		</method>
+
 		<method name="AddWiFiDevice">
 			<arg name="device_name" type="s" direction="in"/>
 			<arg name="interface_name" type="s" direction="in"/>
@@ -49,6 +56,14 @@
 			<arg name="connection_path" type="s" direction="in"/>
 		</method>
 
+		<method name="SetConnectivity">
+			<arg direction="in" name="connectivity" type="u" />
+		</method>
+
+		<method name="SetDeviceDisconnected">
+			<arg direction="in" name="device_path" type="s" />
+		</method>
+
 		<method name="SetGlobalConnectionState">
 			<arg name="state" type="u" direction="in"/>
 		</method>

=== modified file 'debian/changelog'
--- debian/changelog	2015-06-04 11:03:42 +0000
+++ debian/changelog	2015-10-06 11:46:55 +0000
@@ -1,3 +1,11 @@
+libqtdbusmock (0.4-0ubuntu1) UNRELEASED; urgency=medium
+
+  [ Pete Woods ]
+  * Add new methods to NetworkManager mock interface.
+  * Don't run valgrind by default. (LP: #1451507)
+
+ -- Pete Woods <[e-mail]>  Tue, 15 Sep 2015 10:48:13 +0100
+
 libqtdbusmock (0.3+15.10.20150604-0ubuntu1) wily; urgency=medium
 
   [ Pete Woods ]

=== modified file 'debian/control'
--- debian/control	2015-03-09 11:43:43 +0000
+++ debian/control	2015-10-06 11:46:55 +0000
@@ -11,7 +11,6 @@
                pkg-config,
                python3-dbusmock (>= 0.14),
                qtbase5-dev,
-               valgrind [!arm64 !ppc64el],
 Standards-Version: 3.9.4
 Homepage: https://launchpad.net/libqtdbustest
 # If you aren't a member of ~unity-team but need to upload packaging changes,

=== modified file 'debian/libqtdbusmock1.symbols'
--- debian/libqtdbusmock1.symbols	2015-03-31 11:22:42 +0000
+++ debian/libqtdbusmock1.symbols	2015-10-06 11:46:55 +0000
@@ -67,6 +67,9 @@
  (c++)"NetworkManagerMockInterface::AddActiveConnection(QStringList const&, QString const&, QString const&, QString const&, unsigned int)::{lambda()#1}::operator()() const::qstring_literal@Base" 0.3+15.04.20150331
  (c++)"NetworkManagerMockInterface::RemoveWifiConnection(QString const&, QString const&)::{lambda()#1}::operator()() const::qstring_literal@Base" 0.3+15.04.20150331
  (c++)"NetworkManagerMockInterface::RemoveActiveConnection(QString const&, QString const&)::{lambda()#1}::operator()() const::qstring_literal@Base" 0.3+15.04.20150331
+ (c++)"NetworkManagerMockInterface::SetConnectivity(unsigned int)::{lambda()#1}::operator()() const::qstring_literal@Base" 0replaceme
+ (c++)"NetworkManagerMockInterface::AddEthernetDevice(QString const&, QString const&, int)::{lambda()#1}::operator()() const::qstring_literal@Base" 0replaceme
+ (c++)"NetworkManagerMockInterface::SetDeviceDisconnected(QString const&)::{lambda()#1}::operator()() const::qstring_literal@Base" 0replaceme
  (c++)"NetworkManagerMockInterface::SetGlobalConnectionState(unsigned int)::{lambda()#1}::operator()() const::qstring_literal@Base" 0.3+15.04.20150331
  (c++)"NetworkManagerMockInterface::SetProperty(QString const&, QString const&, QString const&, QDBusVariant const&)::{lambda()#1}::operator()() const::qstring_literal@Base" 0.3+15.04.20150331
  (c++)"OrgFreedesktopDBusMockInterface::qt_metacall(QMetaObject::Call, int, void**)@Base" 0.1

=== modified file 'debian/rules'
--- debian/rules	2014-03-03 12:47:25 +0000
+++ debian/rules	2015-10-06 11:46:55 +0000
@@ -3,17 +3,5 @@
 
 export DPKG_GENSYMBOLS_CHECK_LEVEL=4
 
-ifeq ($(DEB_HOST_ARCH),armhf)
-        ENABLE_MEMCHECK_OPTION = OFF
-else
-        ENABLE_MEMCHECK_OPTION = ON
-endif
-
 %:
 	dh $@ --parallel --fail-missing
-
-override_dh_auto_configure:
-	dh_auto_configure -- -DENABLE_MEMCHECK_OPTION=${ENABLE_MEMCHECK_OPTION}
-
-override_dh_makeshlibs:
-	dh_makeshlibs -V