Merge lp:~kdub/platform-api/mir-deb-bump-0.1.3 into lp:platform-api

[Kevin DuBois]

bump debian version dependency for mir to 0.1.3 to force rebuild

bump debian version dependency for mir to 0.1.3 to force rebuild

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:178
http://jenkins.qa.ubuntu.com/job/platform-api-ci/180/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/platform-api-trusty-amd64-ci/14/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/platform-api-trusty-armhf-ci/14/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/platform-api-trusty-i386-ci/14/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/platform-api-ci/180/rebuild

review: Needs Fixing (continuous-integration)

[Kevin DuBois (kdub)]

@kgunn
seems there was some abi breakage, so updating the versioning only was insufficient. Fixed the ftbfs, seeing as you're out sick and this probably blocks a fair amount of stuff

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:179
http://jenkins.qa.ubuntu.com/job/platform-api-ci/181/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-trusty-amd64-ci/15
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-trusty-armhf-ci/15
        deb: http://jenkins.qa.ubuntu.com/job/platform-api-trusty-armhf-ci/15/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-trusty-i386-ci/15

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/platform-api-ci/181/rebuild

review: Approve (continuous-integration)

[Kevin DuBois (kdub)]

I'm a bit unfamiliar with committing to platform-api, should we bump debian/changlog too?

[Sergio Schvezov (sergiusens)]

On 03/01/14 20:35, Kevin DuBois wrote:
> I'm a bit unfamiliar with committing to platform-api, should we bump debian/changlog too?
No, that should be done from the daily release

[Allan LeSage (allanlesage)]

+1'ing this as it blocks an MP of mine--could we get someone qualified to review?

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/platform-api-autolanding/91/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/platform-api-trusty-amd64-autolanding/10/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/platform-api-trusty-armhf-autolanding/10/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/platform-api-trusty-i386-autolanding/10/console

review: Needs Fixing (continuous-integration)

=== modified file 'debian/control'
--- debian/control	2013-11-22 16:01:19 +0000
+++ debian/control	2014-01-03 19:19:04 +0000
@@ -11,8 +11,8 @@
                g++-4.7,
                libhybris-common-dev,
                pkg-config,
-               libmirclient-dev (>= 0.1.2),
-               libmirserver-dev (>= 0.1.2),
+               libmirclient-dev (>= 0.1.3),
+               libmirserver-dev (>= 0.1.3),
                liburl-dispatcher1-dev,
                libdbus-1-dev,
                dbus-cpp-dev,

=== modified file 'src/ubuntu/mirserver/ubuntu_application_api_mirserver.cpp'
--- src/ubuntu/mirserver/ubuntu_application_api_mirserver.cpp	2013-08-23 02:21:20 +0000
+++ src/ubuntu/mirserver/ubuntu_application_api_mirserver.cpp	2014-01-03 19:19:04 +0000
@@ -214,7 +214,7 @@
 
 namespace
 {
-static mir::geometry::PixelFormat choose_pixel_format(std::shared_ptr<mir::graphics::GraphicBufferAllocator> const& allocator)
+static MirPixelFormat choose_pixel_format(std::shared_ptr<mir::graphics::GraphicBufferAllocator> const& allocator)
 {
     auto formats = allocator->supported_pixel_formats();
     return formats[0];

=== modified file 'src/ubuntu/mirserver/window_properties_mirserver.cpp'
--- src/ubuntu/mirserver/window_properties_mirserver.cpp	2013-06-10 03:30:30 +0000
+++ src/ubuntu/mirserver/window_properties_mirserver.cpp	2014-01-03 19:19:04 +0000
@@ -22,7 +22,6 @@
 
 namespace uams = ubuntu::application::mir::server;
 namespace msh = mir::shell;
-namespace geom = mir::geometry;
 
 uams::WindowProperties::WindowProperties()
     : parameters(msh::a_surface()),
@@ -52,7 +51,7 @@
     input_ctx = ctx;
 }
 
-void uams::WindowProperties::set_pixel_format(geom::PixelFormat const& format)
+void uams::WindowProperties::set_pixel_format(MirPixelFormat const& format)
 {
     parameters = parameters.of_pixel_format(format);
 }

=== modified file 'src/ubuntu/mirserver/window_properties_mirserver_priv.h'
--- src/ubuntu/mirserver/window_properties_mirserver_priv.h	2013-06-09 23:54:39 +0000
+++ src/ubuntu/mirserver/window_properties_mirserver_priv.h	2014-01-03 19:19:04 +0000
@@ -22,7 +22,7 @@
 #include <ubuntu/application/ui/window.h>
 
 #include <mir/shell/surface_creation_parameters.h>
-#include <mir/geometry/pixel_format.h>
+#include <mir_toolkit/client_types.h>
 
 namespace ubuntu
 {
@@ -44,7 +44,7 @@
     
     void set_title(char const* title, size_t length);
     void set_input_cb_and_ctx(UAUiWindowInputEventCb cb, void* ctx);
-    void set_pixel_format( ::mir::geometry::PixelFormat const& format);
+    void set_pixel_format( MirPixelFormat const& format);
     
     ::mir::shell::SurfaceCreationParameters const& surface_parameters() const;
     UAUiWindowInputEventCb input_cb() const;