Mir

Merge lp:~albaguirre/mir/0.20-series into lp:mir

  1. 0.20-series
  2. Merge into development-branch
Proposed by Alberto Aguirre
Status: Merged
Approved by: Daniel van Vugt
Approved revision: no longer in the source branch.
Merged at revision: 3285
Proposed branch: lp:~albaguirre/mir/0.20-series
Merge into: lp:mir
Diff against target: 26 lines (+7/-1)
2 files modified
CMakeLists.txt (+1/-1)
debian/changelog (+6/-0)
To merge this branch: bzr merge lp:~albaguirre/mir/0.20-series
Reviewer Review Type Date Requested Status
Daniel van Vugt Approve
PS Jenkins bot (community) continuous-integration Approve
Mir CI Bot continuous-integration Approve
Review via email: mp+284664@code.launchpad.net

Commit message

Update version to 0.20 series

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

PASSED: Continuous integration, rev:3282
https://mir-jenkins.ubuntu.com/job/mir-ci/206/
Executed test runs:
    None: https://mir-jenkins.ubuntu.com/job/generic-update-mp/207/console

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

review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:3282
http://jenkins.qa.ubuntu.com/job/mir-ci/6182/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/5764
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/4671
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/5720
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-xenial-touch/369
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/506
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/506/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/506
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/506/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5717
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5717/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/8132
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27217
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-xenial-armhf/365
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-xenial-armhf/365/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-xenial-touch/221
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27220

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

review: Approve (continuous-integration)
Revision history for this message
Daniel van Vugt (vanvugt) wrote :

Sure. We need to finish documenting 0.19.0 still though. :)

review: Approve

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 2016-01-29 08:18:22 +0000
3+++ CMakeLists.txt 2016-02-01 19:22:52 +0000
4@@ -27,7 +27,7 @@
5 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
6
7 set(MIR_VERSION_MAJOR 0)
8-set(MIR_VERSION_MINOR 19)
9+set(MIR_VERSION_MINOR 20)
10 set(MIR_VERSION_PATCH 0)
11
12 add_definitions(-DMIR_VERSION_MAJOR=${MIR_VERSION_MAJOR})
13
14=== modified file 'debian/changelog'
15--- debian/changelog 2016-02-01 07:51:07 +0000
16+++ debian/changelog 2016-02-01 19:22:52 +0000
17@@ -1,3 +1,9 @@
18+mir (0.20.0) UNRELEASED; urgency=medium
19+
20+ * Placeholder for 0.20 release
21+
22+ -- Alberto Aguirre <alberto.aguirre@canonical.com> Mon, 01 Feb 2016 13:20:02 -0600
23+
24 mir (0.19.0+16.04.20160128-0ubuntu1) xenial; urgency=medium
25
26 [ Brandon Schaefer ]

Subscribers

People subscribed via source and target branches