[SCM] BOINC packaging branch, master, updated. upstream/7.0.27+dfsg-438-g48d429b

Steffen Moeller steffen_moeller at gmx.de
Thu May 10 11:26:56 UTC 2012


The following commit has been merged in the master branch:
commit 48d429bea99da7869b9e618c5818ea8d225c2373
Author: Steffen Moeller <steffen_moeller at gmx.de>
Date:   Thu May 10 12:52:10 2012 +0200

    Closing Ubuntu bug. And build failure.

diff --git a/debian/changelog b/debian/changelog
index 78ea2d0..1102b53 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,11 @@
 boinc (7.0.27+dfsg-3) unstable; urgency=low
 
-  * Now truly reconstituting compatibility with SETI (Closes: #672328).
+  * Now truly reconstituting compatibility with SETI
+    (Closes: #672328, lp: #991179).
+  * builds with gcc 4.7 (Closes: #671999)
+    Thanks to Matthias Klose for his patch, had sadly only seen it after
+    I patched it myself :o/  The NMU of his should not kick in because
+    of the SETI incompatibility.
 
  -- Steffen Moeller <moeller at debian.org>  Thu, 10 May 2012 10:59:30 +0200
 
diff --git a/debian/patches/unlink_undefined.patch b/debian/patches/unlink_undefined.patch
index e439659..83407fc 100644
--- a/debian/patches/unlink_undefined.patch
+++ b/debian/patches/unlink_undefined.patch
@@ -1,7 +1,7 @@
 Index: boinc/tools/process_input_template.cpp
 ===================================================================
---- boinc.orig/tools/process_input_template.cpp	2012-03-29 22:49:59.000000000 +0200
-+++ boinc/tools/process_input_template.cpp	2012-05-10 12:26:30.000000000 +0200
+--- boinc.orig/tools/process_input_template.cpp	2012-05-10 12:51:41.351949895 +0200
++++ boinc/tools/process_input_template.cpp	2012-05-10 12:52:24.000000000 +0200
 @@ -17,6 +17,7 @@
  
  #include <stdio.h>
@@ -10,3 +10,51 @@ Index: boinc/tools/process_input_template.cpp
  #include <sys/types.h>
  #include <sys/stat.h>
  
+Index: boinc/sched/single_job_assimilator.cpp
+===================================================================
+--- boinc.orig/sched/single_job_assimilator.cpp	2012-03-31 13:44:26.867113620 +0200
++++ boinc/sched/single_job_assimilator.cpp	2012-05-10 13:05:44.388571200 +0200
+@@ -24,6 +24,7 @@
+ #include <string>
+ #include <cstdlib>
+ #include <cstring>
++#include <unistd.h>
+ 
+ #include "boinc_db.h"
+ #include "error_numbers.h"
+Index: boinc/tools/create_work.cpp
+===================================================================
+--- boinc.orig/tools/create_work.cpp	2012-03-31 13:44:27.107110342 +0200
++++ boinc/tools/create_work.cpp	2012-05-10 13:06:35.687877523 +0200
+@@ -26,6 +26,7 @@
+ #include <cstring>
+ #include <ctime>
+ #include <string>
++#include <unistd.h>
+ 
+ #include "backend_lib.h"
+ #include "boinc_db.h"
+Index: boinc/vda/vda.cpp
+===================================================================
+--- boinc.orig/vda/vda.cpp	2012-03-31 13:47:01.892995979 +0200
++++ boinc/vda/vda.cpp	2012-05-10 13:07:12.487379494 +0200
+@@ -21,6 +21,7 @@
+ // vda add path     add a file
+ 
+ #include <stdio.h>
++#include <unistd.h>
+ 
+ #include "boinc_db.h"
+ #include "filesys.h"
+Index: boinc/vda/vdad.cpp
+===================================================================
+--- boinc.orig/vda/vdad.cpp	2012-04-19 18:05:13.228502956 +0200
++++ boinc/vda/vdad.cpp	2012-05-10 13:09:12.785751379 +0200
+@@ -27,6 +27,7 @@
+ #include <sys/types.h>
+ #include <vector>
+ #include <set>
++#include <unistd.h>
+ 
+ using std::vector;
+ using std::set;

-- 
BOINC packaging



More information about the pkg-boinc-commits mailing list