Mir

Merge lp:~alan-griffiths/mir/0.26.3-xenial into lp:mir/ubuntu

Proposed by Alan Griffiths on 2017-05-31
Status: Rejected
Rejected by: Michał Sawicz on 2017-06-05
Proposed branch: lp:~alan-griffiths/mir/0.26.3-xenial
Merge into: lp:mir/ubuntu
Prerequisite: lp:~mir-team/mir/0.26-old
Diff against target: 63 lines (+7/-7)
2 files modified
debian/control (+6/-6)
debian/rules (+1/-1)
To merge this branch: bzr merge lp:~alan-griffiths/mir/0.26.3-xenial
Reviewer Review Type Date Requested Status
Michał Sawicz 2017-05-31 Disapprove on 2017-06-05
Review via email: mp+324855@code.launchpad.net

Commit message

Mir 0.26.3 for Xenial

To post a comment you must log in.
Daniel van Vugt (vanvugt) wrote :

Using the same branch lp:mir/ubuntu for multiple different distros may cause some headaches with merging and conflicts.

Ideally there would be lp:mir/xenial or lp:ubuntu/xenial/mir etc.

Unmerged revisions

4071. By Alan Griffiths on 2017-05-31

Drop android/arm64 (unsupported on Xenial)

4070. By Alan Griffiths on 2017-05-31

Correct email address

4069. By Alan Griffiths on 2017-05-31

Update changelog for zesty & yakkety

4068. By Daniel van Vugt on 2017-05-29

Merge final 0.26.3 changelog back from distro.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2017-05-26 16:22:52 +0000
3+++ debian/control 2017-05-31 11:34:54 +0000
4@@ -24,8 +24,8 @@
5 libprotobuf-dev,
6 pkg-config,
7 android-headers-23,
8- libhardware-dev [i386 amd64 armhf arm64],
9- libandroid-properties-dev [i386 amd64 armhf arm64],
10+ libhardware-dev [i386 amd64 armhf],
11+ libandroid-properties-dev [i386 amd64 armhf],
12 libgoogle-glog-dev,
13 liblttng-ust-dev,
14 libxkbcommon-dev (>= 0.5),
15@@ -296,7 +296,7 @@
16 Contains a tool for stress testing the Mir display server
17
18 Package: mir-android-diagnostics
19-Architecture: i386 amd64 armhf arm64
20+Architecture: i386 amd64 armhf
21 Pre-Depends: ${misc:Pre-Depends}
22 Depends: ${misc:Depends},
23 ${shlibs:Depends},
24@@ -366,7 +366,7 @@
25
26 Package: mir-platform-graphics-android12
27 Section: libs
28-Architecture: i386 amd64 armhf arm64
29+Architecture: i386 amd64 armhf
30 Multi-Arch: same
31 Pre-Depends: ${misc:Pre-Depends}
32 Depends: ${misc:Depends},
33@@ -422,7 +422,7 @@
34
35 Package: mir-client-platform-android5
36 Section: libs
37-Architecture: i386 amd64 armhf arm64
38+Architecture: i386 amd64 armhf
39 Multi-Arch: same
40 Pre-Depends: ${misc:Pre-Depends}
41 Depends: ${misc:Depends},
42@@ -453,7 +453,7 @@
43
44 Package: mir-graphics-drivers-android
45 Section: libs
46-Architecture: i386 amd64 armhf arm64
47+Architecture: i386 amd64 armhf
48 Multi-Arch: same
49 Pre-Depends: ${misc:Pre-Depends}
50 Depends: ${misc:Depends},
51
52=== modified file 'debian/rules'
53--- debian/rules 2017-05-26 08:19:23 +0000
54+++ debian/rules 2017-05-31 11:34:54 +0000
55@@ -34,7 +34,7 @@
56 endif
57
58 override_dh_auto_configure:
59-ifneq ($(filter armhf arm64,$(DEB_HOST_ARCH)),)
60+ifneq ($(filter armhf,$(DEB_HOST_ARCH)),)
61 dh_auto_configure -- \
62 $(COMMON_CONFIGURE_OPTIONS) \
63 -DMIR_RUN_ACCEPTANCE_TESTS=OFF \

Subscribers

People subscribed via source and target branches