debian/changelog | 7 +++++++
debian/control | 6 +++---
debian/rules | 2 +-
3 files changed, 11 insertions(+), 4 deletions(-)
New commits:
commit 015df102d657e90b26a9e4b70876b7e9fc8651d7
Author: Timo Aaltonen <tjaal...@debian.org>
Date: Thu Jul 21 06:09:32 2016 +0300
control, rules: Build xmir for arm64
diff --git a/debian/changelog b/debian/changelog
index 73cfddf..ff9b686 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg-server (2:1.18.4-1ubuntu2) yakkety; urgency=medium
+
+ * debian/control, debian/rules:
+ - Build xmir for arm64 (LP: #1604851).
+
+ -- Łukasz 'sil2100' Zemczak <lukasz.zemc...@ubuntu.com> Wed, 20 Jul 2016
18:55:21 +0200
+
xorg-server (2:1.18.4-1ubuntu1) yakkety; urgency=medium
* Merge from debian.
diff --git a/debian/control b/debian/control
index 629be03..2b9849d 100644
--- a/debian/control
+++ b/debian/control
@@ -103,7 +103,7 @@ Build-Depends:
# systemd-daemon
libsystemd-dev [linux-any],
# XMir
- libmirclient-dev (>= 0.13.1) [!arm64 !powerpc !ppc64el !s390x],
+ libmirclient-dev (>= 0.13.1) [!powerpc !ppc64el !s390x],
mir-client-platform-mesa-dev,
Standards-Version: 3.9.6
Vcs-Git: https://anonscm.debian.org/git/pkg-xorg/xserver/xorg-server.git
@@ -222,7 +222,7 @@ Depends:
libxkbfile-dev,
libpciaccess-dev,
mesa-common-dev,
- libmirclient-dev [!arm64 !powerpc !ppc64el],
+ libmirclient-dev [!powerpc !ppc64el],
mir-client-platform-mesa-dev,
${misc:Depends},
Description: Xorg X server - development files
@@ -382,7 +382,7 @@ Description: common files used by various X servers
This package provides files necessary for all X.Org based X servers.
Package: xmir
-Architecture: amd64 armhf i386
+Architecture: amd64 arm64 armhf i386
Depends:
xserver-common (>= ${source:Version}),
${shlibs:Depends},
diff --git a/debian/rules b/debian/rules
index 9169ed7..f3ddb43 100755
--- a/debian/rules
+++ b/debian/rules
@@ -58,7 +58,7 @@ else
endif
# Mir isn't built on PPC
-ifneq (,$(filter $(DEB_HOST_ARCH), arm64 powerpc ppc64el s390x))
+ifneq (,$(filter $(DEB_HOST_ARCH), powerpc ppc64el s390x))
build_xmir = --disable-xmir
endif
