[pkg-wine-party] [SCM] Debian Wine packaging branch, master, updated. wine-1.1.27-1-446-gaf4a3bb

[Ove Kaaven]

The following commit has been merged in the master branch:
commit ffcc829873341f74b03a5228b5dadf5d284bd67c
Author: Ove Kaaven <ovek at arcticnet.no>
Date:   Sat Aug 22 16:35:27 2009 +0200

    If 32-bit Wine is compiled on amd64 using multiarch paths, depend on a libc6-i386 >= 2.9-24.

diff --git a/debian/control.in b/debian/control.in
index af084bf..b63603d 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -91,8 +91,8 @@ Package: libwine
 Section: libs
 Architecture: i386 hurd-i386 kfreebsd-i386 netbsd-i386 amd64 kfreebsd-amd64 powerpc hurd-powerpc kfreebsd-powerpc netbsd-powerpc sparc hurd-sparc kfreebsd-sparc netbsd-sparc
 Multi-Arch: same
-Depends: ${shlibs:Depends}
-Pre-Depends: ${misc:Pre-Depends}
+Depends: ${wine:Depends}, ${shlibs:Depends}
+Pre-Depends: ${wine:Pre-Depends}
 Replaces: wine (<< 0.9.11-1), libwine-twain (<< 0.9.13), libwine-gl (<< 0.9.53-1)
 Recommends: ${shlibs:Recommends}
 Suggests: wine-doc
diff --git a/debian/rules b/debian/rules
index 4f3d7ef..3d235c5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -82,6 +82,14 @@ LIBDIRS =
 else
 BUILDS = build32
 LIBDIRS = $(IA32_LIBDIR)
+ifeq (usr/lib32,$(IA32_LIBDIR))
+# for /emul/ia32-linux/usr/lib -> /usr/lib32 transition
+LIBWINE_PREDEPS = libc6-i386 (>= 2.9-18)
+endif
+ifeq (usr/lib/i486-linux-gnu,$(IA32_LIBDIR))
+# need ld.so support for multiarch path
+LIBWINE_DEPS = libc6-i386 (>= 2.9-24)
+endif
 endif
 
 ifeq (y,$(ENABLE_WIN64))
@@ -102,12 +110,6 @@ space:=$(empty) $(empty)
 
 SHLIBS_OPTS = -Llibwine$(VERSUFFIX) -l$(subst $(space),:,$(patsubst %,$(CURDIR)/debian/libwine$(VERSUFFIX)/%,$(LIBDIRS)))
 
-ifneq (,$(findstring build32,$(BUILDS)))
-ifeq (usr/lib32,$(IA32_LIBDIR))
-PRE_DEPS = Pre-Depends=libc6-i386 (>= 2.9-18)
-endif
-endif
-
 control-stamp: debian/control.in
 ifneq (,$(BUILDS))
 	bash debian/prep-control.sh "$(VERSUFFIX)"
@@ -376,11 +378,12 @@ binary-arch: install-arch-stamp
 	dh_compress -s
 	dh_fixperms -s
 
+	echo "wine:Pre-Depends=$(LIBWINE_PREDEPS)" >> debian/libwine$(VERSUFFIX).substvars
+	echo "wine:Depends=$(LIBWINE_DEPS)" >> debian/libwine$(VERSUFFIX).substvars
+
 	# tight libwine dependencies for packages built here
 	dh_makeshlibs -plibwine$(VERSUFFIX) -n -V "libwine$(VERSUFFIX) (= $(VERSION))"
 
-	echo "misc:Pre-Depends=$(PRE_DEPS)" >> debian/libwine$(VERSUFFIX).substvars
-
 	# forcing extra dependencies
 	bash debian/gendeps.sh "$(VERSUFFIX)" $(patsubst build%,%,$(BUILDS))
 	dh_shlibdeps -s $(SHLIBS_OPTS) -Xextrarecs

-- 
Debian Wine packaging