Package: liquidwar
Version: 5.6.3-3
Severity: normal
Tags: patch

Attached is the diff for my liquidwar 5.6.3-3.1 NMU.

I would also suggest that you both join the Debian Games
Team and maintain the package there. I have encouraged
upstream to join the team and take over this package
if you are not going to work on it.

-- 
bye,
pabs

http://wiki.debian.org/PaulWise
diff -u liquidwar-5.6.3/debian/changelog liquidwar-5.6.3/debian/changelog
--- liquidwar-5.6.3/debian/changelog
+++ liquidwar-5.6.3/debian/changelog
@@ -1,3 +1,11 @@
+liquidwar (5.6.3-3.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix FTBFS on amd64 by disabling the x86-only assembly
+    Patch from Ubuntu by Stefan Potrya closes: #451436
+
+ -- Paul Wise <[EMAIL PROTECTED]>  Sun, 23 Mar 2008 13:26:23 +0900
+
 liquidwar (5.6.3-3) unstable; urgency=low
 
   * Maintainer upload.
diff -u liquidwar-5.6.3/debian/rules liquidwar-5.6.3/debian/rules
--- liquidwar-5.6.3/debian/rules
+++ liquidwar-5.6.3/debian/rules
@@ -17,6 +17,7 @@
 
 export DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+export DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
 
 # FOR AUTOCONF 2.52 AND NEWER ONLY
 ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
@@ -25,6 +26,11 @@
   confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
 endif
 
+# disable assembly for amd64, won't work
+ifeq ($(DEB_HOST_ARCH_CPU),amd64)
+  confflags += --disable-asm
+endif
+
 configure: configure-stamp
 configure-stamp: autotools
 	dh_testdir

Attachment: signature.asc
Description: This is a digitally signed message part

Reply via email to