Mir

Merge lp:~mir-team/mir/merge-archive-changes into lp:mir/ubuntu

Proposed by Brandon Schaefer on 2017-04-12
Status: Merged
Approved by: Alberto Aguirre on 2017-04-12
Approved revision: 1301
Merge reported by: Brandon Schaefer
Merged at revision: not available
Proposed branch: lp:~mir-team/mir/merge-archive-changes
Merge into: lp:mir/ubuntu
Diff against target: 30 lines (+9/-2)
2 files modified
debian/changelog (+7/-0)
debian/control (+2/-2)
To merge this branch: bzr merge lp:~mir-team/mir/merge-archive-changes
Reviewer Review Type Date Requested Status
Alberto Aguirre (community) 2017-04-12 Approve on 2017-04-12
Review via email: mp+322485@code.launchpad.net

Commit message

Changes landed in archive that were not sync'ed with our release branch. Sync those changes

Description of the change

Changes landed in archive that were not sync'ed with our release branch. Sync those changes

To post a comment you must log in.
Alberto Aguirre (albaguirre) wrote :

Yeah Apparently bileto wants them to be in the target branch so LGTM.

review: Approve

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 2017-03-22 04:54:19 +0000
3+++ debian/changelog 2017-04-12 21:38:10 +0000
4@@ -1,3 +1,10 @@
5+mir (0.26.2+17.04.20170322.1-0ubuntu2) zesty; urgency=medium
6+
7+ [ Mattia Rizzolo ]
8+ * Patch the code to use unversioned runtime boost libraries (LP: #1675138).
9+
10+ -- Gianfranco Costamagna <locutusofborg@debian.org> Fri, 24 Mar 2017 22:58:36 +0100
11+
12 mir (0.26.2+17.04.20170322.1-0ubuntu1) zesty; urgency=medium
13
14 [ Daniel van Vugt ]
15
16=== modified file 'debian/control'
17--- debian/control 2017-02-09 15:29:01 +0000
18+++ debian/control 2017-04-12 21:38:10 +0000
19@@ -170,9 +170,9 @@
20 libmirplatform-dev (= ${binary:Version}),
21 libmirserver-dev (= ${binary:Version}),
22 mir-renderer-gl-dev (= ${binary:Version}),
23+ libboost-filesystem-dev,
24+ libboost-system-dev,
25 ${misc:Depends},
26- libboost-filesystem1.61.0 | libboost-filesystem1.58.0 | libboost-filesystem1.55.0,
27- libboost-system1.61.0 | libboost-system1.58.0 | libboost-system1.55.0,
28 Description: Display server for Ubuntu - test development headers and library
29 Mir is a display server running on linux systems, with a focus on efficiency,
30 robust operation and a well-defined driver model.

Subscribers

People subscribed via source and target branches

to all changes: