Unity System Compositor

Merge lp://staging/~unity-system-compositor-team/unity-system-compositor/mir-0.26-compat into lp://staging/unity-system-compositor

  1. mir-0.26-compat
  2. Merge into trunk
Proposed by Cemil Azizoglu
Status: Merged
Approved by: Alexandros Frantzis
Approved revision: 305
Merged at revision: 303
Proposed branch: lp://staging/~unity-system-compositor-team/unity-system-compositor/mir-0.26-compat
Merge into: lp://staging/unity-system-compositor
Diff against target: 334 lines (+102/-40)
10 files modified
.bzrignore (+1/-0)
CMakeLists.txt (+1/-1)
debian/changelog (+64/-5)
debian/control (+2/-2)
spinner/eglapp.cpp (+1/-1)
spinner/miregl.cpp (+2/-2)
spinner/miregl.h (+1/-1)
src/mir_input_configuration.cpp (+16/-16)
src/mir_input_configuration.h (+5/-5)
tests/unit-tests/test_mir_input_configuration.cpp (+9/-7)
To merge this branch: bzr merge lp://staging/~unity-system-compositor-team/unity-system-compositor/mir-0.26-compat
Reviewer Review Type Date Requested Status
Mir CI Bot continuous-integration Approve
Alexandros Frantzis (community) Approve
Review via email: mp+314966@code.staging.launchpad.net

Commit message

Sync with distro and prepare trunk for next release.

Description of the change

Sync with distro and prepare trunk for next release.

To post a comment you must log in.
Revision history for this message
Mir CI Bot (mir-ci-bot) wrote :

FAILED: Continuous integration, rev:305
https://mir-jenkins.ubuntu.com/job/usc-ci/42/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-usc/60/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/3656
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/3646
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/3646
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/3646
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=amd64,release=xenial+overlay/64
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=amd64,release=xenial+overlay/64/artifact/output/*zip*/output.zip
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=amd64,release=zesty/64/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=armhf,release=vivid+overlay/64
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=armhf,release=vivid+overlay/64/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=i386,release=xenial+overlay/64
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=i386,release=xenial+overlay/64/artifact/output/*zip*/output.zip
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=i386,release=zesty/64/console

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/usc-ci/42/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Cemil Azizoglu (cemil-azizoglu) wrote :

Hmm no zesty in the archive? Is this the first MP after zesty was enabled?

Revision history for this message
Cemil Azizoglu (cemil-azizoglu) wrote :

> Hmm no zesty in the archive?

... in the staging PPA, I mean.

Revision history for this message
Cemil Azizoglu (cemil-azizoglu) wrote :

> > Hmm no zesty in the archive?
>
> ... in the staging PPA, I mean.

I enabled zesty builds in the PPA, and requested an on-demand build.

Revision history for this message
Cemil Azizoglu (cemil-azizoglu) wrote :

I see that the staging ppa now has the zesty packages. Trying this again.

Revision history for this message
Mir CI Bot (mir-ci-bot) wrote :

PASSED: Continuous integration, rev:305
https://mir-jenkins.ubuntu.com/job/usc-ci/43/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-usc/61
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/3666
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/3656
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/3656
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/3656
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=amd64,release=xenial+overlay/65
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=amd64,release=xenial+overlay/65/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=amd64,release=zesty/65
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=amd64,release=zesty/65/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=armhf,release=vivid+overlay/65
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=armhf,release=vivid+overlay/65/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=i386,release=xenial+overlay/65
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=i386,release=xenial+overlay/65/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=i386,release=zesty/65
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=i386,release=zesty/65/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/usc-ci/43/rebuild

review: Approve (continuous-integration)
Revision history for this message
Cemil Azizoglu (cemil-azizoglu) wrote :

\o/

Revision history for this message
Alexandros Frantzis (afrantzis) wrote :

Looks good.

review: Approve
Revision history for this message
Mir CI Bot (mir-ci-bot) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches