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

Proposed by Pete Woods on 2015-09-18
Status: Merged
Approved by: Pete Woods on 2015-09-18
Approved revision: 37
Merged at revision: 37
Proposed branch: lp:~pete-woods/libqtdbustest/fix-wily-build
Merge into: lp:libqtdbustest
Diff against target: 54 lines (+1/-23)
3 files modified
cmake/FindGMock.cmake (+0/-10)
debian/control (+1/-1)
debian/rules (+0/-12)
To merge this branch: bzr merge lp:~pete-woods/libqtdbustest/fix-wily-build
Reviewer Review Type Date Requested Status
Unity Team 2015-09-18 Pending
Review via email: mp+271627@code.launchpad.net

Commit message

Fix building on wily

Description of the change

Fix building on wily

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
1# Build with system gmock and embedded gtest
2set (GMOCK_INCLUDE_DIRS "/usr/include/gmock/include" CACHE PATH "gmock source include directory")
3set (GMOCK_SOURCE_DIR "/usr/src/gmock" CACHE PATH "gmock source directory")
4set (GTEST_INCLUDE_DIRS "${GMOCK_SOURCE_DIR}/gtest/include" CACHE PATH "gtest source include directory")
5
6add_subdirectory(${GMOCK_SOURCE_DIR} "${CMAKE_CURRENT_BINARY_DIR}/gmock")
7
8set(GTEST_LIBRARIES gtest)
9set(GTEST_MAIN_LIBRARIES gtest_main)
10set(GMOCK_LIBRARIES gmock gmock_main)
110
=== 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 @@
3Priority: optional3Priority: optional
4Maintainer: Ubuntu Developers <ubunu-devel.discuss@lists.ubuntu.com>4Maintainer: Ubuntu Developers <ubunu-devel.discuss@lists.ubuntu.com>
5Build-Depends: cmake,5Build-Depends: cmake,
6 cmake-extras,
6 debhelper (>= 9),7 debhelper (>= 9),
7 gettext,8 gettext,
8 google-mock (>= 1.6.0+svn437),9 google-mock (>= 1.6.0+svn437),
9 pkg-config,10 pkg-config,
10 qtbase5-dev,11 qtbase5-dev,
11 valgrind [!arm64 !ppc64el],
12 python3-dbusmock,12 python3-dbusmock,
13 dbus,13 dbus,
14Standards-Version: 3.9.414Standards-Version: 3.9.4
1515
=== 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 @@
33
4export DPKG_GENSYMBOLS_CHECK_LEVEL=44export DPKG_GENSYMBOLS_CHECK_LEVEL=4
55
6ifeq ($(DEB_HOST_ARCH),armhf)
7 ENABLE_MEMCHECK_OPTION = OFF
8else
9 ENABLE_MEMCHECK_OPTION = ON
10endif
11
12%:6%:
13 dh $@ --parallel --fail-missing7 dh $@ --parallel --fail-missing
14
15override_dh_auto_configure:
16 dh_auto_configure -- -DENABLE_MEMCHECK_OPTION=${ENABLE_MEMCHECK_OPTION}
17
18override_dh_makeshlibs:
19 dh_makeshlibs -V

Subscribers

People subscribed via source and target branches

to all changes: