Bug#366741: get i686-linux-gnu binaries on amd64

[Robert Millan]

Package: boinc-client
Version: 5.4.9-1+rmh
Severity: important
Tags: patch

TTBOMK, no boinc projects are providing core binaries for amd64.  So our only
hope of making this package useful on that platform is requesting i686 ones
instead.  Patch attached.

It also fixes the cpu check to work on non-Linux (where the best choice is,
imho, assuming the kernel has Linux abi emulation).

-- System Information:
Debian Release: testing/unstable
  APT prefers testing
  APT policy: (500, 'testing')
Architecture: amd64 (x86_64)
Shell:  /bin/sh linked to /bin/bash
Kernel: Linux 2.6.15-1-amd64-k8
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=ANSI_X3.4-1968) (ignored: LC_ALL set to C)

Versions of packages boinc-client depends on:
ii  adduser       3.87                       Add and remove users and groups
ii  libc6         2.3.6-7                    GNU C Library: Shared libraries
ii  libcomerr2    1.38+1.39-WIP-2006.04.09-1 common error description library
ii  libcurl3      7.15.3-1                   Multi-protocol file transfer libra
ii  libgcc1       1:4.1.0-1                  GCC support library
ii  libidn11      0.5.18-2                   GNU libidn library, implementation
ii  libkrb53      1.4.3-6                    MIT Kerberos runtime libraries
ii  libssl0.9.8   0.9.8a-8                   SSL shared libraries
ii  libstdc++6    4.1.0-1                    The GNU Standard C++ Library v3
ii  lsb-base      3.1-5                      Linux Standard Base 3.1 init scrip
ii  python2.4     2.4.2-2                    An interactive high-level object-o
ii  zlib1g        1:1.2.3-11                 compression library - runtime

boinc-client recommends no packages.

-- no debconf information
-------------- next part --------------
--- boinc-5.4.9.old/debian/rules	2006-05-10 20:46:58.000000000 +0200
+++ boinc-5.4.9/debian/rules	2006-05-10 21:10:20.000000000 +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