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

Proposed by Robert Carr
Status: Merged
Approved by: Robert Carr
Approved revision: no longer in the source branch.
Merged at revision: 317
Proposed branch: lp:qtmir/devel-mir-next
Merge into: lp:qtmir
Diff against target: 12 lines (+1/-1)
1 file modified
debian/control (+1/-1)
To merge this branch: bzr merge lp:qtmir/devel-mir-next
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
Mir development team Pending
Review via email: mp+248261@code.launchpad.net

This proposal supersedes a proposal from 2015-01-05.

Commit message

Bump build-dep to mir 0.11.

Description of the change

Bump ABI to mir 0.11 (to work with port-to-msh-Shell)

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal
review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:271
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~mir-team/qtmir/devel-mir-next/+merge/248261/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/qtmir-ci/205/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-amd64-ci/56/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/56/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtmir-ci/205/rebuild

review: Needs Fixing (continuous-integration)
lp:qtmir/devel-mir-next updated
310. By Gerry Boland

Explicitly setting GL-mode breaks GTK app rendering. Removing the hack appears to just work Fixes: #1401968
Approved by: Michał Sawicz, Stephen M. Webb, PS Jenkins bot

311. By Michał Sawicz

Add moot autopkgtest to run the standard unit tests

312. By Albert Astals Cid

Fix demo shell import name
Approved by: Gerry Boland

313. By Daniel d'Andrada

Don't suspend&resume the main stage app when switching focus from side to main stage
Approved by: Gerry Boland, PS Jenkins bot

314. By CI Train Bot Account

Releasing 0.4.4+15.04.20150206-0ubuntu1

315. By Alan Griffiths

Port to the msh::Shell API in Mir
Approved by: Alberto Aguirre, Gerry Boland

316. By Daniel van Vugt

QtMir changes required to support the Mir branch of the same name. Landing soon. Fixes: #1395581
Approved by: Gerry Boland

317. By Robert Carr <racarr@ocelot>

Bump build-dep to mir 0.11.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2015-01-14 09:07:31 +0000
3+++ debian/control 2015-02-02 15:24:14 +0000
4@@ -19,7 +19,7 @@
5 liblttng-ust-dev,
6 libmirclient-dev (>= 0.6.0),
7 libmircommon-dev,
8- libmirserver-dev (>= 0.10.0),
9+ libmirserver-dev (>= 0.11.0),
10 libmtdev-dev,
11 libprocess-cpp-dev,
12 libqt5sensors5-dev,

Subscribers

People subscribed via source and target branches