[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[pkg-wine-party] [SCM] Debian Wine packaging branch, master, updated. wine-1.0-rc1-1-8-gd673fa8



The following commit has been merged in the master branch:
commit d673fa8143854a446db5f9bbdebf2ca69e7b8d25
Author: Ove Kaaven <ovek@arcticnet.no>
Date:   Sat May 24 18:08:12 2008 +0200

    Disable the old amd64 hack in favor of the new ia32-libs symlink hack.

diff --git a/debian/rules b/debian/rules
index 5962705..d005e67 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,18 +23,18 @@ VERSION := $(lastword $(shell dpkg-parsechangelog|grep "^Version: "))
 
 #DEBIAN_SID := $(findstring sid,$(DEBIAN_VERSION))
 
-#ifeq (,$(findstring etch,$(DEBIAN_VERSION)))
-## delete amd64.tar.lzma.uu if we're not on etch.
-#AMD64_PACK = false
-#endif
+ifeq (,$(findstring etch,$(DEBIAN_VERSION)))
+# delete amd64.tar.lzma.uu if we're not on etch.
+AMD64_PACK = false
+endif
 
 # On i386, pack binaries into amd64.tar.lzma.uu and embed it into
 # source package, because debian's amd64 port has pretty crappy
 # support for building 32-bit binaries natively.
 
-ifeq ($(DEB_HOST_GNU_CPU)-$(DEB_HOST_GNU_SYSTEM),i486-linux-gnu)
-AMD64_PACK ?= true
-endif
+#ifeq ($(DEB_HOST_GNU_CPU)-$(DEB_HOST_GNU_SYSTEM),i486-linux-gnu)
+#AMD64_PACK ?= true
+#endif
 
 # On amd64, build 32-bit package by simply unpacking amd64.tar.lzma.uu
 # if it exists, otherwise build from source using 32-bit compiler.

-- 
Debian Wine packaging



Reply to: