debian/changelog | 12 ++++++++++++
debian/control | 2 +-
debian/rules | 3 +++
3 files changed, 16 insertions(+), 1 deletion(-)
New commits:
commit 1af717d75f3afbe8341bcb69dabb5e158bd1d67a
Author: Maarten Lankhorst <d...@mblankhorst.nl>
Date: Tue Feb 4 10:53:44 2014 +0000
import ubuntu changes
diff --git a/debian/changelog b/debian/changelog
index 6375062..2fdc3c0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+xorg-server (2:1.14.5-1ubuntu4) trusty; urgency=medium
+
+ * Build xserver-xorg-core-udeb on arm64 and ppc64el.
+
+ -- Colin Watson <cjwat...@ubuntu.com> Mon, 03 Feb 2014 15:44:50 +0000
+
+xorg-server (2:1.14.5-1ubuntu3) trusty; urgency=low
+
+ * Add a workaround for a linker crash bug. (LP: #1266492)
+
+ -- Maarten Lankhorst <maarten.lankho...@ubuntu.com> Wed, 29 Jan 2014
16:13:36 +0100
+
xorg-server (2:1.14.5-1ubuntu2) trusty; urgency=medium
* Don't build XMir on ppc64el.
diff --git a/debian/control b/debian/control
index 2060c04..7ac1c5b 100644
--- a/debian/control
+++ b/debian/control
@@ -154,7 +154,7 @@ Package: xserver-xorg-core-udeb
XC-Package-Type: udeb
Section: debian-installer
# exclude sparc because of linker errors
-Architecture: alpha amd64 armel armhf hppa hurd-i386 i386 ia64 kfreebsd-amd64
kfreebsd-i386 mips mipsel powerpc powerpcspe s390
+Architecture: alpha amd64 arm64 armel armhf hppa hurd-i386 i386 ia64
kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64el s390
Depends:
# merged: xserver-common (>= ${source:Version}),
xkb-data-udeb,
diff --git a/debian/rules b/debian/rules
index a7067d0..f2a1140 100755
--- a/debian/rules
+++ b/debian/rules
@@ -93,6 +93,9 @@ SOURCE_NAME := xorg-server
SOURCE_VERSION := $(shell dpkg-parsechangelog | awk -F': ' '/^Version: /
{print $$2}')
BUILDER=For technical support please see http://www.ubuntu.com/support
+# Add a workaround for LP: #1266492
+confflags += lt_cv_prog_compiler_static_works=no
+
# disable-static is so we don't get libfoo.a for modules. now if only we could
# kill the .las.
confflags += \
--
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/e1waew6-00071a...@moszumanska.debian.org
