Merge lp:unity-system-compositor/0.2 into lp:unity-system-compositor/ubuntu

[Alexandros Frantzis]

Release 0.2.0

Release 0.2.0

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:257
http://jenkins.qa.ubuntu.com/job/unity-system-compositor-ubuntu-ci/29/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-ubuntu-wily-amd64-ci/27/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-ubuntu-wily-armhf-ci/27/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-system-compositor-ubuntu-ci/29/rebuild

review: Needs Fixing (continuous-integration)

[lp:unity-system-compositor/0.2]

258. By Alexandros Frantzis on 2015-10-08

Sync with lp:unity-system-compositor/ubuntu

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:258
http://jenkins.qa.ubuntu.com/job/unity-system-compositor-ubuntu-ci/30/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-ubuntu-wily-amd64-ci/28
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-ubuntu-wily-armhf-ci/28

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-system-compositor-ubuntu-ci/30/rebuild

review: Approve (continuous-integration)

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-09-30 11:53:54 +0000
+++ CMakeLists.txt	2015-10-08 09:54:17 +0000
@@ -16,8 +16,8 @@
 
 project(UnitySystemCompositor)
 set(USC_VERSION_MAJOR 0)
-set(USC_VERSION_MINOR 1)
-set(USC_VERSION_PATCH 4)
+set(USC_VERSION_MINOR 2)
+set(USC_VERSION_PATCH 0)
 set(USC_VERSION "${USC_VERSION_MAJOR}.${USC_VERSION_MINOR}.${USC_VERSION_PATCH}")
 
 cmake_minimum_required(VERSION 2.8)

=== modified file 'debian/changelog'
--- debian/changelog	2015-09-30 12:29:53 +0000
+++ debian/changelog	2015-10-08 09:54:17 +0000
@@ -1,3 +1,10 @@
+unity-system-compositor (0.2.0+15.10.20151007-0ubuntu1) UNRELEASED; urgency=medium
+
+  * Use new versions of mir::event::make_event() overloads.
+  * Rebuild for Mir 0.17.
+
+ -- Alexandros Frantzis <[e-mail]>  Wed, 07 Oct 2015 17:04:19 +0300
+
 unity-system-compositor (0.1.4+15.10.20150930.1-0ubuntu1) wily; urgency=medium
 
   [ Alexandros Frantzis ]

=== modified file 'debian/control'
--- debian/control	2015-07-27 10:29:16 +0000
+++ debian/control	2015-10-08 09:54:17 +0000
@@ -13,8 +13,8 @@
                libdbus-1-dev,
                libglib2.0-dev,
                libgles2-mesa-dev,
-               libmirclient-dev (>= 0.13.0),
-               libmirserver-dev (>= 0.13.0),
+               libmirclient-dev (>= 0.16.0),
+               libmirserver-dev (>= 0.16.0),
                libprotobuf-dev,
                pkg-config,
                python:any (>= 2.7),

=== modified file 'tests/unit-tests/test_screen_event_handler.cpp'
--- tests/unit-tests/test_screen_event_handler.cpp	2015-09-22 16:07:03 +0000
+++ tests/unit-tests/test_screen_event_handler.cpp	2015-10-08 09:54:17 +0000
@@ -77,23 +77,23 @@
     static const int32_t POWER_KEY_CODE = 26;
     mir::EventUPtr power_key_down_event = mir::events::make_event(
         MirInputDeviceId{1}, std::chrono::nanoseconds(0),
-	    mir_keyboard_action_down,
+	    0, mir_keyboard_action_down,
         POWER_KEY_CODE, 0, mir_input_event_modifier_none);
 
     mir::EventUPtr power_key_up_event = mir::events::make_event(
         MirInputDeviceId{1}, std::chrono::nanoseconds(0),
-	    mir_keyboard_action_up,
+	    0, mir_keyboard_action_up,
         POWER_KEY_CODE, 0, mir_input_event_modifier_none);
 
     mir::EventUPtr touch_event = mir::events::make_event(
         MirInputDeviceId{1}, std::chrono::nanoseconds(0),
-	    mir_input_event_modifier_none);
+	    0, mir_input_event_modifier_none);
     
     mir::EventUPtr pointer_event = mir::events::make_event(
         MirInputDeviceId{1}, std::chrono::nanoseconds(0),
-	    mir_input_event_modifier_none,
+	    0, mir_input_event_modifier_none,
         mir_pointer_action_motion,
-        {}, 0.0f, 0.0f, 0.0f, 0.0f);
+        {}, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f);
 
     AdvanceableTimer timer;
     std::chrono::milliseconds const power_key_ignore_timeout{5000};