Merge lp:~mir-team/mir/series-1.0 into lp:mir

[Daniel van Vugt]

Bump Mir version to 1.0.0 ...
since series 1.0 now follows 0.26 and the latter has branched.

[Mir CI Bot (mir-ci-bot)]

PASSED: Continuous integration, rev:3937
https://mir-jenkins.ubuntu.com/job/mir-ci/2705/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/3515
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/3583
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/3573
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/3573
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/3573
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/3542
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/3542/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/3542
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/3542/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/3542
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/3542/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/3542
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/3542/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/3542
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/3542/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/3542
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/3542/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Alan Griffiths (alan-griffiths)]

Are we sure that 1.0 will follow 0.26?

The current 0.26 branch is missing deprecations and related changes that I'd expect be released before 1.0. Either these will be cherry-picked, or they will require a 0.27 release.

As we don't want to delay 0.26 unnecessarily (it contains unblockers for downstream) I think we should retain the option of 0.27.

review: Needs Information

[Cemil Azizoglu (cemil-azizoglu)]

There are a lot of MPs expected to land, before we do a final sync of lp:mir to lp:mir/0.26.

Not time for this. Please resubmit after the lp:mir/0.26 has been TAed.

review: Needs Resubmitting

Unmerged revisions

3937. By Daniel van Vugt on 2017-01-15

Bump Mir version to 1.0.0 ...
since series 1.0 now follows 0.26 and the latter has branched.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-12-13 06:00:32 +0000
+++ CMakeLists.txt	2017-01-15 12:28:00 +0000
@@ -27,8 +27,8 @@
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
 
-set(MIR_VERSION_MAJOR 0)
-set(MIR_VERSION_MINOR 26)
+set(MIR_VERSION_MAJOR 1)
+set(MIR_VERSION_MINOR 0)
 set(MIR_VERSION_PATCH 0)
 
 add_definitions(-DMIR_VERSION_MAJOR=${MIR_VERSION_MAJOR})