xorg-server: Changes to 'ubuntu'
debian/changelog | 6 ++++++
debian/control | 2 +-
debian/rules | 5 +++++
3 files changed, 12 insertions(+), 1 deletion(-)
New commits:
commit c8af1847d4103dc8f5bc8f8d4c2c698ad5c0e27c
Author: Christopher James Halse Rogers <raof@ubuntu.com>
Date: Mon Aug 5 18:47:04 2013 +1000
Don't build XMir on PPC
diff --git a/debian/changelog b/debian/changelog
index e80041d..2f15b20 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg-server (2:1.14.2-0ubuntu5) saucy; urgency=low
+
+ * rules,control: Restrict XMir build to !powerpc, as we don't build Mir there
+
+ -- Christopher James Halse Rogers <raof@ubuntu.com> Mon, 05 Aug 2013 18:46:43 +1000
+
xorg-server (2:1.14.2-0ubuntu4) saucy; urgency=low
* Add xmir.patch; First upload with XMir support.
diff --git a/debian/control b/debian/control
index a4ad044..cb2e240 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) [linux-any],
+ libmirclient-dev (>= 0.0.8+13.10.20130803) [!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
diff --git a/debian/rules b/debian/rules
index 496c47a..4f17569 100755
--- a/debian/rules
+++ b/debian/rules
@@ -69,6 +69,11 @@ else
selinux = --disable-xselinux
endif
+# Mir isn't built on PPC
+ifeq ($(DEB_HOST_ARCH), powerpc)
+ build_xmir = --disable-xmir
+endif
+
ifeq ($(DEB_HOST_ARCH_OS), hurd)
dri = --disable-dri --disable-dri2
else
Reply to: