[SCM] BOINC packaging branch, master, updated. debian/7.0.27+dfsg-3-70-g14393c6
Steffen Moeller
steffen_moeller at gmx.de
Sat Aug 11 13:04:21 UTC 2012
The following commit has been merged in the master branch:
commit afb2f264e83d3f13186f59c03a820bf140e2f399
Author: Steffen Moeller <steffen_moeller at gmx.de>
Date: Sat Aug 11 10:29:43 2012 +0200
Preparing for 7.0.33
diff --git a/debian/changelog b/debian/changelog
index 79c79d0..5c7c892 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+boinc (7.0.33+dfsg-1) UNRELEASED; urgency=low
+
+ * New upstream version
+ * Conditional builds of debian/control
+
+ -- Steffen Moeller <moeller at debian.org> Sat, 30 Jun 2012 21:59:59 +0200
+
boinc (7.0.32+dfsg-1) UNRELEASED; urgency=low
[ Steffen Moeller ]
diff --git a/debian/patches/cmath_missing.patch b/debian/patches/cmath_missing.patch
new file mode 100644
index 0000000..2a0ae4e
--- /dev/null
+++ b/debian/patches/cmath_missing.patch
@@ -0,0 +1,299 @@
+Index: boinc/api/gutil.cpp
+===================================================================
+--- boinc.orig/api/gutil.cpp 2012-08-11 10:15:02.283736809 +0200
++++ boinc/api/gutil.cpp 2012-08-11 10:18:20.305048085 +0200
+@@ -24,7 +24,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+-#include <math.h>
++#include <cmath>
+ #include <setjmp.h>
+
+ #ifdef _WIN32
+Index: boinc/api/gutil_text.cpp
+===================================================================
+--- boinc.orig/api/gutil_text.cpp 2012-08-11 10:15:02.287736754 +0200
++++ boinc/api/gutil_text.cpp 2012-08-11 10:18:20.309048031 +0200
+@@ -26,7 +26,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+-#include <math.h>
++#include <cmath>
+ #include <setjmp.h>
+
+ #ifdef _WIN32
+Index: boinc/client/client_state.cpp
+===================================================================
+--- boinc.orig/client/client_state.cpp 2012-08-11 10:18:19.825054602 +0200
++++ boinc/client/client_state.cpp 2012-08-11 10:18:20.317047922 +0200
+@@ -26,7 +26,7 @@
+ #include <ctime>
+ #include <cstdarg>
+ #include <cstring>
+-#include <math.h>
++#include <cmath>
+ #if HAVE_SYS_SOCKET_H
+ #include <sys/socket.h>
+ #endif
+Index: boinc/client/sim_util.cpp
+===================================================================
+--- boinc.orig/client/sim_util.cpp 2012-08-11 10:15:02.295736646 +0200
++++ boinc/client/sim_util.cpp 2012-08-11 10:18:20.321047868 +0200
+@@ -35,7 +35,7 @@
+ #define finite _finite
+ #endif
+
+-#include <math.h>
++#include <cmath>
+
+ #include "error_numbers.h"
+ #include "str_util.h"
+Index: boinc/client/whetstone.cpp
+===================================================================
+--- boinc.orig/client/whetstone.cpp 2012-08-11 10:15:02.295736646 +0200
++++ boinc/client/whetstone.cpp 2012-08-11 10:18:20.325047814 +0200
+@@ -29,7 +29,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <string.h>
+-#include <math.h>
++#include <cmath>
+ #include <time.h>
+ #endif
+
+Index: boinc/clientgui/sqlite3.c
+===================================================================
+--- boinc.orig/clientgui/sqlite3.c 2012-08-11 10:15:02.355735831 +0200
++++ boinc/clientgui/sqlite3.c 2012-08-11 10:18:20.421046510 +0200
+@@ -20222,7 +20222,7 @@
+ **
+ */
+ #ifdef SQLITE_HAVE_ISNAN
+-# include <math.h>
++# include <cmath>
+ #endif
+
+ /*
+Index: boinc/clientscr/ss_app.cpp
+===================================================================
+--- boinc.orig/clientscr/ss_app.cpp 2012-08-11 10:15:02.359735777 +0200
++++ boinc/clientscr/ss_app.cpp 2012-08-11 10:18:20.429046402 +0200
+@@ -22,7 +22,7 @@
+ #ifdef _WIN32
+ #include "boinc_win.h"
+ #else
+-#include <math.h>
++#include <cmath>
+ #endif
+ #include <string>
+ #include <vector>
+Index: boinc/db/boinc_db.cpp
+===================================================================
+--- boinc.orig/db/boinc_db.cpp 2012-08-11 10:15:02.363735722 +0200
++++ boinc/db/boinc_db.cpp 2012-08-11 10:18:20.433046347 +0200
+@@ -22,7 +22,7 @@
+ #include <ctime>
+ #include <unistd.h>
+ #include <cmath>
+-#include <math.h>
++#include <cmath>
+
+ // For machines with finite() defined in ieeefp.h
+ #if HAVE_IEEEFP_H
+Index: boinc/lib/boinc_win.h
+===================================================================
+--- boinc.orig/lib/boinc_win.h 2012-08-11 10:15:02.371735614 +0200
++++ boinc/lib/boinc_win.h 2012-08-11 10:18:20.441046239 +0200
+@@ -200,7 +200,7 @@
+ #include <assert.h>
+ #include <ctype.h>
+ #include <errno.h>
+-#include <math.h>
++#include <cmath>
+ #include <setjmp.h>
+ #include <signal.h>
+ #include <stdarg.h>
+Index: boinc/lib/md5.c
+===================================================================
+--- boinc.orig/lib/md5.c 2012-08-11 10:15:02.371735614 +0200
++++ boinc/lib/md5.c 2012-08-11 10:18:20.445046184 +0200
+@@ -88,7 +88,7 @@
+ * For reference, here is the program that computed the T values.
+ */
+ #if 0
+-#include <math.h>
++#include <cmath>
+ main()
+ {
+ int i;
+Index: boinc/lib/parse.cpp
+===================================================================
+--- boinc.orig/lib/parse.cpp 2012-08-11 10:18:19.753055580 +0200
++++ boinc/lib/parse.cpp 2012-08-11 10:18:20.449046130 +0200
+@@ -31,7 +31,7 @@
+ #include <cstring>
+ #include <cstdlib>
+ #include <string>
+-#include <math.h>
++#include <cmath>
+ #include <ctype.h>
+ #include <errno.h>
+ #if HAVE_IEEEFP_H
+Index: boinc/lib/str_util.cpp
+===================================================================
+--- boinc.orig/lib/str_util.cpp 2012-08-11 10:15:02.379735505 +0200
++++ boinc/lib/str_util.cpp 2012-08-11 10:18:20.453046076 +0200
+@@ -27,7 +27,7 @@
+ #ifndef _WIN32
+ #include "config.h"
+ #include <string>
+-#include <math.h>
++#include <cmath>
+ #include <string.h>
+ #include <stdlib.h>
+ #include <ctype.h>
+Index: boinc/lib/util.cpp
+===================================================================
+--- boinc.orig/lib/util.cpp 2012-08-11 10:18:19.877053896 +0200
++++ boinc/lib/util.cpp 2012-08-11 10:18:20.461045967 +0200
+@@ -44,7 +44,7 @@
+ #include <errno.h>
+ #include <string>
+ #include <cstring>
+-#include <math.h>
++#include <cmath>
+ #if HAVE_IEEEFP_H
+ #include <ieeefp.h>
+ extern "C" {
+Index: boinc/samples/atiopencl/atiopencl.hpp
+===================================================================
+--- boinc.orig/samples/atiopencl/atiopencl.hpp 2012-08-11 10:15:02.383735451 +0200
++++ boinc/samples/atiopencl/atiopencl.hpp 2012-08-11 10:18:20.465045913 +0200
+@@ -28,7 +28,7 @@
+ #endif
+
+ #include <string.h>
+-#include <math.h>
++#include <cmath>
+ #include <time.h>
+ #include <cstdlib>
+ #include <iostream>
+Index: boinc/samples/example_app/uc2_graphics.cpp
+===================================================================
+--- boinc.orig/samples/example_app/uc2_graphics.cpp 2012-08-11 10:15:02.387735397 +0200
++++ boinc/samples/example_app/uc2_graphics.cpp 2012-08-11 10:18:20.469045858 +0200
+@@ -26,7 +26,7 @@
+ #ifdef _WIN32
+ #include "boinc_win.h"
+ #else
+-#include <math.h>
++#include <cmath>
+ #endif
+
+ #include "parse.h"
+Index: boinc/samples/nvcuda/cuda_kernel.cu
+===================================================================
+--- boinc.orig/samples/nvcuda/cuda_kernel.cu 2012-08-11 10:15:02.391735342 +0200
++++ boinc/samples/nvcuda/cuda_kernel.cu 2012-08-11 10:18:20.473045804 +0200
+@@ -25,7 +25,7 @@
+ // identity matrix and the product A * incerse(A). For debugging...
+ //#define VERIFY 1
+ #include <stdio.h>
+-#include <math.h>
++#include <cmath>
+ #include <time.h>
+ #include "cuda_config.h"
+
+Index: boinc/samples/nvopencl/nvopencl.hpp
+===================================================================
+--- boinc.orig/samples/nvopencl/nvopencl.hpp 2012-08-11 10:15:02.391735342 +0200
++++ boinc/samples/nvopencl/nvopencl.hpp 2012-08-11 10:18:20.477045750 +0200
+@@ -24,7 +24,7 @@
+ #include <CL/cl.h>
+ #include <oclUtils.h>
+ #include <string.h>
+-#include <math.h>
++#include <cmath>
+ #include <time.h>
+ #include <cstdlib>
+ #include <iostream>
+Index: boinc/samples/vboxwrapper/vboxwrapper.cpp
+===================================================================
+--- boinc.orig/samples/vboxwrapper/vboxwrapper.cpp 2012-08-11 10:15:02.395735288 +0200
++++ boinc/samples/vboxwrapper/vboxwrapper.cpp 2012-08-11 10:18:20.485045641 +0200
+@@ -56,7 +56,7 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <stdio.h>
+-#include <math.h>
++#include <cmath>
+ #include <string>
+ #include <unistd.h>
+ #endif
+Index: boinc/samples/wrappture/fermi.cpp
+===================================================================
+--- boinc.orig/samples/wrappture/fermi.cpp 2012-08-11 10:15:02.419734962 +0200
++++ boinc/samples/wrappture/fermi.cpp 2012-08-11 10:18:20.517045207 +0200
+@@ -2,7 +2,7 @@
+
+ #include <stdlib.h>
+ #include <stdio.h>
+-#include <math.h>
++#include <cmath>
+ #include <unistd.h>
+
+ int main(int argc, char * argv[]) {
+Index: boinc/samples/wrappture/wrappture_example.cpp
+===================================================================
+--- boinc.orig/samples/wrappture/wrappture_example.cpp 2012-08-11 10:15:02.427734853 +0200
++++ boinc/samples/wrappture/wrappture_example.cpp 2012-08-11 10:18:20.525045098 +0200
+@@ -15,7 +15,7 @@
+
+ #include <stdlib.h>
+ #include <stdio.h>
+-#include <math.h>
++#include <cmath>
+ #ifndef _WIN32
+ #include <unistd.h>
+ #endif
+Index: boinc/sched/credit.cpp
+===================================================================
+--- boinc.orig/sched/credit.cpp 2012-08-11 10:15:02.431734799 +0200
++++ boinc/sched/credit.cpp 2012-08-11 10:18:20.529045044 +0200
+@@ -22,7 +22,7 @@
+ // Note: this is credit.cpp rather than sched_credit.cpp
+ // because you might grant credit e.g. from a trickle handler
+
+-#include <math.h>
++#include <cmath>
+
+ #include "boinc_db.h"
+ #include "error_numbers.h"
+Index: boinc/sched/feeder.cpp
+===================================================================
+--- boinc.orig/sched/feeder.cpp 2012-08-11 10:15:02.431734799 +0200
++++ boinc/sched/feeder.cpp 2012-08-11 10:18:20.537044935 +0200
+@@ -98,7 +98,7 @@
+ #include <ctime>
+ #include <csignal>
+ #include <unistd.h>
+-#include <math.h>
++#include <cmath>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <sys/param.h>
+Index: boinc/vda/vda_lib.cpp
+===================================================================
+--- boinc.orig/vda/vda_lib.cpp 2012-08-11 10:15:02.435734745 +0200
++++ boinc/vda/vda_lib.cpp 2012-08-11 10:18:20.541044881 +0200
+@@ -23,7 +23,7 @@
+ #include <vector>
+ #include <set>
+ #include <algorithm>
+-#include <math.h>
++#include <cmath>
+ #include <limits.h>
+
+ using std::vector;
diff --git a/debian/patches/series b/debian/patches/series
index ca5f8a0..d9a3567 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -63,3 +63,4 @@ dynamic_libboinc.patch
ensure_there_is_no_newline_in_passwd.patch
Missing_libSched.patch
add_hardening_flags.patch
+cmath_missing.patch
diff --git a/debian/rules b/debian/rules
index cb1265d..bb5761c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -124,7 +124,7 @@ CFLAGS_boinc-client := $(CFLAGS)
CXXFLAGS_boinc-client := $(CXXFLAGS)
ENABLE_SERVER_TEST := $(shell egrep '^Package:.*boinc-server-maker' debian/control)
-ENABLE_SERVER :=
+ENABLE_SERVER := --disable-server
ifneq (,$(findstring clang,$(DEB_BUILD_OPTIONS)))
ENABLE_SERVER :=--enable-server
endif
--
BOINC packaging
More information about the pkg-boinc-commits
mailing list