Mir

Merge lp:~vanvugt/mir/begin-trusty into lp:mir

  1. begin-trusty
  2. Merge into development-branch
Proposed by Daniel van Vugt
Status: Merged
Approved by: Didier Roche-Tolomelli
Approved revision: no longer in the source branch.
Merged at revision: 1151
Proposed branch: lp:~vanvugt/mir/begin-trusty
Merge into: lp:mir
Diff against target: 40 lines (+8/-8)
2 files modified
CMakeLists.txt (+2/-2)
debian/changelog (+6/-6)
To merge this branch: bzr merge lp:~vanvugt/mir/begin-trusty
Reviewer Review Type Date Requested Status
Didier Roche-Tolomelli Approve
PS Jenkins bot (community) continuous-integration Approve
Mir development team Pending
Review via email: mp+191944@code.launchpad.net

Commit message

Prepare for trusty... (version 0.1.*)

To post a comment you must log in.
Revision history for this message
Daniel van Vugt (vanvugt) wrote :

Should I mention all the bugs we have fix committed already?

Revision history for this message
Didier Roche-Tolomelli (didrocks) wrote :

If you mention automatically "Automatic snapshot from revision 1150", yeah, you need to list all commits manually.

The other solution (as you change the history of lp:mir anyway) is to change the previous changelog and set it to 1133 (or something around that) corresponding to real last snapshot in the new lp:mir world. Making sense?

review: Needs Fixing
Revision history for this message
Daniel van Vugt (vanvugt) wrote :

OK, I've cleaned out the changelog to represent the last actual Ubuntu/Debian release more accurately.

Future changelog changes should originate from lp:mir only.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:1151
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/205/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/2432
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/2317
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-saucy-amd64-ci/202
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-saucy-amd64-ci/202/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/mir-team-mir-development-branch-ci/205/rebuild

review: Approve (continuous-integration)
Revision history for this message
Didier Roche-Tolomelli (didrocks) wrote :

looking good, thanks!

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 2013-10-17 07:52:52 +0000
3+++ CMakeLists.txt 2013-10-21 09:09:42 +0000
4@@ -27,8 +27,8 @@
5 set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib)
6
7 set(MIR_VERSION_MAJOR 0)
8-set(MIR_VERSION_MINOR 0)
9-set(MIR_VERSION_PATCH 16)
10+set(MIR_VERSION_MINOR 1)
11+set(MIR_VERSION_PATCH 0)
12
13 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
14
15
16=== modified file 'debian/changelog'
17--- debian/changelog 2013-10-21 05:35:55 +0000
18+++ debian/changelog 2013-10-21 09:09:42 +0000
19@@ -1,8 +1,8 @@
20-mir (0.0.16+13.10.20131016-0ubuntu1) UNRELEASED; urgency=low
21-
22- * bump version 0.0.16
23-
24- -- Kevin Gunn <kevin.gunn@canonical.com> Wed, 16 Oct 2013 23:35:28 -0500
25+mir (0.1.0-0ubuntu1) UNRELEASED; urgency=low
26+
27+ * Bump version 0.1.0
28+
29+ -- Daniel van Vugt <daniel.van.vugt@canonical.com> Mon, 21 Oct 2013 17:07:18 +0800
30
31 mir (0.0.15+13.10.20131014-0ubuntu1) saucy; urgency=low
32
33@@ -10,7 +10,7 @@
34 * bump version 0.0.15
35
36 [ Ubuntu daily release ]
37- * Automatic snapshot from revision 1100
38+ * Automatic snapshot from revision 1133
39
40 -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Mon, 14 Oct 2013 23:55:33 +0000
41

Subscribers

People subscribed via source and target branches