Merge lp:~dobey/indicator-display/fix-gtest into lp:indicator-display

Proposed by dobey on 2017-02-07
Status: Merged
Approved by: dobey on 2017-02-07
Approved revision: 25
Merged at revision: 26
Proposed branch: lp:~dobey/indicator-display/fix-gtest
Merge into: lp:indicator-display
Diff against target: 13 lines (+1/-2)
1 file modified
debian/control (+1/-2)
To merge this branch: bzr merge lp:~dobey/indicator-display/fix-gtest
Reviewer Review Type Date Requested Status
Charles Kerr (community) Approve on 2017-02-09
Ted Gould (community) 2017-02-07 Approve on 2017-02-07
unity-api-1-bot continuous-integration Approve on 2017-02-07
Review via email: mp+316598@code.launchpad.net

Commit message

Fix the google test dependency.

To post a comment you must log in.
unity-api-1-bot (unity-api-1-bot) wrote :

PASSED: Continuous integration, rev:25
https://jenkins.canonical.com/unity-api-1/job/lp-indicator-display-ci/25/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/1616
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1623
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1401
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1401/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1401
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1401/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1401
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1401/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1401
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1401/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1401
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1401/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1401
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1401/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-indicator-display-ci/25/rebuild

review: Approve (continuous-integration)
Ted Gould (ted) :
review: Approve
Charles Kerr (charlesk) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2016-12-07 17:06:29 +0000
3+++ debian/control 2017-02-07 18:14:36 +0000
4@@ -17,8 +17,7 @@
5 libqtdbusmock1-dev,
6 libqtdbustest1-dev,
7 cppcheck,
8- libgtest-dev,
9- google-mock (>= 1.6.0+svn437),
10+ googletest | google-mock (>= 1.6.0+svn437),
11 gsettings-ubuntu-schemas (>= 0.0.2+14.10.20140813),
12 # for packaging
13 debhelper (>= 9),

Subscribers

People subscribed via source and target branches