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

[Ove Kaaven]

The following commit has been merged in the master branch:
commit ef49be112b501bfe76ea43444fccfdb02448c14b
Author: Ove Kaaven <ovek at arcticnet.no>
Date:   Thu Jul 9 01:11:37 2009 +0200

    If installing into /usr/lib32 (on an amd64 system), and it is not a symlink on the build system,
    force the resulting binaries to pre-depend on libc6-i386 2.9.18. Closes: #535204.

diff --git a/debian/control.in b/debian/control.in
index ae46bb4..5d7d3cd 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -89,6 +89,7 @@ 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
 Depends: ${shlibs:Depends}
+Pre-Depends: ${misc:Pre-Depends}
 Replaces: wine (<< 0.9.11-1), libwine-twain (<< 0.9.13), libwine-gl (<< 0.9.53-1)
 Suggests: wine-doc
 Description: Windows API implementation - library
diff --git a/debian/prep-control-transit.sh b/debian/prep-control-transit.sh
index be052fb..9e6dde9 100644
--- a/debian/prep-control-transit.sh
+++ b/debian/prep-control-transit.sh
@@ -11,6 +11,7 @@ sed -n "
  : PKG
  x
  s/Package: \([^\n]*\)\n\(\([^\n]*\n\)*\)Depends: \(.*\n\([ ].*\n\)*\)/Package: \1${SUFFIX}\n\2Depends: ${PREFIX}\1${SUFFIX}\n/M
+ s/Pre-Depends: .*\n//M
  s/Conflicts: .*\n//M
  s/Recommends: .*\n//M
  s/Suggests: .*\n//M
diff --git a/debian/rules b/debian/rules
index d8ed041..1c6ec22 100755
--- a/debian/rules
+++ b/debian/rules
@@ -348,6 +348,10 @@ binary-arch: install-arch-stamp
 	# relaxed libwine dependencies for everyone else
 	dh_makeshlibs -s
 
+ifeq (usr/lib32,$(IA32_LIBDIR))
+	echo "misc:Pre-Depends=libc6-i386 (>= 2.9-18)" >> debian/libwine$(VERSUFFIX).substvars
+endif
+
 	dh_installdeb -s
 
 	dh_gencontrol -s

-- 
Debian Wine packaging