xorg-server: Changes to 'ubuntu'
debian/changelog | 8 +++++++-
debian/control | 2 +-
debian/rules | 2 +-
3 files changed, 9 insertions(+), 3 deletions(-)
New commits:
commit 01ff19d871603204c9bbf6a920a78a2fefa722f5
Author: Robert Ancell <robert.ancell@canonical.com>
Date: Mon Feb 15 18:08:57 2016 -0800
Add in missing released commit
diff --git a/debian/changelog b/debian/changelog
index 6152b8e..e7fc71b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg-server (2:1.17.3-2ubuntu2) xenial; urgency=medium
+xorg-server (2:1.17.3-2ubuntu3) xenial; urgency=medium
* debian/patches/xmir.patch:
- Add ability to set title for XMir (LP: #1542028)
@@ -7,6 +7,12 @@ xorg-server (2:1.17.3-2ubuntu2) xenial; urgency=medium
-- Robert Ancell <robert.ancell@canonical.com> Mon, 15 Feb 2016 17:32:21 -0800
+xorg-server (2:1.17.3-2ubuntu2) xenial; urgency=medium
+
+ * Disable mir on s390x.
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com> Wed, 25 Nov 2015 16:11:38 +0000
+
xorg-server (2:1.17.3-2ubuntu1) xenial; urgency=medium
[ Robert Ancell ]
diff --git a/debian/control b/debian/control
index 6d63639..ddbe447 100644
--- a/debian/control
+++ b/debian/control
@@ -101,7 +101,7 @@ Build-Depends:
#logind
libdbus-1-dev (>= 1.0) [linux-any],
# XMir
- libmirclient-dev (>= 0.13.1) [!arm64 !powerpc !ppc64el],
+ libmirclient-dev (>= 0.13.1) [!arm64 !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
diff --git a/debian/rules b/debian/rules
index 5d1f9a7..040282e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -56,7 +56,7 @@ else
endif
# Mir isn't built on PPC
-ifneq (,$(filter $(DEB_HOST_ARCH), arm64 powerpc ppc64el))
+ifneq (,$(filter $(DEB_HOST_ARCH), arm64 powerpc ppc64el s390x))
build_xmir = --disable-xmir
endif
Reply to: