xorg-server: Changes to 'ubuntu'
debian/changelog | 6 ++++++
debian/control | 4 ++--
debian/rules | 2 +-
3 files changed, 9 insertions(+), 3 deletions(-)
New commits:
commit 84345a0440d256eac3ff2f07a1e0bd68b47126ba
Author: Matthias Klose <doko@ubuntu.com>
Date: Sun Dec 15 22:42:40 2013 +0100
Don't build XMir on ppc64el.
diff --git a/debian/changelog b/debian/changelog
index 6423067..6375062 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg-server (2:1.14.5-1ubuntu2) trusty; urgency=medium
+
+ * Don't build XMir on ppc64el.
+
+ -- Matthias Klose <doko@ubuntu.com> Sun, 15 Dec 2013 22:42:40 +0100
+
xorg-server (2:1.14.5-1ubuntu1) trusty; urgency=low
* Merge from released debian-unstable.
diff --git a/debian/control b/debian/control
index 8b71bd7..2060c04 100644
--- a/debian/control
+++ b/debian/control
@@ -83,7 +83,7 @@ Build-Depends:
# getpeereid()
libbsd-dev [kfreebsd-any],
# XMir
- libmirclient-dev (>= 0.0.8+13.10.20130803) [!arm64 !powerpc],
+ libmirclient-dev (>= 0.0.8+13.10.20130803) [!arm64 !powerpc !ppc64el],
libatomic-ops-dev,
Standards-Version: 3.9.3
Vcs-Git: git://git.debian.org/git/pkg-xorg/xserver/xorg-server
@@ -190,7 +190,7 @@ Depends:
libxkbfile-dev,
libpciaccess-dev,
mesa-common-dev,
- libmirclient-dev [!arm64 !powerpc],
+ libmirclient-dev [!arm64 !powerpc !ppc64el],
${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 99b7165..a7067d0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -54,7 +54,7 @@ else
endif
# Mir isn't built on PPC
-ifneq (,$(filter $(DEB_HOST_ARCH), arm64 powerpc))
+ifneq (,$(filter $(DEB_HOST_ARCH), arm64 powerpc ppc64el))
build_xmir = --disable-xmir
endif
Reply to: