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

[dobey]

Fix the google test dependency.

[unity-api-1-bot (unity-api-1-bot)]

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

=== modified file 'debian/control'
--- debian/control	2016-12-07 17:06:29 +0000
+++ debian/control	2017-02-07 18:14:36 +0000
@@ -17,8 +17,7 @@
                libqtdbusmock1-dev,
                libqtdbustest1-dev,
                cppcheck,
-               libgtest-dev,
-               google-mock (>= 1.6.0+svn437),
+               googletest | google-mock (>= 1.6.0+svn437),
                gsettings-ubuntu-schemas (>= 0.0.2+14.10.20140813),
 # for packaging
                debhelper (>= 9),