Merge lp:mir/0.1 into lp:mir

[Alan Griffiths]

Sync development-branch with trunk

Sync development-branch with trunk

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1168
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/466/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-trusty-i386-build/329
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-trusty-amd64-build/326
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/196/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-ci/195/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/466/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1168
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/470/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-trusty-i386-build/334
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-trusty-amd64-build/331
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/200
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/200/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-ci/199
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-ci/199/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/470/rebuild

review: Approve (continuous-integration)

[Alexandros Frantzis (afrantzis)]

Looks good.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-11-27 12:28:24 +0000
+++ debian/changelog	2013-11-29 09:47:00 +0000
@@ -1,5 +1,6 @@
-mir (0.1.2-0ubuntu1) UNRELEASED; urgency=low
+mir (0.1.2+14.04.20131128.1-0ubuntu1) trusty; urgency=low
 
+  [ Kevin Gunn ]
   * New upstream release 0.1.2
     - graphics: android: improve interface for mga::DisplayDevice so its
       just concerned with rendering and posting.
@@ -89,7 +90,10 @@
       some time now.
     - android-input: Assign more unique touch ids
 
- -- Kevin Gunn <[e-mail]>  Fri, 22 Nov 2013 12:34:52 -0600
+  [ Ubuntu daily release ]
+  * Automatic snapshot from revision 1167
+
+ -- Ubuntu daily release <[e-mail]>  Thu, 28 Nov 2013 10:05:20 +0000
 
 mir (0.1.1+14.04.20131120-0ubuntu1) trusty; urgency=low