Mir

Merge lp:~mir-team/mir/trunk into lp:mir

Proposed by Alan Griffiths on 2013-10-09
Status: Merged
Approved by: kevin gunn on 2013-10-10
Approved revision: 1096
Merged at revision: 1123
Proposed branch: lp:~mir-team/mir/trunk
Merge into: lp:mir
Diff against target: 56 lines (+28/-3)
2 files modified
debian/changelog (+27/-2)
debian/control (+1/-1)
To merge this branch: bzr merge lp:~mir-team/mir/trunk
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve on 2013-10-10
Mir development team 2013-10-09 Pending
Review via email: mp+190057@code.launchpad.net

Commit message

Sync development-branch with trunk

Description of the change

Sync development-branch with trunk

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2013-10-09 02:03:40 +0000
3+++ debian/changelog 2013-10-10 02:19:04 +0000
4@@ -1,4 +1,15 @@
5-mir (0.0.14-0ubuntu1) UNRELEASED; urgency=low
6+mir (0.0.14+13.10.20131010-0ubuntu1) saucy; urgency=low
7+
8+ [ Colin Watson ]
9+ * Don't build-depend on valgrind on arm64 for now, as it is not yet
10+ ported there.
11+
12+ [ Ubuntu daily release ]
13+ * Automatic snapshot from revision 1095
14+
15+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Thu, 10 Oct 2013 01:17:01 +0000
16+
17+mir (0.0.14+13.10.20131009.4-0ubuntu1) saucy; urgency=low
18
19 [ kg ]
20 * bump version for ABI break (LP: #1229212)
21@@ -12,7 +23,21 @@
22 [Kevin Gunn]
23 * bump version to 0.0.14
24
25- -- Kevin Gunn <kevin.gunn@canonical.com> Tue, 08 Oct 2013 18:13:17 -0500
26+ [ Robert Carr ]
27+ * Hold ms::Surface alive from msh::Surface, and remove the explicit
28+ throw calls. This way holding a shared_ptr to msh::Surface becomes
29+ safe (as long as you drop it eventually!). (LP: #1234609). (LP:
30+ #1234609)
31+
32+ [ Alan Griffiths ]
33+ * client: use lock_guard as it is simpler than unique_lock. (fix for
34+ mallit) frontend: Remove the endpoint first when shutting down.
35+ Fixes bug lp#1235159. (LP: #1235159)
36+
37+ [ Ubuntu daily release ]
38+ * Automatic snapshot from revision 1093
39+
40+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Wed, 09 Oct 2013 21:57:59 +0000
41
42 mir (0.0.13+13.10.20131003-0ubuntu1) saucy; urgency=low
43
44
45=== modified file 'debian/control'
46--- debian/control 2013-10-08 23:17:35 +0000
47+++ debian/control 2013-10-10 02:19:04 +0000
48@@ -34,7 +34,7 @@
49 umockdev,
50 libudev-dev,
51 google-mock (>= 1.6.0+svn437),
52- valgrind,
53+ valgrind [!arm64],
54 Standards-Version: 3.9.4
55 Homepage: https://launchpad.net/mir
56 # If you aren't a member of ~mir-team but need to upload packaging changes,

Subscribers

People subscribed via source and target branches