Merge lp:unity-mir/devel-mir-next into lp:unity-mir

[Cemil Azizoglu]

Updated for Mir 0.3.0 release.

Updated for Mir 0.3.0 release.

[lp:unity-mir/devel-mir-next]

234. By Alberto Aguirre on 2014-06-18

Add trust session api to mock session

=== modified file 'debian/control'
--- debian/control	2014-06-09 11:35:09 +0000
+++ debian/control	2014-06-18 15:16:12 +0000
@@ -9,8 +9,8 @@
                libboost-dev,
                libboost-system-dev,
                libubuntu-application-api-dev (>= 2.0.0),
-               libmirserver-dev (>= 0.2.0),
-               libmirclient-dev (>= 0.1.8),
+               libmirserver-dev (>= 0.3.0),
+               libmirclient-dev (>= 0.1.9),
                libprocess-cpp-dev,
                libunity-api-dev (>= 7.80.6),
                libubuntu-app-launch2-dev,

=== modified file 'tests/mock_session.h'
--- tests/mock_session.h	2014-05-06 20:11:48 +0000
+++ tests/mock_session.h	2014-06-18 15:16:12 +0000
@@ -60,6 +60,10 @@
     MOCK_METHOD0(show, void());
     MOCK_METHOD1(send_display_config, void(mir::graphics::DisplayConfiguration const&));
     MOCK_METHOD3(configure_surface, int(SurfaceId, MirSurfaceAttrib, int));
+
+    void start_prompt_session() override {};
+    void stop_prompt_session() override {};
+
 private:
     std::string m_sessionName;
     pid_t m_sessionId;