Mir

Merge lp:~alan-griffiths/mir/merge-0.28 into lp:mir

Proposed by Alan Griffiths on 2017-10-11
Status: Merged
Approved by: Alan Griffiths on 2017-10-11
Approved revision: 4282
Merged at revision: 4282
Proposed branch: lp:~alan-griffiths/mir/merge-0.28
Merge into: lp:mir
Diff against target: 27 lines (+4/-4)
2 files modified
CMakeLists.txt (+2/-2)
debian/changelog (+2/-2)
To merge this branch: bzr merge lp:~alan-griffiths/mir/merge-0.28
Reviewer Review Type Date Requested Status
Mir CI Bot continuous-integration Approve on 2017-10-11
Mir development team 2017-10-11 Pending
Review via email: mp+332131@code.launchpad.net

Commit message

Update version to 0.28

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

PASSED: Continuous integration, rev:4282
https://mir-jenkins.ubuntu.com/job/mir-ci/3721/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/5106
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/5344
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=artful/5331
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/5331
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/5331
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/5150
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/5150/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/5150
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/5150/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/5150
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/5150/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/5150
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/5150/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/5150
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/5150/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/5150
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/5150/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/5150
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/5150/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/5150
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/5150/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2017-09-07 05:58:13 +0000
3+++ CMakeLists.txt 2017-10-11 15:28:51 +0000
4@@ -27,8 +27,8 @@
5 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
6 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
7
8-set(MIR_VERSION_MAJOR 1)
9-set(MIR_VERSION_MINOR 0)
10+set(MIR_VERSION_MAJOR 0)
11+set(MIR_VERSION_MINOR 28)
12 set(MIR_VERSION_PATCH 0)
13
14 add_definitions(-DMIR_VERSION_MAJOR=${MIR_VERSION_MAJOR})
15
16=== modified file 'debian/changelog'
17--- debian/changelog 2017-09-24 08:14:19 +0000
18+++ debian/changelog 2017-10-11 15:28:51 +0000
19@@ -1,6 +1,6 @@
20-mir (1.0.0-0ubuntu1) UNRELEASED; urgency=medium
21+mir (0.28.0-0ubuntu1) UNRELEASED; urgency=medium
22
23- * New upstream release 1.0.0(https://launchpad.net/mir/+milestone/1.0.0)
24+ * New upstream release 0.28.0(https://launchpad.net/mir/+milestone/0.28.0)
25 - ABI summary:
26 . mirclient ABI unchanged at 9
27 . miral ABI introduced at 2

Subscribers

People subscribed via source and target branches