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

[Alan Griffiths]

Mir 0.26.3 for Xenial

[Daniel van Vugt (vanvugt)]

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.

[Michał Sawicz (saviq)]

Replaced by:

https://code.launchpad.net/~mir-team/mir/xenial-0.26/+merge/325070

review: Disapprove

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.

=== modified file 'debian/control'
--- debian/control	2017-05-26 16:22:52 +0000
+++ debian/control	2017-05-31 11:34:54 +0000
@@ -24,8 +24,8 @@
                libprotobuf-dev,
                pkg-config,
                android-headers-23,
-               libhardware-dev [i386 amd64 armhf arm64],
-               libandroid-properties-dev [i386 amd64 armhf arm64],
+               libhardware-dev [i386 amd64 armhf],
+               libandroid-properties-dev [i386 amd64 armhf],
                libgoogle-glog-dev,
                liblttng-ust-dev,
                libxkbcommon-dev (>= 0.5),
@@ -296,7 +296,7 @@
  Contains a tool for stress testing the Mir display server
 
 Package: mir-android-diagnostics
-Architecture: i386 amd64 armhf arm64
+Architecture: i386 amd64 armhf
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
          ${shlibs:Depends},
@@ -366,7 +366,7 @@
 
 Package: mir-platform-graphics-android12
 Section: libs
-Architecture: i386 amd64 armhf arm64
+Architecture: i386 amd64 armhf
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
@@ -422,7 +422,7 @@
 
 Package: mir-client-platform-android5
 Section: libs
-Architecture: i386 amd64 armhf arm64
+Architecture: i386 amd64 armhf
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
@@ -453,7 +453,7 @@
 
 Package: mir-graphics-drivers-android
 Section: libs
-Architecture: i386 amd64 armhf arm64
+Architecture: i386 amd64 armhf
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},

=== modified file 'debian/rules'
--- debian/rules	2017-05-26 08:19:23 +0000
+++ debian/rules	2017-05-31 11:34:54 +0000
@@ -34,7 +34,7 @@
 endif
 
 override_dh_auto_configure:
-ifneq ($(filter armhf arm64,$(DEB_HOST_ARCH)),)
+ifneq ($(filter armhf,$(DEB_HOST_ARCH)),)
 	dh_auto_configure -- \
 	  $(COMMON_CONFIGURE_OPTIONS) \
 	  -DMIR_RUN_ACCEPTANCE_TESTS=OFF \