debian/changelog | 9 +++++++--
debian/control | 6 +++---
debian/rules | 2 +-
3 files changed, 11 insertions(+), 6 deletions(-)
New commits:
commit 93b5b3bf09b2c82f168b73097bfe2d43ca0572d6
Author: Timo Aaltonen <tjaal...@debian.org>
Date: Thu Jul 21 08:29:03 2016 +0300
release to xenial
diff --git a/debian/changelog b/debian/changelog
index ed6b1f8..8d51676 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg-server (2:1.18.3-1ubuntu2.3) UNRELEASED; urgency=medium
+xorg-server (2:1.18.3-1ubuntu2.3) xenial; urgency=medium
[ Timo Aaltonen ]
* control: Add Conflicts/Replaces on xserver-xorg-video-glamoregl.
@@ -8,7 +8,7 @@ xorg-server (2:1.18.3-1ubuntu2.3) UNRELEASED; urgency=medium
* debian/control, debian/rules:
- Build xmir for arm64 (LP: #1604851).
- -- Timo Aaltonen <tjaal...@debian.org> Tue, 05 Jul 2016 01:53:51 +0300
+ -- Timo Aaltonen <tjaal...@debian.org> Thu, 21 Jul 2016 08:27:07 +0300
xorg-server (2:1.18.3-1ubuntu2.2) xenial; urgency=medium
commit 63aa20ed8198bda44f93ff5f0725a7af0ab5a15b
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 429139c..ed6b1f8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,13 @@
xorg-server (2:1.18.3-1ubuntu2.3) UNRELEASED; urgency=medium
+ [ Timo Aaltonen ]
* control: Add Conflicts/Replaces on xserver-xorg-video-glamoregl.
(LP: #1574320)
+ [ Łukasz 'sil2100' Zemczak ]
+ * debian/control, debian/rules:
+ - Build xmir for arm64 (LP: #1604851).
+
-- Timo Aaltonen <tjaal...@debian.org> Tue, 05 Jul 2016 01:53:51 +0300
xorg-server (2:1.18.3-1ubuntu2.2) xenial; urgency=medium
diff --git a/debian/control b/debian/control
index 9f5e9f0..9843ce2 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
@@ -224,7 +224,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
@@ -384,7 +384,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
