Merge lp:~mir-team/platform-api/rtm-14.09-compat-mir-0.8.1 into lp:platform-api/rtm-14.09

[Cemil Azizoglu]

Compatibility for Mir-0.8.1.

[lp:~mir-team/platform-api/rtm-14.09-compat-mir-0.8.1]

284. By Cemil Azizoglu on 2015-01-14

Add the changelog changes required.

[Michał Sawicz (saviq)]

Yes, looking good.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2014-10-15 20:02:39 +0000
+++ debian/changelog	2015-01-14 00:19:07 +0000
@@ -1,3 +1,15 @@
+platform-api (2.5.0+14.10.20150113~rtm-0ubuntu1) UNRELEASED; urgency=medium
+
+  * Adapt to trusted prompt session changes.
+
+ -- Cemil Azizoglu <[e-mail]>  Tue, 13 Jan 2015 17:46:43 -0600
+
+platform-api (2.5.0+14.10.20141015-0ubuntu2) 14.09; urgency=medium
+
+  * No-change rebuild against mirserver-26.1.
+
+ -- Michał Sawicz <[e-mail]>  Tue, 13 Jan 2015 22:04:52 +0100
+
 platform-api (2.5.0+14.10.20141015-0ubuntu1) utopic; urgency=low
 
   [ Ricardo Salveti de Araujo ]

=== modified file 'debian/control'
--- debian/control	2014-09-22 18:04:53 +0000
+++ debian/control	2015-01-14 00:19:07 +0000
@@ -15,7 +15,7 @@
                libhybris-common-dev,
                pkg-config,
                libmirclient-dev (>= 0.6.0),
-               libmirserver-dev (>= 0.6.0),
+               libmirserver-dev (>= 0.8.1),
                liburl-dispatcher1-dev,
                libdbus-1-dev,
                libdbus-cpp-dev (>= 4.0.0),

=== modified file 'src/ubuntu/application/common/mirserver/application_instance_mirserver.cpp'
--- src/ubuntu/application/common/mirserver/application_instance_mirserver.cpp	2014-06-17 14:37:23 +0000
+++ src/ubuntu/application/common/mirserver/application_instance_mirserver.cpp	2015-01-14 00:19:07 +0000
@@ -60,6 +60,8 @@
 
     virtual void start_prompt_session() override {}
     virtual void stop_prompt_session() override {}
+    virtual void suspend_prompt_session() override {}
+    virtual void resume_prompt_session() override {}
 private:
     std::shared_ptr<ms::Surface> const surface;
 };