[SCM] BOINC packaging branch, master, updated. debian/7.0.33+dfsg-1-74-g0438cfd
Gianfranco Costamagna
costamagnagianfranco at yahoo.it
Fri Nov 2 09:23:15 UTC 2012
The following commit has been merged in the master branch:
commit 0438cfd8cf56d2f381fba1ebf28916c2b3b299ed
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date: Fri Nov 2 10:09:40 2012 +0100
New patch to fix ftbfs from upstream, thanks Rom
diff --git a/debian/patches/boinc-ftbfs-hurd.patch b/debian/patches/boinc-ftbfs-hurd.patch
index c42defe..f3992ba 100644
--- a/debian/patches/boinc-ftbfs-hurd.patch
+++ b/debian/patches/boinc-ftbfs-hurd.patch
@@ -1,4 +1,5 @@
-Author: Gianfranco Costamagna costamagnagianfranco at yahoo.it
+Author: David Anderson
+
Origin: upstream, 9506b117 http://boinc.berkeley.edu/trac/changeset/9506b117a1df4d5754d891ec12cb8aa76d4dd192/boinc
Forwarded: not-needed
diff --git a/debian/patches/boinc-ftbfs.patch b/debian/patches/boinc-ftbfs.patch
new file mode 100644
index 0000000..86f51a1
--- /dev/null
+++ b/debian/patches/boinc-ftbfs.patch
@@ -0,0 +1,29 @@
+Description:
+ This patch should fix the ftbfs introduced by boinc-ftbfs-hurd.patch
+Author: Rom Walton
+
+Origin: upstream, 4e84139 http://boinc.berkeley.edu/trac/changeset/4e841398c9b4c901e85788b32cb1c2630ef0c390/boinc
+Forwarded: not-needed
+Reviewed-By: costamagnagianfranco at yahoo.it
+Last-Update: <2012-11-2>
+
+--- boinc-7.0.36+dfsg.orig/client/client_types.h
++++ boinc-7.0.36+dfsg/client/client_types.h
+@@ -36,6 +36,7 @@
+ #include "hostinfo.h"
+ #include "coproc.h"
+ #include "miofile.h"
++#include "filesys.h"
+ #include "common_defs.h"
+ #include "cc_config.h"
+
+--- boinc-7.0.36+dfsg.orig/lib/proxy_info.h
++++ boinc-7.0.36+dfsg/lib/proxy_info.h
+@@ -19,6 +19,7 @@
+ #define _PROXY_INFO_
+
+ #include "miofile.h"
++#include "parse.h"
+
+ // info on whether HTTP requests need to go through a proxy
+ //
diff --git a/debian/patches/series b/debian/patches/series
index 079585a..9de52c2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -79,3 +79,4 @@ dynamic_libboinc.patch
Missing_libSched.patch
missing_libs_wrapper.patch
boinc-ftbfs-hurd.patch
+boinc-ftbfs.patch
--
BOINC packaging
More information about the pkg-boinc-commits
mailing list