Bug#366741: new patch

[Robert Millan]

New patch.  This one adds "libc6-i386" to dependencies as well (only on amd64,
by using substvars).

Core binaries are dynamicaly linked (at least the ones I'm using, from
http://climateprediction.net/), so without ia32 libc they won't run.

-- 
Robert Millan
-------------- next part --------------
diff -ur boinc-5.4.9.old/debian/changelog boinc-5.4.9/debian/changelog
--- boinc-5.4.9.old/debian/changelog	2006-05-12 12:56:35.000000000 +0200
+++ boinc-5.4.9/debian/changelog	2006-05-12 12:02:24.973850272 +0200
@@ -1,3 +1,9 @@
+boinc (5.4.9-1+rmh) unstable; urgency=low
+
+  * amd64 support.
+
+ -- Robert Millan <rmh at aybabtu.com>  Fri, 12 May 2006 12:02:20 +0200
+
 boinc (5.4.9-1) unstable; urgency=low
 
   [ Frank S. Thomas ]
diff -ur boinc-5.4.9.old/debian/rules boinc-5.4.9/debian/rules
--- boinc-5.4.9.old/debian/rules	2006-05-12 12:56:35.000000000 +0200
+++ boinc-5.4.9/debian/rules	2006-05-12 12:50:06.055899688 +0200
@@ -7,6 +7,7 @@
 
 DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_HOST_ARCH_CPU  ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
 
 ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
   TYPE_FLAGS = --build $(DEB_HOST_GNU_TYPE)
@@ -18,10 +19,16 @@
 # If the core client reports that it was built for i486-pc-linux-gnu it won't
 # download any application or work units, so we use i686-linux-gnu as argument
 # for configure's --build and --host switches on i386 hosts.
-ifeq ($(DEB_HOST_GNU_TYPE), i486-linux-gnu)
+ifeq ($(DEB_HOST_ARCH_CPU), i386)
   DEB_HOST_GNU_TYPE = i686-linux-gnu
 endif
-ifeq ($(DEB_BUILD_GNU_TYPE), i486-linux-gnu)
+ifeq ($(DEB_HOST_ARCH_CPU), amd64)
+  DEB_HOST_GNU_TYPE = i686-linux-gnu
+endif
+ifeq ($(DEB_BUILD_ARCH_CPU), i386)
+  DEB_BUILD_GNU_TYPE = i686-linux-gnu
+endif
+ifeq ($(DEB_BUILD_ARCH_CPU), amd64)
   DEB_BUILD_GNU_TYPE = i686-linux-gnu
 endif
 
@@ -191,6 +198,9 @@
 	dh_python -a
 	dh_installdeb -a
 	dh_shlibdeps -a
+ifeq ($(DEB_HOST_ARCH_CPU), amd64)
+	echo "misc:Depends=libc6-i386 | ia32-libs" >> debian/boinc-client.substvars
+endif
 	dh_gencontrol -a
 	dh_md5sums -a
 	dh_builddeb -a