[pkg-wine-party] [SCM] Debian Wine packaging branch, master, updated. wine-1.1.24-1-618-gc8c5acb

Ove Kaaven ovek at arcticnet.no
Sat Jul 11 18:02:54 UTC 2009


The following commit has been merged in the master branch:
commit 0a022aeef1336984a28833ea76c6fc18bae65e22
Author: Ove Kaaven <ovek at arcticnet.no>
Date:   Sat Jul 11 17:43:35 2009 +0200

    Now build with multiarch library paths.
    Hence, instead of /usr/lib on i386 and /usr/lib32 on amd64, Wine's 32-bit libraries are now in /usr/lib/i486-linux-gnu for both.
    Although full multiarch isn't here yet, this should also make Wine work better with ia32-apt-get.

diff --git a/debian/rules b/debian/rules
index 1c6ec22..0cb2af8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,6 +21,7 @@ CONFIGOPTS = --with-x --disable-tests
 
 DEB_HOST_GNU_SYSTEM	?= $(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM)
 DEB_HOST_GNU_CPU	?= $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)
+DEB_HOST_GNU_TYPE	?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 
 DEBIAN_VERSION := $(shell cat /etc/debian_version)
 VERSION := $(lastword $(shell dpkg-parsechangelog|grep "^Version: "))
@@ -29,8 +30,15 @@ VERSION := $(lastword $(shell dpkg-parsechangelog|grep "^Version: "))
 
 VERSUFFIX=-unstable
 
+# for backports, maybe make this conditional on debian version compiled for
+MULTIARCH=y
+
 CC=gcc
+ifneq (,$(MULTIARCH))
+LIBDIR=usr/lib/$(DEB_HOST_GNU_TYPE)
+else
 LIBDIR=usr/lib
+endif
 LIBDIRS=$(LIBDIR)
 
 IA32_CC := $(CC)
@@ -48,11 +56,15 @@ ifeq ($(DEB_HOST_GNU_CPU),x86_64)
 
 IA32_LIBS := /emul/ia32-linux
 IA32_LDFLAGS += -L$(CURDIR)/lib32
+ifneq (,$(MULTIARCH))
+IA32_LIBDIR := usr/lib/i486-$(DEB_HOST_GNU_SYSTEM)
+else
 IA32_LIBDIR := usr/lib32
 IA32_LIBDIR_LINK := $(shell readlink /$(IA32_LIBDIR))
 ifneq (,$(IA32_LIBDIR_LINK))
 IA32_LIBDIR := $(patsubst /%,%,$(IA32_LIBDIR_LINK))
 endif
+endif
 
 # Not ready yet: build Win64 version
 #BUILDS = build32 build64
@@ -348,9 +360,11 @@ binary-arch: install-arch-stamp
 	# relaxed libwine dependencies for everyone else
 	dh_makeshlibs -s
 
+ifneq (,$(findstring build32,$(BUILDS)))
 ifeq (usr/lib32,$(IA32_LIBDIR))
 	echo "misc:Pre-Depends=libc6-i386 (>= 2.9-18)" >> debian/libwine$(VERSUFFIX).substvars
 endif
+endif
 
 	dh_installdeb -s
 

-- 
Debian Wine packaging



More information about the pkg-wine-party mailing list