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

[Daniel van Vugt]

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

[Daniel van Vugt (vanvugt)]

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

[Didier Roche-Tolomelli (didrocks)]

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

[Daniel van Vugt (vanvugt)]

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.

[PS Jenkins bot (ps-jenkins)]

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)

[Didier Roche-Tolomelli (didrocks)]

looking good, thanks!

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-10-17 07:52:52 +0000
+++ CMakeLists.txt	2013-10-21 09:09:42 +0000
@@ -27,8 +27,8 @@
 set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib)
 
 set(MIR_VERSION_MAJOR 0)
-set(MIR_VERSION_MINOR 0)
-set(MIR_VERSION_PATCH 16)
+set(MIR_VERSION_MINOR 1)
+set(MIR_VERSION_PATCH 0)
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
 
 
=== modified file 'debian/changelog'
--- debian/changelog	2013-10-21 05:35:55 +0000
+++ debian/changelog	2013-10-21 09:09:42 +0000
@@ -1,8 +1,8 @@
-mir (0.0.16+13.10.20131016-0ubuntu1) UNRELEASED; urgency=low
-
-  * bump version 0.0.16
-
- -- Kevin Gunn <[e-mail]>  Wed, 16 Oct 2013 23:35:28 -0500
+mir (0.1.0-0ubuntu1) UNRELEASED; urgency=low
+
+  * Bump version 0.1.0
+
+ -- Daniel van Vugt <[e-mail]>  Mon, 21 Oct 2013 17:07:18 +0800
 
 mir (0.0.15+13.10.20131014-0ubuntu1) saucy; urgency=low
 
@@ -10,7 +10,7 @@
   * bump version 0.0.15
 
   [ Ubuntu daily release ]
-  * Automatic snapshot from revision 1100
+  * Automatic snapshot from revision 1133
 
  -- Ubuntu daily release <[e-mail]>  Mon, 14 Oct 2013 23:55:33 +0000