debian/changelog | 13 +++++++++++++
debian/control | 4 ++--
debian/rules | 2 +-
3 files changed, 16 insertions(+), 3 deletions(-)
New commits:
commit 2924295ba7e420d3d3481a1c171d8e8a0ec4a71a
Author: Christopher James Halse Rogers <r...@ubuntu.com>
Date: Tue Aug 6 09:41:56 2013 +1000
Fold in more “disable XMir on stupid architectures” releases
diff --git a/debian/changelog b/debian/changelog
index 41b1039..7a2c56e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+xorg-server (2:1.14.2-0ubuntu8) saucy; urgency=low
+
+ * Don't build XMir on AArch64.
+
+ -- Matthias Klose <d...@ubuntu.com> Mon, 05 Aug 2013 15:51:01 +0200
+
+xorg-server (2:1.14.2-0ubuntu7) saucy; urgency=low
+
+ * Don't have the -dev package depending on libmirclient-dev on powerpc
+ as unavailable
+
+ -- Didier Roche <didro...@ubuntu.com> Mon, 05 Aug 2013 12:33:48 +0200
+
xorg-server (2:1.14.2-0ubuntu6) saucy; urgency=low
* As we don't build XMir on PPC we should not try to build the
diff --git a/debian/control b/debian/control
index dc0bca0..bf07032 100644
--- a/debian/control
+++ b/debian/control
@@ -81,7 +81,7 @@ Build-Depends:
xkb-data,
x11-xkb-utils,
# XMir
- libmirclient-dev (>= 0.0.8+13.10.20130803) [!powerpc],
+ libmirclient-dev (>= 0.0.8+13.10.20130803) [!arm64 !powerpc],
Standards-Version: 3.9.3
Vcs-Git: git://git.debian.org/git/pkg-xorg/xserver/xorg-server
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/xserver/xorg-server.git
@@ -186,7 +186,7 @@ Depends:
libpciaccess-dev,
libpixman-1-dev (>= 0.21.8),
mesa-common-dev,
- libmirclient-dev,
+ libmirclient-dev [!arm64 !powerpc],
${misc:Depends},
Description: Xorg X server - development files
This package provides development files for the X.Org ('Xorg') X server.
diff --git a/debian/rules b/debian/rules
index 4f17569..8ce4cd7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -70,7 +70,7 @@ else
endif
# Mir isn't built on PPC
-ifeq ($(DEB_HOST_ARCH), powerpc)
+ifneq (,$(filter $(DEB_HOST_ARCH), arm64 powerpc))
build_xmir = --disable-xmir
endif
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1v6upw-0006zt...@vasks.debian.org
