[SCM] BOINC packaging branch, master, updated. debian/7.0.33+dfsg-1-119-g1d74af1
Gianfranco Costamagna
costamagnagianfranco at yahoo.it
Wed Jan 9 16:53:57 UTC 2013
The following commit has been merged in the master branch:
commit 1d74af1e495a22987ea1c1e08c2033d6958bba09
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date: Wed Jan 9 17:53:07 2013 +0100
Preparing for new version 7.0.44
diff --git a/debian/changelog b/debian/changelog
index 9b18858..139c756 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,10 @@
-boinc (7.0.42+dfsg-1) UNRELEASED; urgency=low
+boinc (7.0.44+dfsg-1) UNRELEASED; urgency=low
* New upstream release
- * Revised some patches
+ * General patch refresh
+ * Added libxext-dev in order to address a long time bug (lp: 179849)
- -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it> Wed, 12 Dec 2012 01:53:09 +0100
+ -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it> Wed, 09 Jan 2013 17:40:34 +0100
boinc (7.0.40+dfsg-1) UNRELEASED; urgency=low
diff --git a/debian/control.in b/debian/control.in
index ff11233..ce07e14 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -17,7 +17,7 @@ Build-Depends: debhelper (>= 7.0.50~), po-debconf, pkg-config (>= 0.15),
freeglut3-dev, libwxgtk2.8-dev, libgtk2.0-dev,
libsqlite3-dev, libmysqlclient-dev, python, libfcgi-dev, libjpeg-dev,
libxcb-util0-dev,
- libxss-dev
+ libxss-dev, libxext-dev
Homepage: http://boinc.berkeley.edu/
Vcs-Git: git://git.debian.org/git/pkg-boinc/boinc.git
Vcs-Browser: http://git.debian.org/?p=pkg-boinc/boinc.git
diff --git a/debian/patches/MainDocumentWarnings.patch b/debian/patches/MainDocumentWarnings.patch
index f666548..b9cabb3 100644
--- a/debian/patches/MainDocumentWarnings.patch
+++ b/debian/patches/MainDocumentWarnings.patch
@@ -1,10 +1,8 @@
Author: Steffen Moeller <moeller at debian.org>
Description: Nothing in this patch should be functionally relevant, only compile time warnings as by the ambiguity of the result parameter are resolved.
-Index: boinc/clientgui/MainDocument.cpp
-===================================================================
---- boinc.orig/clientgui/MainDocument.cpp 2012-03-30 23:42:06.944079056 +0200
-+++ boinc/clientgui/MainDocument.cpp 2012-03-30 23:47:44.963448069 +0200
-@@ -1634,20 +1634,20 @@
+--- a/clientgui/MainDocument.cpp
++++ b/clientgui/MainDocument.cpp
+@@ -1640,20 +1640,20 @@
}
#else
void CMainDocument::KillGraphicsApp(int pid) {
@@ -33,7 +31,7 @@ Index: boinc/clientgui/MainDocument.cpp
iRetVal = run_program(
getcwd(currentDir, sizeof(currentDir)),
-@@ -1657,6 +1657,10 @@
+@@ -1663,6 +1663,10 @@
0,
id
);
@@ -44,5 +42,3 @@ Index: boinc/clientgui/MainDocument.cpp
} else {
kill_program(pid);
}
-Index: boinc/lib/util.cpp
-===================================================================
diff --git a/debian/patches/Missing_libSched.patch b/debian/patches/Missing_libSched.patch
index 5972f37..7043c37 100644
--- a/debian/patches/Missing_libSched.patch
+++ b/debian/patches/Missing_libSched.patch
@@ -1,7 +1,5 @@
-Index: boinc/tools/Makefile.am
-===================================================================
---- boinc.orig/tools/Makefile.am 2012-07-08 20:36:42.483643292 +0200
-+++ boinc/tools/Makefile.am 2012-07-08 20:36:51.027526800 +0200
+--- a/tools/Makefile.am
++++ b/tools/Makefile.am
@@ -24,7 +24,7 @@
run_in_ops
@@ -11,10 +9,8 @@ Index: boinc/tools/Makefile.am
cancel_jobs_SOURCES = cancel_jobs.cpp
cancel_jobs_LDADD = $(SERVERLIBS)
-Index: boinc/vda/Makefile.am
-===================================================================
---- boinc.orig/vda/Makefile.am 2012-07-08 20:36:42.483643292 +0200
-+++ boinc/vda/Makefile.am 2012-07-08 20:36:51.035526690 +0200
+--- a/vda/Makefile.am
++++ b/vda/Makefile.am
@@ -3,7 +3,7 @@
bin_PROGRAMS = vda vdad ssim
@@ -24,10 +20,8 @@ Index: boinc/vda/Makefile.am
vda_SOURCES = vda.cpp vda_policy.cpp
vda_LDADD = $(SERVERLIBS)
-Index: boinc/sched/Makefile.am
-===================================================================
---- boinc.orig/sched/Makefile.am 2012-07-08 20:36:42.483643292 +0200
-+++ boinc/sched/Makefile.am 2012-07-08 20:36:51.039526636 +0200
+--- a/sched/Makefile.am
++++ b/sched/Makefile.am
@@ -4,7 +4,7 @@
include $(top_srcdir)/Makefile.incl
@@ -37,10 +31,8 @@ Index: boinc/sched/Makefile.am
if ENABLE_LIBRARIES
-Index: boinc/apps/Makefile.am
-===================================================================
---- boinc.orig/apps/Makefile.am 2012-07-08 20:36:42.483643292 +0200
-+++ boinc/apps/Makefile.am 2012-07-08 20:36:51.043526582 +0200
+--- a/apps/Makefile.am
++++ b/apps/Makefile.am
@@ -8,15 +8,15 @@
upper_case_SOURCES = upper_case.cpp
@@ -60,10 +52,8 @@ Index: boinc/apps/Makefile.am
-1sec_LDFLAGS = -static-libtool-libs $(PTHREAD_CFLAGS)
+1sec_LDFLAGS = -static-libtool-libs $(PTHREAD_CFLAGS) -L../api/.libs -L../lib/.libs
1sec_LDADD = $(APPLIBS)
-Index: boinc/clientgui/Makefile.am
-===================================================================
---- boinc.orig/clientgui/Makefile.am 2012-07-08 20:10:13.000000000 +0200
-+++ boinc/clientgui/Makefile.am 2012-07-08 20:38:08.338472678 +0200
+--- a/clientgui/Makefile.am
++++ b/clientgui/Makefile.am
@@ -3,6 +3,7 @@
include $(top_srcdir)/Makefile.incl
diff --git a/debian/patches/add_hardening_flags.patch b/debian/patches/add_hardening_flags.patch
index 9ec11f0..e3d5e3c 100644
--- a/debian/patches/add_hardening_flags.patch
+++ b/debian/patches/add_hardening_flags.patch
@@ -2,10 +2,8 @@ Author: Guo Yixuan <culu.gyx at gmail.com>
Description: Add standard flags to custom Makefiles
There're several hand-written Makefiles among other Makefiles by automake, they don't take
CXXFLAGS and CPPFLAGS from environment.
-Index: boinc/samples/sleeper/Makefile
-===================================================================
---- boinc.orig/samples/sleeper/Makefile 2012-06-24 21:56:27.000000000 +0800
-+++ boinc/samples/sleeper/Makefile 2012-06-24 22:01:09.745618530 +0800
+--- a/samples/sleeper/Makefile
++++ b/samples/sleeper/Makefile
@@ -4,7 +4,7 @@
BOINC_API_DIR = $(BOINC_DIR)/api
BOINC_LIB_DIR = $(BOINC_DIR)/lib
@@ -21,10 +19,8 @@ Index: boinc/samples/sleeper/Makefile
sleeper: sleeper.o libstdc++.a $(BOINC_LIB_DIR)/libboinc.a $(BOINC_API_DIR)/libboinc_api.a
- g++ $(CXXFLAGS) -o sleeper sleeper.o libstdc++.a -pthread -lboinc_api -lboinc
+ g++ $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) -o sleeper sleeper.o libstdc++.a -pthread -lboinc_api -lboinc
-Index: boinc/samples/example_app/Makefile
-===================================================================
---- boinc.orig/samples/example_app/Makefile 2012-06-24 21:56:27.000000000 +0800
-+++ boinc/samples/example_app/Makefile 2012-06-24 22:00:45.305617579 +0800
+--- a/samples/example_app/Makefile
++++ b/samples/example_app/Makefile
@@ -4,7 +4,7 @@
BOINC_API_DIR = $(BOINC_DIR)/api
BOINC_LIB_DIR = $(BOINC_DIR)/lib
@@ -49,10 +45,8 @@ Index: boinc/samples/example_app/Makefile
$(BOINC_API_DIR)/libboinc_graphics2.a \
$(BOINC_API_DIR)/libboinc_api.a \
$(BOINC_LIB_DIR)/libboinc.a \
-Index: boinc/samples/worker/Makefile
-===================================================================
---- boinc.orig/samples/worker/Makefile 2012-06-24 21:56:27.000000000 +0800
-+++ boinc/samples/worker/Makefile 2012-06-24 22:01:23.257619057 +0800
+--- a/samples/worker/Makefile
++++ b/samples/worker/Makefile
@@ -1,4 +1,4 @@
-CXXFLAGS = -g
+CXXFLAGS += -g
@@ -65,10 +59,8 @@ Index: boinc/samples/worker/Makefile
worker: worker.o
- g++ $(CXXFLAGS) -o worker worker.o
+ g++ $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) -o worker worker.o
-Index: boinc/samples/wrapper/Makefile
-===================================================================
---- boinc.orig/samples/wrapper/Makefile 2012-06-24 21:56:27.000000000 +0800
-+++ boinc/samples/wrapper/Makefile 2012-06-24 22:01:43.641619849 +0800
+--- a/samples/wrapper/Makefile
++++ b/samples/wrapper/Makefile
@@ -5,7 +5,7 @@
BOINC_API_DIR = $(BOINC_DIR)/api
BOINC_LIB_DIR = $(BOINC_DIR)/lib
diff --git a/debian/patches/api_NULL_not_defined.patch b/debian/patches/api_NULL_not_defined.patch
index cd6668b..f35798c 100644
--- a/debian/patches/api_NULL_not_defined.patch
+++ b/debian/patches/api_NULL_not_defined.patch
@@ -1,8 +1,6 @@
Description: Picked from http://boinc.berkeley.edu/svn/trunk/boinc@25877
-Index: boinc/api/boinc_api.h
-===================================================================
---- boinc.orig/api/boinc_api.h 2012-09-16 23:16:46.000000000 +0800
-+++ boinc/api/boinc_api.h 2012-09-16 23:21:04.000000000 +0800
+--- a/api/boinc_api.h
++++ b/api/boinc_api.h
@@ -18,6 +18,8 @@
#ifndef _BOINC_API_
#define _BOINC_API_
diff --git a/debian/patches/better_makefiles.patch b/debian/patches/better_makefiles.patch
index c58dc93..f714108 100644
--- a/debian/patches/better_makefiles.patch
+++ b/debian/patches/better_makefiles.patch
@@ -1,10 +1,8 @@
Author: Guo Yixuan <culu.gyx at gmail.com>
Description: Better clean target for several Makefiles
This would save some rm's in override_dh_auto_clean.
-Index: boinc/samples/sleeper/Makefile
-===================================================================
---- boinc.orig/samples/sleeper/Makefile 2012-09-17 21:46:22.208746208 +0200
-+++ boinc/samples/sleeper/Makefile 2012-09-17 21:46:22.428749121 +0200
+--- a/samples/sleeper/Makefile
++++ b/samples/sleeper/Makefile
@@ -19,11 +19,10 @@
libstdc++.a:
ln -s `g++ -print-file-name=libstdc++.a`
@@ -19,10 +17,8 @@ Index: boinc/samples/sleeper/Makefile
sleeper: sleeper.o libstdc++.a $(BOINC_LIB_DIR)/libboinc.a $(BOINC_API_DIR)/libboinc_api.a
g++ $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) -o sleeper sleeper.o libstdc++.a -pthread -lboinc_api -lboinc
-Index: boinc/samples/worker/Makefile
-===================================================================
---- boinc.orig/samples/worker/Makefile 2012-09-17 21:46:22.212746265 +0200
-+++ boinc/samples/worker/Makefile 2012-09-17 21:46:22.428749121 +0200
+--- a/samples/worker/Makefile
++++ b/samples/worker/Makefile
@@ -4,11 +4,10 @@
all: $(PROGS)
@@ -37,10 +33,8 @@ Index: boinc/samples/worker/Makefile
worker: worker.o
g++ $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) -o worker worker.o
-Index: boinc/samples/wrapper/Makefile
-===================================================================
---- boinc.orig/samples/wrapper/Makefile 2012-09-17 21:46:22.212746265 +0200
-+++ boinc/samples/wrapper/Makefile 2012-09-17 21:46:22.432749185 +0200
+--- a/samples/wrapper/Makefile
++++ b/samples/wrapper/Makefile
@@ -21,11 +21,10 @@
libstdc++.a:
ln -s `g++ -print-file-name=libstdc++.a`
diff --git a/debian/patches/boinclib_shared.patch b/debian/patches/boinclib_shared.patch
index 1de8c82..fcf4f6a 100644
--- a/debian/patches/boinclib_shared.patch
+++ b/debian/patches/boinclib_shared.patch
@@ -28,7 +28,7 @@
parse_test_LDADD = $(LIBBOINC)
--- a/client/Makefile.am
+++ b/client/Makefile.am
-@@ -89,7 +89,7 @@
+@@ -90,7 +90,7 @@
if OS_DARWIN
boinc_client_LDFLAGS += -Wl,-flat_namespace,-undefined,dynamic_lookup
endif
diff --git a/debian/patches/clang_incompatibilities.patch b/debian/patches/clang_incompatibilities.patch
index d31ba26..714b714 100644
--- a/debian/patches/clang_incompatibilities.patch
+++ b/debian/patches/clang_incompatibilities.patch
@@ -1,9 +1,7 @@
Author: Steffen Moeller <steffen.moeller at uk-sh.de>
Description: Tested compatibility with clang.
-Index: boinc/lib/Makefile.am
-===================================================================
---- boinc.orig/lib/Makefile.am 2012-08-01 20:48:02.126264079 +0200
-+++ boinc/lib/Makefile.am 2012-08-01 20:52:55.174302455 +0200
+--- a/lib/Makefile.am
++++ b/lib/Makefile.am
@@ -147,13 +147,13 @@
libboinc_la_CFLAGS = $(AM_CFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS)
libboinc_la_CXXFLAGS = $(AM_CXXFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS)
@@ -20,11 +18,8 @@ Index: boinc/lib/Makefile.am
if ENABLE_FCGI
-
-Index: boinc/sched/make_work.cpp
-===================================================================
---- boinc.orig/sched/make_work.cpp 2012-08-01 20:48:02.126264079 +0200
-+++ boinc/sched/make_work.cpp 2012-08-01 20:52:55.186302294 +0200
+--- a/sched/make_work.cpp
++++ b/sched/make_work.cpp
@@ -176,9 +176,6 @@
char keypath[MAXPATHLEN];
char buf[BLOB_SIZE];
diff --git a/debian/patches/client_app_maxpathlen.patch b/debian/patches/client_app_maxpathlen.patch
index b682da9..b01e76d 100644
--- a/debian/patches/client_app_maxpathlen.patch
+++ b/debian/patches/client_app_maxpathlen.patch
@@ -1,7 +1,5 @@
-Index: boinc/client/app.h
-===================================================================
---- boinc.orig/client/app.h
-+++ boinc/client/app.h
+--- a/client/app.h
++++ b/client/app.h
@@ -47,7 +47,7 @@
typedef int PROCESS_ID;
@@ -11,10 +9,8 @@ Index: boinc/client/app.h
// The stderr output of an application is truncated to this length
// before sending to server,
// to protect against apps that write unbounded amounts.
-Index: boinc/client/file_names.cpp
-===================================================================
---- boinc.orig/client/file_names.cpp
-+++ boinc/client/file_names.cpp
+--- a/client/file_names.cpp
++++ b/client/file_names.cpp
@@ -66,7 +66,7 @@
}
diff --git a/debian/patches/cmath_missing.patch b/debian/patches/cmath_missing.patch
index bfbcf51..105d0f6 100644
--- a/debian/patches/cmath_missing.patch
+++ b/debian/patches/cmath_missing.patch
@@ -1,7 +1,5 @@
-Index: boinc/api/gutil.cpp
-===================================================================
---- boinc.orig/api/gutil.cpp 2012-08-18 14:30:37.274778529 +0200
-+++ boinc/api/gutil.cpp 2012-08-18 14:42:31.653112311 +0200
+--- a/api/gutil.cpp
++++ b/api/gutil.cpp
@@ -24,7 +24,7 @@
#include <stdio.h>
#include <stdlib.h>
@@ -11,10 +9,8 @@ Index: boinc/api/gutil.cpp
#include <setjmp.h>
#ifdef _WIN32
-Index: boinc/api/gutil_text.cpp
-===================================================================
---- boinc.orig/api/gutil_text.cpp 2012-08-17 16:08:20.402579016 +0200
-+++ boinc/api/gutil_text.cpp 2012-08-18 14:42:31.657112257 +0200
+--- a/api/gutil_text.cpp
++++ b/api/gutil_text.cpp
@@ -26,7 +26,7 @@
#include <stdio.h>
#include <stdlib.h>
@@ -24,10 +20,8 @@ Index: boinc/api/gutil_text.cpp
#include <setjmp.h>
#ifdef _WIN32
-Index: boinc/client/client_state.cpp
-===================================================================
---- boinc.orig/client/client_state.cpp 2012-08-18 14:42:31.265117561 +0200
-+++ boinc/client/client_state.cpp 2012-08-18 14:42:31.661112203 +0200
+--- a/client/client_state.cpp
++++ b/client/client_state.cpp
@@ -26,7 +26,7 @@
#include <ctime>
#include <cstdarg>
@@ -37,10 +31,8 @@ Index: boinc/client/client_state.cpp
#if HAVE_SYS_SOCKET_H
#include <sys/socket.h>
#endif
-Index: boinc/client/sim_util.cpp
-===================================================================
---- boinc.orig/client/sim_util.cpp 2012-08-17 16:08:20.402579016 +0200
-+++ boinc/client/sim_util.cpp 2012-08-18 14:42:31.665112149 +0200
+--- a/client/sim_util.cpp
++++ b/client/sim_util.cpp
@@ -35,7 +35,7 @@
#define finite _finite
#endif
@@ -50,10 +42,8 @@ Index: boinc/client/sim_util.cpp
#include "error_numbers.h"
#include "str_util.h"
-Index: boinc/client/whetstone.cpp
-===================================================================
---- boinc.orig/client/whetstone.cpp 2012-08-17 16:08:20.402579016 +0200
-+++ boinc/client/whetstone.cpp 2012-08-18 14:42:31.669112094 +0200
+--- a/client/whetstone.cpp
++++ b/client/whetstone.cpp
@@ -29,7 +29,7 @@
#include <stdlib.h>
#include <stdio.h>
@@ -63,10 +53,8 @@ Index: boinc/client/whetstone.cpp
#include <time.h>
#endif
-Index: boinc/clientscr/ss_app.cpp
-===================================================================
---- boinc.orig/clientscr/ss_app.cpp 2012-08-18 14:30:37.430776418 +0200
-+++ boinc/clientscr/ss_app.cpp 2012-08-18 14:42:31.741111121 +0200
+--- a/clientscr/ss_app.cpp
++++ b/clientscr/ss_app.cpp
@@ -22,7 +22,7 @@
#ifdef _WIN32
#include "boinc_win.h"
@@ -76,10 +64,8 @@ Index: boinc/clientscr/ss_app.cpp
#endif
#include <string>
#include <vector>
-Index: boinc/db/boinc_db.cpp
-===================================================================
---- boinc.orig/db/boinc_db.cpp 2012-08-17 16:08:20.406578962 +0200
-+++ boinc/db/boinc_db.cpp 2012-08-18 14:42:31.761110850 +0200
+--- a/db/boinc_db.cpp
++++ b/db/boinc_db.cpp
@@ -22,7 +22,7 @@
#include <ctime>
#include <unistd.h>
@@ -89,10 +75,8 @@ Index: boinc/db/boinc_db.cpp
// 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-17 16:08:20.406578962 +0200
-+++ boinc/lib/boinc_win.h 2012-08-18 14:42:31.809110201 +0200
+--- a/lib/boinc_win.h
++++ b/lib/boinc_win.h
@@ -197,7 +197,7 @@
#include <assert.h>
#include <ctype.h>
@@ -102,10 +86,8 @@ Index: boinc/lib/boinc_win.h
#include <setjmp.h>
#include <signal.h>
#include <stdarg.h>
-Index: boinc/lib/md5.c
-===================================================================
---- boinc.orig/lib/md5.c 2012-08-17 16:08:20.406578962 +0200
-+++ boinc/lib/md5.c 2012-08-18 14:42:31.841109767 +0200
+--- a/lib/md5.c
++++ b/lib/md5.c
@@ -88,7 +88,7 @@
* For reference, here is the program that computed the T values.
*/
@@ -115,10 +97,8 @@ Index: boinc/lib/md5.c
main()
{
int i;
-Index: boinc/lib/parse.cpp
-===================================================================
---- boinc.orig/lib/parse.cpp 2012-08-18 14:42:31.041120592 +0200
-+++ boinc/lib/parse.cpp 2012-08-18 14:42:31.877109279 +0200
+--- a/lib/parse.cpp
++++ b/lib/parse.cpp
@@ -31,7 +31,7 @@
#include <cstring>
#include <cstdlib>
@@ -128,10 +108,8 @@ Index: boinc/lib/parse.cpp
#include <ctype.h>
#include <errno.h>
#if HAVE_IEEEFP_H
-Index: boinc/lib/str_util.cpp
-===================================================================
---- boinc.orig/lib/str_util.cpp 2012-08-17 16:08:20.406578962 +0200
-+++ boinc/lib/str_util.cpp 2012-08-18 14:42:31.913108793 +0200
+--- a/lib/str_util.cpp
++++ b/lib/str_util.cpp
@@ -27,7 +27,7 @@
#ifndef _WIN32
#include "config.h"
@@ -141,10 +119,8 @@ Index: boinc/lib/str_util.cpp
#include <string.h>
#include <stdlib.h>
#include <ctype.h>
-Index: boinc/lib/util.cpp
-===================================================================
---- boinc.orig/lib/util.cpp 2012-08-18 14:42:31.313116911 +0200
-+++ boinc/lib/util.cpp 2012-08-18 14:42:31.945108359 +0200
+--- a/lib/util.cpp
++++ b/lib/util.cpp
@@ -44,7 +44,7 @@
#include <errno.h>
#include <string>
@@ -154,10 +130,8 @@ Index: boinc/lib/util.cpp
#if HAVE_IEEEFP_H
#include <ieeefp.h>
extern "C" {
-Index: boinc/samples/atiopencl/atiopencl.hpp
-===================================================================
---- boinc.orig/samples/atiopencl/atiopencl.hpp 2012-08-17 16:08:20.406578962 +0200
-+++ boinc/samples/atiopencl/atiopencl.hpp 2012-08-18 14:42:31.965108089 +0200
+--- a/samples/atiopencl/atiopencl.hpp
++++ b/samples/atiopencl/atiopencl.hpp
@@ -28,7 +28,7 @@
#endif
@@ -167,23 +141,19 @@ Index: boinc/samples/atiopencl/atiopencl.hpp
#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-18 14:30:37.462775986 +0200
-+++ boinc/samples/example_app/uc2_graphics.cpp 2012-08-18 14:42:31.973107981 +0200
+--- a/samples/example_app/uc2_graphics.cpp
++++ b/samples/example_app/uc2_graphics.cpp
@@ -33,7 +33,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-17 16:08:20.406578962 +0200
-+++ boinc/samples/nvcuda/cuda_kernel.cu 2012-08-18 14:42:31.977107927 +0200
+ #ifdef _WIN32
+ #include "boinc_win.h"
+ #else
+-#include <math.h>
++#include <cmath>
+ #endif
+
+ #include "parse.h"
+--- a/samples/nvcuda/cuda_kernel.cu
++++ b/samples/nvcuda/cuda_kernel.cu
@@ -25,7 +25,7 @@
// identity matrix and the product A * incerse(A). For debugging...
//#define VERIFY 1
@@ -193,10 +163,8 @@ Index: boinc/samples/nvcuda/cuda_kernel.cu
#include <time.h>
#include "cuda_config.h"
-Index: boinc/samples/nvopencl/nvopencl.hpp
-===================================================================
---- boinc.orig/samples/nvopencl/nvopencl.hpp 2012-08-17 16:08:20.406578962 +0200
-+++ boinc/samples/nvopencl/nvopencl.hpp 2012-08-18 14:42:31.981107873 +0200
+--- a/samples/nvopencl/nvopencl.hpp
++++ b/samples/nvopencl/nvopencl.hpp
@@ -24,7 +24,7 @@
#include <CL/cl.h>
#include <oclUtils.h>
@@ -206,23 +174,19 @@ Index: boinc/samples/nvopencl/nvopencl.hpp
#include <time.h>
#include <cstdlib>
#include <iostream>
-Index: boinc/samples/vboxwrapper/vboxwrapper.cpp
-===================================================================
---- boinc.orig/samples/vboxwrapper/vboxwrapper.cpp 2012-08-17 16:08:20.406578962 +0200
-+++ boinc/samples/vboxwrapper/vboxwrapper.cpp 2012-08-18 14:42:31.985107818 +0200
+--- a/samples/vboxwrapper/vboxwrapper.cpp
++++ b/samples/vboxwrapper/vboxwrapper.cpp
@@ -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-17 16:08:20.406578962 +0200
-+++ boinc/samples/wrappture/fermi.cpp 2012-08-18 14:42:32.021107331 +0200
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <stdio.h>
+-#include <math.h>
++#include <cmath>
+ #include <string>
+ #include <unistd.h>
+ #endif
+--- a/samples/wrappture/fermi.cpp
++++ b/samples/wrappture/fermi.cpp
@@ -2,7 +2,7 @@
#include <stdlib.h>
@@ -232,10 +196,8 @@ Index: boinc/samples/wrappture/fermi.cpp
#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-17 16:08:20.406578962 +0200
-+++ boinc/samples/wrappture/wrappture_example.cpp 2012-08-18 14:42:32.029107223 +0200
+--- a/samples/wrappture/wrappture_example.cpp
++++ b/samples/wrappture/wrappture_example.cpp
@@ -15,7 +15,7 @@
#include <stdlib.h>
@@ -245,36 +207,8 @@ Index: boinc/samples/wrappture/wrappture_example.cpp
#ifndef _WIN32
#include <unistd.h>
#endif
-Index: boinc/sched/credit.cpp
-===================================================================
---- boinc.orig/sched/credit.cpp 2012-08-17 16:08:20.406578962 +0200
-+++ boinc/sched/credit.cpp 2012-08-18 14:42:32.033107169 +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-17 16:08:20.406578962 +0200
-+++ boinc/sched/feeder.cpp 2012-08-18 14:42:32.037107115 +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-17 16:08:20.406578962 +0200
-+++ boinc/vda/vda_lib.cpp 2012-08-18 14:42:32.041107061 +0200
+--- a/vda/vda_lib.cpp
++++ b/vda/vda_lib.cpp
@@ -23,7 +23,7 @@
#include <vector>
#include <set>
diff --git a/debian/patches/cppcheck_avoid_redundant_check.patch b/debian/patches/cppcheck_avoid_redundant_check.patch
index 66dfbe8..4b281e4 100644
--- a/debian/patches/cppcheck_avoid_redundant_check.patch
+++ b/debian/patches/cppcheck_avoid_redundant_check.patch
@@ -1,7 +1,5 @@
-Index: boinc/api/make_app_icon_h.cpp
-===================================================================
---- boinc.orig/api/make_app_icon_h.cpp
-+++ boinc/api/make_app_icon_h.cpp
+--- a/api/make_app_icon_h.cpp
++++ b/api/make_app_icon_h.cpp
@@ -39,7 +39,7 @@
}
diff --git a/debian/patches/cppcheck_realloc.patch b/debian/patches/cppcheck_realloc.patch
index 300f2b1..ef71752 100644
--- a/debian/patches/cppcheck_realloc.patch
+++ b/debian/patches/cppcheck_realloc.patch
@@ -1,10 +1,8 @@
Author: Steffen Moeller <moeller at debian.org>
Description: Initialisation.
-Index: boinc/lib/crypt.cpp
-===================================================================
---- boinc.orig/lib/crypt.cpp 2012-05-03 13:28:56.000000000 +0200
-+++ boinc/lib/crypt.cpp 2012-05-03 13:42:06.416854048 +0200
+--- a/lib/crypt.cpp
++++ b/lib/crypt.cpp
@@ -339,6 +339,7 @@
char clear_buf[MD5_LEN];
int n, retval;
diff --git a/debian/patches/csh2tcsh.patch b/debian/patches/csh2tcsh.patch
index c2854d5..7c05cd3 100644
--- a/debian/patches/csh2tcsh.patch
+++ b/debian/patches/csh2tcsh.patch
@@ -1,18 +1,14 @@
Description: The use of the C Shell is deprecated.
-Index: boinc/tools/db_query
-===================================================================
---- boinc.orig/tools/db_query 2011-04-27 22:39:13.000000000 +0200
-+++ boinc/tools/db_query 2011-04-27 22:45:42.000000000 +0200
+--- a/tools/db_query
++++ b/tools/db_query
@@ -1,4 +1,4 @@
-#! /bin/tcsh
+#!/usr/bin/tcsh
set CIVDATE = `date "+%Y:%m:%d:%H:%M"`
set UNIXDATE = `perl -e 'print time()'`
-Index: boinc/tools/watch_tcp
-===================================================================
---- boinc.orig/tools/watch_tcp 2011-04-27 22:39:13.000000000 +0200
-+++ boinc/tools/watch_tcp 2011-04-27 22:45:42.000000000 +0200
+--- a/tools/watch_tcp
++++ b/tools/watch_tcp
@@ -1,4 +1,4 @@
-#! /bin/csh
+#!/usr/bin/tcsh
diff --git a/debian/patches/dTotalGlobalMem.patch b/debian/patches/dTotalGlobalMem.patch
index 483a2bf..b6a7091 100644
--- a/debian/patches/dTotalGlobalMem.patch
+++ b/debian/patches/dTotalGlobalMem.patch
@@ -1,36 +1,5 @@
-Index: boinc/sched/plan_class_spec.cpp
-===================================================================
---- boinc.orig/sched/plan_class_spec.cpp 2012-08-17 16:08:27.014489919 +0200
-+++ boinc/sched/plan_class_spec.cpp 2012-08-18 14:42:31.369116154 +0200
-@@ -210,11 +210,11 @@
- }
-
- // GPU RAM
-- if (min_gpu_ram_mb && min_gpu_ram_mb * MEGA > cp.prop.dtotalGlobalMem) {
-+ if (min_gpu_ram_mb && min_gpu_ram_mb * MEGA > cp.prop.totalGlobalMem) {
- if (config.debug_version_select) {
- log_messages.printf(MSG_NORMAL,
- "[version] GPU RAM required min: %f, supplied: %f\n",
-- min_gpu_ram_mb * MEGA, cp.prop.dtotalGlobalMem
-+ min_gpu_ram_mb * MEGA, cp.prop.totalGlobalMem
- );
- }
- return false;
-@@ -291,8 +291,8 @@
- // i.e. fill the device memory with tasks
- if (ngpus < 0) {
- hu.ncudas =
-- (floor(cp.prop.dtotalGlobalMem / hu.gpu_ram) * hu.gpu_ram) /
-- cp.prop.dtotalGlobalMem
-+ (floor(cp.prop.totalGlobalMem / hu.gpu_ram) * hu.gpu_ram) /
-+ cp.prop.totalGlobalMem
- ;
- } else if (ngpus > 0) {
- hu.ncudas = ngpus * gpu_utilization;
-Index: boinc/sched/sched_send.cpp
-===================================================================
---- boinc.orig/sched/sched_send.cpp 2012-08-17 16:08:27.014489919 +0200
-+++ boinc/sched/sched_send.cpp 2012-08-18 14:42:31.373116100 +0200
+--- a/sched/sched_send.cpp
++++ b/sched/sched_send.cpp
@@ -1432,7 +1432,7 @@
if (g_request->coprocs.nvidia.count && ssp->have_cuda_apps) {
diff --git a/debian/patches/debian_debian_AdjustBoincTopdirPython.patch b/debian/patches/debian_debian_AdjustBoincTopdirPython.patch
index 6661862..eb66fa5 100644
--- a/debian/patches/debian_debian_AdjustBoincTopdirPython.patch
+++ b/debian/patches/debian_debian_AdjustBoincTopdirPython.patch
@@ -1,9 +1,7 @@
Author: Steffen Moeller <moeller at debian.org>
Description: Adjusted path for BOINC to server for python code
-Index: boinc/py/boinc_path_config.py.in
-===================================================================
---- boinc.orig/py/boinc_path_config.py.in 2011-07-25 15:03:16.000000000 +0200
-+++ boinc/py/boinc_path_config.py.in 2011-07-25 15:03:50.000000000 +0200
+--- a/py/boinc_path_config.py.in
++++ b/py/boinc_path_config.py.in
@@ -8,5 +8,5 @@
import sys, os
diff --git a/debian/patches/dynamic_libboinc.patch b/debian/patches/dynamic_libboinc.patch
index c95a97e..d6497c7 100644
--- a/debian/patches/dynamic_libboinc.patch
+++ b/debian/patches/dynamic_libboinc.patch
@@ -1,7 +1,5 @@
-Index: boinc/Makefile.incl
-===================================================================
---- boinc.orig/Makefile.incl 2012-03-31 13:44:20.891195251 +0200
-+++ boinc/Makefile.incl 2012-05-29 16:08:30.239454422 +0200
+--- a/Makefile.incl
++++ b/Makefile.incl
@@ -37,22 +37,22 @@
# dependencies to make sure libs gets compiled before
# programs linking to them:
diff --git a/debian/patches/generate_less.patch b/debian/patches/generate_less.patch
index 12ed8d6..bba2350 100644
--- a/debian/patches/generate_less.patch
+++ b/debian/patches/generate_less.patch
@@ -1,9 +1,7 @@
Author: unknown
-Index: boinc/generate_svn_version.sh
-===================================================================
---- boinc.orig/generate_svn_version.sh 2011-07-24 19:39:09.000000000 +0200
-+++ boinc/generate_svn_version.sh 2011-07-24 22:50:22.000000000 +0200
+--- a/generate_svn_version.sh
++++ b/generate_svn_version.sh
@@ -7,7 +7,9 @@
echo "#define SVN_VERSION_H" >> $TMPFILE
echo "" >> $TMPFILE
diff --git a/debian/patches/libnotify-0.7.patch b/debian/patches/libnotify-0.7.patch
index 2143f5d..e0d3d77 100644
--- a/debian/patches/libnotify-0.7.patch
+++ b/debian/patches/libnotify-0.7.patch
@@ -23,7 +23,7 @@ Disclaimer: For backports, this patch needs to be disabled.
grep '#define.*BOINC.*VERSION' $^ > $@
--- a/configure.ac
+++ b/configure.ac
-@@ -725,14 +725,12 @@
+@@ -729,14 +729,12 @@
dnl ---------- libNotify --------------------------------------------------
if test "${enable_manager}" = yes ; then
@@ -43,7 +43,7 @@ Disclaimer: For backports, this patch needs to be disabled.
fi
dnl ---------- Sqlite3 ----------------------------------------------------
-@@ -876,7 +874,7 @@
+@@ -883,7 +881,7 @@
],
[enable_wx_debug="no"])
diff --git a/debian/patches/missing_gpu_intel.cpp_in_Makefile.am.patch b/debian/patches/missing_gpu_intel.cpp_in_Makefile.am.patch
deleted file mode 100644
index c7a928d..0000000
--- a/debian/patches/missing_gpu_intel.cpp_in_Makefile.am.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/client/Makefile.am
-+++ b/client/Makefile.am
-@@ -62,6 +62,7 @@
- file_xfer.cpp \
- gpu_amd.cpp \
- gpu_detect.cpp \
-+ gpu_intel.cpp \
- gpu_nvidia.cpp \
- gpu_opencl.cpp \
- gui_http.cpp \
diff --git a/debian/patches/nvidia_mem_display_simplification.patch b/debian/patches/nvidia_mem_display_simplification.patch
index 4a62d7d..9c34da6 100644
--- a/debian/patches/nvidia_mem_display_simplification.patch
+++ b/debian/patches/nvidia_mem_display_simplification.patch
@@ -1,6 +1,6 @@
--- a/lib/coproc.cpp
+++ b/lib/coproc.cpp
-@@ -497,7 +497,7 @@
+@@ -499,7 +499,7 @@
cuda_version = 0;
display_driver_version = 0;
strcpy(prop.name, "");
@@ -9,7 +9,7 @@
prop.sharedMemPerBlock = 0;
prop.regsPerBlock = 0;
prop.warpSize = 0;
-@@ -527,7 +527,7 @@
+@@ -529,7 +529,7 @@
while (!xp.get_tag()) {
if (xp.match_tag("/coproc_cuda")) {
if (!peak_flops) {
diff --git a/debian/patches/parse_issues.patch b/debian/patches/parse_issues.patch
index 931b342..187ed97 100644
--- a/debian/patches/parse_issues.patch
+++ b/debian/patches/parse_issues.patch
@@ -1,10 +1,8 @@
Author: Steffen Moeller <moeller at debian.org>
Description: Improved memory handling.
-Index: boinc/lib/parse.cpp
-===================================================================
---- boinc.orig/lib/parse.cpp 2012-03-27 16:38:37.000000000 +0200
-+++ boinc/lib/parse.cpp 2012-03-27 16:41:59.678459719 +0200
+--- a/lib/parse.cpp
++++ b/lib/parse.cpp
@@ -179,7 +179,12 @@
int n = (int)strlen(line);
if (nused + n >= bufsize) {
@@ -19,11 +17,9 @@ Index: boinc/lib/parse.cpp
}
strcpy(buf+nused, line);
nused += n;
-Index: boinc/lib/procinfo_win.cpp
-===================================================================
---- boinc.orig/lib/procinfo_win.cpp 2012-03-27 16:38:02.000000000 +0200
-+++ boinc/lib/procinfo_win.cpp 2012-03-27 16:41:59.682459664 +0200
-@@ -24,13 +24,16 @@
+--- a/lib/procinfo_win.cpp
++++ b/lib/procinfo_win.cpp
+@@ -24,6 +24,9 @@
tNTQSI pNTQSI = (tNTQSI)GetProcAddress(hNTDllLib, "NtQuerySystemInformation");
ULONG cbBuffer = 0;
@@ -33,13 +29,6 @@ Index: boinc/lib/procinfo_win.cpp
while (1) {
// Store the buffer size since it appears that somebody is monkeying around
// with the return values on some systems.
- cbBuffer = *pcbBuffer;
-
- *ppBuffer = HeapAlloc(hHeap, HEAP_ZERO_MEMORY, *pcbBuffer);
- if (*ppBuffer == NULL) {
- return ERR_MALLOC;
- }
-
@@ -54,9 +57,9 @@
} else if (!NT_SUCCESS(Status)) {
HeapFree(hHeap, NULL, *ppBuffer);
diff --git a/debian/patches/possible_size_type_error.patch b/debian/patches/possible_size_type_error.patch
index 47bc5ed..d3e075d 100644
--- a/debian/patches/possible_size_type_error.patch
+++ b/debian/patches/possible_size_type_error.patch
@@ -1,10 +1,8 @@
Author: Steffen Moeller <moeller at debian.org>
Description: int may not be enough (theoretically) for large files.
-Index: boinc/sched/file_upload_handler.cpp
-===================================================================
---- boinc.orig/sched/file_upload_handler.cpp 2011-10-30 00:29:08.000000000 +0200
-+++ boinc/sched/file_upload_handler.cpp 2011-10-30 00:29:10.000000000 +0200
+--- a/sched/file_upload_handler.cpp
++++ b/sched/file_upload_handler.cpp
@@ -173,17 +173,17 @@
while (bytes_left > 0) {
diff --git a/debian/patches/sched_driver_char_buffers.patch b/debian/patches/sched_driver_char_buffers.patch
index 5fd74b5..ef566e6 100644
--- a/debian/patches/sched_driver_char_buffers.patch
+++ b/debian/patches/sched_driver_char_buffers.patch
@@ -1,9 +1,7 @@
Author: Steffen Moeller
Description: Allowing descriptions of hosts, vendor or model that are larger than a SMS.
-Index: boinc/sched/sched_driver.cpp
-===================================================================
---- boinc.orig/sched/sched_driver.cpp 2012-03-30 19:46:56.436149392 +0200
-+++ boinc/sched/sched_driver.cpp 2012-03-30 19:46:57.428135859 +0200
+--- a/sched/sched_driver.cpp
++++ b/sched/sched_driver.cpp
@@ -50,9 +50,9 @@
using std::vector;
diff --git a/debian/patches/sched_driver_f_free.patch b/debian/patches/sched_driver_f_free.patch
index 9056cdd..1e5eda7 100644
--- a/debian/patches/sched_driver_f_free.patch
+++ b/debian/patches/sched_driver_f_free.patch
@@ -1,9 +1,7 @@
Author: Steffen Moeller <moeller at debian.org>
Description: Increased buffers and eliminated memory sink.
-Index: boinc/sched/sched_driver.cpp
-===================================================================
---- boinc.orig/sched/sched_driver.cpp 2012-03-30 18:44:06.691639668 +0200
-+++ boinc/sched/sched_driver.cpp 2012-03-30 19:42:10.688047314 +0200
+--- a/sched/sched_driver.cpp
++++ b/sched/sched_driver.cpp
@@ -44,6 +44,8 @@
#include <vector>
#include "util.h"
diff --git a/debian/patches/series b/debian/patches/series
index 9355ce4..dc2ae07 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -63,4 +63,3 @@ boinclib_shared.patch
dynamic_libboinc.patch
Missing_libSched.patch
missing_libs_wrapper.patch
-missing_gpu_intel.cpp_in_Makefile.am.patch
diff --git a/debian/patches/slot_dir_source_trace.patch b/debian/patches/slot_dir_source_trace.patch
index b95b3d1..9120e60 100644
--- a/debian/patches/slot_dir_source_trace.patch
+++ b/debian/patches/slot_dir_source_trace.patch
@@ -1,6 +1,6 @@
--- a/client/app.cpp
+++ b/client/app.cpp
-@@ -420,8 +420,8 @@
+@@ -421,8 +421,8 @@
int retval;
get_project_dir(result->project, project_dir, sizeof(project_dir));
@@ -11,7 +11,7 @@
"%s/trickle_up_%s_%d.xml",
project_dir, result->name, (int)time(0)
);
-@@ -456,7 +456,7 @@
+@@ -457,7 +457,7 @@
return 0;
}
@@ -20,7 +20,7 @@
unsigned int i;
for (i=0; i<active_tasks.size(); i++) {
if (active_tasks[i]->slot == slot) {
-@@ -466,7 +466,7 @@
+@@ -467,7 +467,7 @@
return false;
}
@@ -29,7 +29,7 @@
char path[MAXPATHLEN];
unsigned int i;
for (i=0; i<active_tasks.size(); i++) {
-@@ -507,7 +507,7 @@
+@@ -508,7 +508,7 @@
#endif
}
@@ -38,7 +38,7 @@
unsigned int i;
for (i=0; i<active_tasks.size(); i++) {
if (active_tasks[i]->slot == slot) return true;
-@@ -619,7 +619,7 @@
+@@ -620,7 +620,7 @@
#endif
int ACTIVE_TASK::parse(XML_PARSER& xp) {
@@ -47,7 +47,7 @@
int n, dummy;
unsigned int i;
PROJECT* project=0;
-@@ -894,7 +894,7 @@
+@@ -895,7 +895,7 @@
DirScanner dirscan(slot_dir);
while (dirscan.scan(filename)) {
diff --git a/debian/patches/stripchart_debian.patch b/debian/patches/stripchart_debian.patch
index 531607f..bd6a025 100644
--- a/debian/patches/stripchart_debian.patch
+++ b/debian/patches/stripchart_debian.patch
@@ -1,10 +1,8 @@
Author: Steffen Moeller <moeller at debian.org>
Description: Adjusting paths.
Disclaimer: This is mostly dead code in upstream.
-Index: boinc/stripchart/stripchart.cnf
-===================================================================
---- boinc.orig/stripchart/stripchart.cnf 2011-07-24 22:21:26.000000000 +0200
-+++ boinc/stripchart/stripchart.cnf 2011-07-24 22:33:51.000000000 +0200
+--- a/stripchart/stripchart.cnf
++++ b/stripchart/stripchart.cnf
@@ -8,7 +8,7 @@
# Directory where gnuplot is
# $gnuplot = "/usr/local/gnuplot-3.7";
@@ -38,10 +36,8 @@ Index: boinc/stripchart/stripchart.cnf
# What time is it right now?
$rightnow = time;
-Index: boinc/stripchart/stripchart
-===================================================================
---- boinc.orig/stripchart/stripchart 2011-07-24 22:21:41.000000000 +0200
-+++ boinc/stripchart/stripchart 2011-07-24 22:23:31.000000000 +0200
+--- a/stripchart/stripchart
++++ b/stripchart/stripchart
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl
+#!/usr/bin/perl
@@ -57,10 +53,8 @@ Index: boinc/stripchart/stripchart
# Read it in:
open (CNFFILE,$cnfpath) or die "cannot open configuration file: $cnfpath\nmake sure this variable is set properly";
-Index: boinc/stripchart/stripchart.cgi
-===================================================================
---- boinc.orig/stripchart/stripchart.cgi 2011-07-24 22:26:25.000000000 +0200
-+++ boinc/stripchart/stripchart.cgi 2011-07-24 22:27:14.000000000 +0200
+--- a/stripchart/stripchart.cgi
++++ b/stripchart/stripchart.cgi
@@ -1,4 +1,4 @@
-#! /usr/bin/env perl
+#!/usr/bin/perl
diff --git a/debian/patches/stripchart_security.patch b/debian/patches/stripchart_security.patch
index ef8593d..d7cf568 100644
--- a/debian/patches/stripchart_security.patch
+++ b/debian/patches/stripchart_security.patch
@@ -52,10 +52,8 @@ Disclaimer: This is mostly dead code of upstream.
#+UNIXDATE=`perl -e 'print time()'`
#
# echo $CIVDATE $UNIXDATE $SIZE
-Index: boinc/stripchart/stripchart.cnf
-===================================================================
---- boinc.orig/stripchart/stripchart.cnf 2012-01-15 02:02:04.000000000 +0100
-+++ boinc/stripchart/stripchart.cnf 2012-01-15 02:02:05.000000000 +0100
+--- a/stripchart/stripchart.cnf
++++ b/stripchart/stripchart.cnf
@@ -1,4 +1,5 @@
-#! /usr/bin/env perl
+
diff --git a/debian/patches/termios_is_everywhere.patch b/debian/patches/termios_is_everywhere.patch
index 3289da0..aac56f0 100644
--- a/debian/patches/termios_is_everywhere.patch
+++ b/debian/patches/termios_is_everywhere.patch
@@ -1,10 +1,8 @@
Author: Steffen Moeller <moeller at debian.org>
Description: Helping compilation on freebsd machines.
-Index: boinc/zip/unzip/ttyio.c
-===================================================================
---- boinc.orig/zip/unzip/ttyio.c 2012-02-04 18:57:37.000000000 +0100
-+++ boinc/zip/unzip/ttyio.c 2012-02-05 00:17:10.000000000 +0100
-@@ -54,6 +55,7 @@
+--- a/zip/unzip/ttyio.c
++++ b/zip/unzip/ttyio.c
+@@ -54,6 +54,7 @@
# define HAVE_TERMIOS_H
#endif
diff --git a/debian/patches/ticket_1168_verifycerts.patch b/debian/patches/ticket_1168_verifycerts.patch
index 80c392c..784ba7d 100644
--- a/debian/patches/ticket_1168_verifycerts.patch
+++ b/debian/patches/ticket_1168_verifycerts.patch
@@ -1,5 +1,5 @@
---- boinc.orig/client/cs_files.cpp 2012-09-15 12:23:56.549116980 +0200
-+++ boinc/client/cs_files.cpp 2012-09-15 14:59:54.911398600 +0200
+--- a/client/cs_files.cpp
++++ b/client/cs_files.cpp
@@ -177,7 +177,9 @@
//
if (download_gzipped && !boinc_file_exists(pathname)) {
diff --git a/debian/patches/unlink_undefined.patch b/debian/patches/unlink_undefined.patch
index 2473f59..a1ddb3c 100644
--- a/debian/patches/unlink_undefined.patch
+++ b/debian/patches/unlink_undefined.patch
@@ -1,7 +1,5 @@
-Index: boinc/tools/process_input_template.cpp
-===================================================================
---- boinc.orig/tools/process_input_template.cpp 2012-06-30 21:30:06.832322542 +0200
-+++ boinc/tools/process_input_template.cpp 2012-06-30 22:00:54.927436303 +0200
+--- a/tools/process_input_template.cpp
++++ b/tools/process_input_template.cpp
@@ -17,6 +17,7 @@
#include <stdio.h>
@@ -10,10 +8,8 @@ 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-06-30 21:30:06.792323083 +0200
-+++ boinc/sched/single_job_assimilator.cpp 2012-06-30 22:00:54.931436249 +0200
+--- a/sched/single_job_assimilator.cpp
++++ b/sched/single_job_assimilator.cpp
@@ -24,6 +24,7 @@
#include <string>
#include <cstdlib>
@@ -22,10 +18,8 @@ Index: boinc/sched/single_job_assimilator.cpp
#include "boinc_db.h"
#include "error_numbers.h"
-Index: boinc/tools/create_work.cpp
-===================================================================
---- boinc.orig/tools/create_work.cpp 2012-06-30 21:30:06.820322705 +0200
-+++ boinc/tools/create_work.cpp 2012-06-30 22:00:54.935436195 +0200
+--- a/tools/create_work.cpp
++++ b/tools/create_work.cpp
@@ -27,6 +27,7 @@
#include <cstring>
#include <ctime>
@@ -34,10 +28,8 @@ Index: boinc/tools/create_work.cpp
#include "backend_lib.h"
#include "boinc_db.h"
-Index: boinc/vda/vda.cpp
-===================================================================
---- boinc.orig/vda/vda.cpp 2012-06-30 14:43:21.007806400 +0200
-+++ boinc/vda/vda.cpp 2012-06-30 22:00:54.939436141 +0200
+--- a/vda/vda.cpp
++++ b/vda/vda.cpp
@@ -21,6 +21,7 @@
// vda add path add a file
@@ -46,10 +38,8 @@ Index: boinc/vda/vda.cpp
#include "boinc_db.h"
#include "filesys.h"
-Index: boinc/vda/vdad.cpp
-===================================================================
---- boinc.orig/vda/vdad.cpp 2012-06-30 14:43:21.007806400 +0200
-+++ boinc/vda/vdad.cpp 2012-06-30 22:00:54.943436087 +0200
+--- a/vda/vdad.cpp
++++ b/vda/vdad.cpp
@@ -27,6 +27,7 @@
#include <sys/types.h>
#include <vector>
diff --git a/debian/patches/upstream_sztaki_configureEval.patch b/debian/patches/upstream_sztaki_configureEval.patch
index 2111582..d297fc1 100644
--- a/debian/patches/upstream_sztaki_configureEval.patch
+++ b/debian/patches/upstream_sztaki_configureEval.patch
@@ -1,7 +1,7 @@
Author: Unknown
--- a/configure.ac
+++ b/configure.ac
-@@ -282,6 +282,20 @@
+@@ -288,6 +288,20 @@
AC_SUBST([TOP_BUILD_DIR], [`pwd`])
--
BOINC packaging
More information about the pkg-boinc-commits
mailing list