[SCM] BOINC packaging branch, master, updated. debian/6.10.17+dfsg-3-266-gaa6266b

[Steffen Moeller]

The following commit has been merged in the master branch:
commit 0a8bcdbe4beb0e91d872927bc7e04da31700a374
Author: Steffen Moeller <moeller at debian.org>
Date:   Sat Jun 11 19:55:41 2011 +0200

    Deciding against a depends on ia32-libs.

diff --git a/debian/changelog b/debian/changelog
index 0f04f58..665f1ca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,10 +6,9 @@ boinc (6.12.32+dfsg-1) unstable; urgency=low
       accepted)
   * Initial preparations for merging with developments
     for Debian and beyond at SZTAKI, Budapest.
-  * amd64 package now explicitly presents itself also
-    as i686 savvy as an alternative platform name and such such it now
-    not only recommends but depends with its -client on ia32-lib
-    (Closes: #562431) (lp: #560143).
+  * Recommending on amd64 to also install the ia32-lib package.
+    A "Depends" would not be acceptable for too many aiming
+    at a lean system (Closes: #562431) (lp: #560143).
 
  -- Steffen Moeller <moeller at debian.org>  Fri, 10 Jun 2011 13:56:34 +0200
 
diff --git a/debian/control b/debian/control
index 52833da..cb26fdf 100644
--- a/debian/control
+++ b/debian/control
@@ -38,7 +38,8 @@ Description: metapackage for the BOINC client and the manager
 Package: boinc-client
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, python (>= 2.3), adduser,
- ca-certificates, ia32-libs [amd64]
+ ca-certificates
+Recommends: ia32-libs [amd64]
 Suggests: boinc-app-seti, boinc-manager, x11-xserver-utils
 Breaks: udev (<< 136-1)
 Description: core client for the BOINC distributed computing infrastructure
diff --git a/debian/rules b/debian/rules
index bb21961..1b259a4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -47,8 +47,11 @@ endif
 # for the complete bit size.
 ifeq ($(DEB_HOST_GNU_TYPE), x86_64-linux-gnu)
   TYPE_FLAGS += --with-boinc-platform=x86_64-pc-linux-gnu
-  TYPE_FLAGS += --with-boinc-alt-platform=i686-pc-linux-gnu
-  #TYPE_FLAGS += --with-boinc-alt-platform=x86_64-linux-gnu
+  # wrong previous name (since regular Debian name)
+  TYPE_FLAGS += --with-boinc-alt-platform=x86_64-linux-gnu
+  # if we did the following, the the ia32 libs would
+  # need to become a dependency - which is not wanted by too many
+  #TYPE_FLAGS += --with-boinc-alt-platform=i686-pc-linux-gnu
 endif
 
 # Change BOINC platform i486-pc-kfreebsd-gnu to i686-pc-kfreebsd-gnu to be

-- 
BOINC packaging