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

[Steffen Moeller]

The following commit has been merged in the master branch:
commit 652bd1af69719933d6e631aeb021ac7a3d1cdebe
Author: Steffen Moeller <moeller at debian.org>
Date:   Sun Dec 5 16:43:45 2010 +0100

    Fixing server compilation CUDA/ATI fags for sched
    
    found in 6.10.58

diff --git a/debian/patches/flops_not_found.patch b/debian/patches/flops_not_found.patch
new file mode 100644
index 0000000..dd54b41
--- /dev/null
+++ b/debian/patches/flops_not_found.patch
@@ -0,0 +1,22 @@
+Index: boinc/sched/sched_customize.cpp
+===================================================================
+--- boinc.orig/sched/sched_customize.cpp	2010-12-05 16:39:02.000000000 +0100
++++ boinc/sched/sched_customize.cpp	2010-12-05 16:42:57.000000000 +0100
+@@ -108,7 +108,7 @@
+             return PLAN_REJECT_ATI_NO_DEVICE;
+         }
+ 
+-        hu.flops = cp->flops();
++        hu.flops = cp->peak_flops();
+ 
+         // assume we'll need 0.5% as many CPU FLOPS as GPU FLOPS
+         // to keep the GPU fed.
+@@ -187,7 +187,7 @@
+             }
+             return PLAN_REJECT_CUDA_MEM;
+         }
+-        hu.flops = cp->flops_estimate();
++        hu.flops = cp->peak_flops();
+         if (!strcmp(plan_class, "cuda23")) {
+             hu.flops *= 1.01;
+         }
diff --git a/debian/patches/series b/debian/patches/series
index 1991a12..60eec50 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,5 @@
 lib_Makefile_am_order.patch
+flops_not_found.patch
 003_use_sensible-browser.patch 
 006_correct_catalog_path.patch
 200_don-t-assume_SCHED_BATCH_exist.patch

-- 
BOINC packaging