Merge lp:~kgunn72/unity-mir/mir-deb-bump-0.1.4 into lp:unity-mir

[kevin gunn]

bump debian version for mir to 0.1.4

bump debian version for mir to 0.1.4

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:165
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/219/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-amd64-ci/82/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-armhf-ci/83/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-i386-ci/82/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-mir-ci/219/rebuild

review: Needs Fixing (continuous-integration)

[Gerry Boland (gerboland)]

review: Approve

[lp:~kgunn72/unity-mir/mir-deb-bump-0.1.4]

166. By kevin gunn on 2014-01-28

update use of configure_output signature

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:166
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/234/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-amd64-ci/97/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-armhf-ci/98/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-i386-ci/97/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-mir-ci/234/rebuild

review: Needs Fixing (continuous-integration)

[Michael Terry (mterry)]

This now needs to look like:

22 displayConfigOutput.current_mode_index, //unchanged
23 + displayConfigOutput.current_format, //unchanged
24 newPowerMode,
25 + displayConfigOutput.orientation //unchanged
26 );

review: Needs Fixing

[Gerry Boland (gerboland)]

if you apply this patch to your tree, it should work fine:

=== modified file 'src/unity-mir/dbusscreen.cpp'
--- src/unity-mir/dbusscreen.cpp 2014-01-28 22:59:52 +0000
+++ src/unity-mir/dbusscreen.cpp 2014-01-30 19:14:05 +0000
@@ -73,7 +73,8 @@
                         displayConfigOutput.top_left, //unchanged
                         displayConfigOutput.current_mode_index, //unchanged
                         displayConfigOutput.current_format,
- newPowerMode
+ newPowerMode,
+ displayConfigOutput.orientation //unchanged
                         );
         }
     });

[Gerry Boland (gerboland)]

hmm, whitespace messed up :(

[kevin gunn (kgunn72)]

not quite, unfortunately mir 0.1.4 is an equivalent snapshot of of the mir dev-branch at r1330
so the displayConfigOutput.orientation will come only in 0.1.5

[Gerry Boland (gerboland)]

> not quite, unfortunately mir 0.1.4 is an equivalent snapshot of of the mir
> dev-branch at r1330
> so the displayConfigOutput.orientation will come only in 0.1.5
Ah ok, sorry about that

[lp:~kgunn72/unity-mir/mir-deb-bump-0.1.4]

167. By kevin gunn on 2014-02-04

update configure_output with new field

[kevin gunn (kgunn72)]

actually, since landing pipe is clogged. took the time to update mir 0.1.4 to include the change of displayConfigOutput.orientation //unchanged on the configure_output func call

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:167
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/240/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-amd64-ci/103/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-armhf-ci/104/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-i386-ci/103/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-mir-ci/240/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'debian/control'
--- debian/control	2014-01-16 15:57:33 +0000
+++ debian/control	2014-02-04 01:57:25 +0000
@@ -6,8 +6,8 @@
                cmake,
                pkg-config,
                libplatform-api1-dev,
-               libmirserver-dev (>= 0.1.3),
-               libmirclient-dev (>= 0.1.3),
+               libmirserver-dev (>= 0.1.4),
+               libmirclient-dev (>= 0.1.4),
                libunity-api-dev,
                libupstart-app-launch2-dev,
                qt5-default,

=== modified file 'src/unity-mir/dbusscreen.cpp'
--- src/unity-mir/dbusscreen.cpp	2013-11-28 07:48:31 +0000
+++ src/unity-mir/dbusscreen.cpp	2014-02-04 01:57:25 +0000
@@ -72,7 +72,9 @@
                         displayConfigOutput.used,       //unchanged
                         displayConfigOutput.top_left,   //unchanged
                         displayConfigOutput.current_mode_index, //unchanged
-                        newPowerMode
+                        displayConfigOutput.current_format,
+                        newPowerMode,
+                        displayConfigOutput.orientation //unchanged
                         );
         }
     });