Merge lp:~pete-woods/libqtdbustest/fix-wily-build into lp:libqtdbustest

[Pete Woods]

Fix building on wily

Fix building on wily

=== removed file 'cmake/FindGMock.cmake'
--- cmake/FindGMock.cmake	2013-07-24 09:42:07 +0000
+++ cmake/FindGMock.cmake	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-# Build with system gmock and embedded gtest
-set (GMOCK_INCLUDE_DIRS "/usr/include/gmock/include" CACHE PATH "gmock source include directory")
-set (GMOCK_SOURCE_DIR "/usr/src/gmock" CACHE PATH "gmock source directory")
-set (GTEST_INCLUDE_DIRS "${GMOCK_SOURCE_DIR}/gtest/include" CACHE PATH "gtest source include directory")
-
-add_subdirectory(${GMOCK_SOURCE_DIR} "${CMAKE_CURRENT_BINARY_DIR}/gmock")
-
-set(GTEST_LIBRARIES gtest)
-set(GTEST_MAIN_LIBRARIES gtest_main)
-set(GMOCK_LIBRARIES gmock gmock_main)
 
=== modified file 'debian/control'
--- debian/control	2014-01-02 11:35:43 +0000
+++ debian/control	2015-09-18 09:57:24 +0000
@@ -3,12 +3,12 @@
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
 Build-Depends: cmake,
+               cmake-extras,
                debhelper (>= 9),
                gettext,
                google-mock (>= 1.6.0+svn437),
                pkg-config,
                qtbase5-dev,
-               valgrind [!arm64 !ppc64el],
                python3-dbusmock,
                dbus,
 Standards-Version: 3.9.4
 
=== modified file 'debian/rules'
--- debian/rules	2014-03-03 12:43:49 +0000
+++ debian/rules	2015-09-18 09:57:24 +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