[SCM] BOINC packaging branch, master, updated. debian/7.0.33+dfsg-1-46-g76319ca
Steffen Moeller
steffen_moeller at gmx.de
Sun Sep 16 20:19:14 UTC 2012
The following commit has been merged in the master branch:
commit 76319ca2e0c410ff36e396f465b850243d7fbb01
Author: Steffen Moeller <steffen_moeller at gmx.de>
Date: Sun Sep 16 22:18:25 2012 +0200
New version, patches updated
diff --git a/debian/changelog b/debian/changelog
index a70ec2b..1fd0186 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,18 @@
-boinc (7.0.36+dfsg-1) UNRELEASED; urgency=low
+boinc (7.0.36+dfsg-1) unstable; urgency=low
+
+ * Team upload.
[ Gianfranco Costamagna ]
* New upstream version
[ Guo Yixuan ]
* Updated api_NULL_not_defined.patch.
+
+ [ Steffen Moeller ]
+ * Updated slot_dir_source_trace.patch.
+ * Updated opendir_error_messages.patch.
- -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it> Sat, 15 Sep 2012 15:10:21 +0200
+ -- Debian BOINC Maintainers <pkg-boinc-devel at lists.alioth.debian.org> Sun, 16 Sep 2012 21:28:52 +0200
boinc (7.0.34+dfsg-6) UNRELEASED; urgency=low
diff --git a/debian/patches/more_maxpathlen.patch b/debian/patches/more_maxpathlen.patch
index 041daa6..6019d5b 100644
--- a/debian/patches/more_maxpathlen.patch
+++ b/debian/patches/more_maxpathlen.patch
@@ -1,7 +1,7 @@
Index: boinc/api/graphics2_util.cpp
===================================================================
---- boinc.orig/api/graphics2_util.cpp 2012-09-01 19:39:28.637343110 +0800
-+++ boinc/api/graphics2_util.cpp 2012-09-01 19:40:48.401346216 +0800
+--- boinc.orig/api/graphics2_util.cpp 2012-09-15 18:20:11.920438137 +0200
++++ boinc/api/graphics2_util.cpp 2012-09-16 21:27:07.961955315 +0200
@@ -35,9 +35,9 @@
#ifdef __EMX__
@@ -60,8 +60,8 @@ Index: boinc/api/graphics2_util.cpp
#endif
Index: boinc/lib/filesys.cpp
===================================================================
---- boinc.orig/lib/filesys.cpp 2012-09-15 12:23:56.681113074 +0200
-+++ boinc/lib/filesys.cpp 2012-09-15 12:23:56.681113074 +0200
+--- boinc.orig/lib/filesys.cpp 2012-09-16 21:27:07.901956127 +0200
++++ boinc/lib/filesys.cpp 2012-09-16 21:30:01.147609631 +0200
@@ -430,7 +430,7 @@
while (1) {
retval = dir_scan(filename, dirp, sizeof(filename));
@@ -107,8 +107,8 @@ Index: boinc/lib/filesys.cpp
strcpy(oldpath, newpath);
Index: boinc/lib/network.cpp
===================================================================
---- boinc.orig/lib/network.cpp 2012-09-01 19:39:28.637343110 +0800
-+++ boinc/lib/network.cpp 2012-09-01 19:40:04.733344515 +0800
+--- boinc.orig/lib/network.cpp 2012-09-15 18:20:16.860372380 +0200
++++ boinc/lib/network.cpp 2012-09-16 21:27:07.973955156 +0200
@@ -70,7 +70,7 @@
case WSAENOTSOCK:
return "not a socket";
diff --git a/debian/patches/opendir_error_messages.patch b/debian/patches/opendir_error_messages.patch
index f87cd48..916d354 100644
--- a/debian/patches/opendir_error_messages.patch
+++ b/debian/patches/opendir_error_messages.patch
@@ -1,25 +1,7 @@
-Index: boinc/lib/filesys.cpp
-===================================================================
---- boinc.orig/lib/filesys.cpp 2012-09-15 12:23:56.681113074 +0200
-+++ boinc/lib/filesys.cpp 2012-09-15 12:35:40.833682529 +0200
-@@ -364,8 +364,12 @@
- int retval;
- DIRREF dirp;
-
-+ if (!boinc_file_or_symlink_exists(dirpath)) return 0; // if dir doesn't exist, it's empty
- dirp = dir_open(dirpath);
-- if (!dirp) return 0; // if dir doesn't exist, it's empty
-+ if (!dirp) {
-+ fprintf(stderr,"clean_out_dir: failed dir_open on '%s'\n",dirpath);
-+ return 0;
-+ }
- while (1) {
- strcpy(filename, "");
- retval = dir_scan(filename, dirp, sizeof(filename));
Index: boinc/lib/diagnostics.cpp
===================================================================
---- boinc.orig/lib/diagnostics.cpp 2012-08-17 15:47:19.767548254 +0200
-+++ boinc/lib/diagnostics.cpp 2012-08-17 15:54:07.000000000 +0200
+--- boinc.orig/lib/diagnostics.cpp 2012-09-15 18:20:16.772373551 +0200
++++ boinc/lib/diagnostics.cpp 2012-09-16 21:27:07.905956075 +0200
@@ -75,14 +75,14 @@
static int diagnostics_initialized = false;
@@ -69,8 +51,8 @@ Index: boinc/lib/diagnostics.cpp
fclose(p);
Index: boinc/client/sandbox.cpp
===================================================================
---- boinc.orig/client/sandbox.cpp 2012-08-17 15:47:19.771548200 +0200
-+++ boinc/client/sandbox.cpp 2012-08-17 15:54:07.000000000 +0200
+--- boinc.orig/client/sandbox.cpp 2012-09-15 18:20:12.456431003 +0200
++++ boinc/client/sandbox.cpp 2012-09-16 21:27:07.909956022 +0200
@@ -185,7 +185,7 @@
// If an error occurs, delete as much as possible.
//
@@ -89,3 +71,21 @@ Index: boinc/client/sandbox.cpp
if (is_dir(path)) {
retval = client_clean_out_dir(path, NULL);
if (retval) final_retval = retval;
+Index: boinc/lib/filesys.cpp
+===================================================================
+--- boinc.orig/lib/filesys.cpp 2012-09-16 21:27:05.345990748 +0200
++++ boinc/lib/filesys.cpp 2012-09-16 21:30:20.047353633 +0200
+@@ -367,8 +367,12 @@
+ int retval;
+ DIRREF dirp;
+
++ if (!boinc_file_or_symlink_exists(dirpath)) return 0; // if dir doesn't exist, it's empty
+ dirp = dir_open(dirpath);
+- if (!dirp) return 0; // if dir doesn't exist, it's empty
++ if (!dirp) {
++ fprintf(stderr,"clean_out_dir: failed dir_open on '%s'\n",dirpath);
++ return 0;
++ }
+ while (1) {
+ strcpy(filename, "");
+ retval = dir_scan(filename, dirp, sizeof(filename));
diff --git a/debian/patches/slot_dir_source_trace.patch b/debian/patches/slot_dir_source_trace.patch
index da09f9d..f13559a 100644
--- a/debian/patches/slot_dir_source_trace.patch
+++ b/debian/patches/slot_dir_source_trace.patch
@@ -1,7 +1,7 @@
Index: boinc/client/app.cpp
===================================================================
---- boinc.orig/client/app.cpp 2012-06-30 21:30:06.444327787 +0200
-+++ boinc/client/app.cpp 2012-08-25 23:08:31.136959941 +0200
+--- boinc.orig/client/app.cpp 2012-09-15 18:20:12.208434304 +0200
++++ boinc/client/app.cpp 2012-09-16 21:27:08.029954395 +0200
@@ -417,8 +417,8 @@
int retval;
@@ -66,8 +66,8 @@ Index: boinc/client/app.cpp
FILE_INFO* fip = result->lookup_file_logical(p);
Index: boinc/client/app.h
===================================================================
---- boinc.orig/client/app.h 2012-05-03 17:05:19.619492780 +0200
-+++ boinc/client/app.h 2012-08-26 17:14:34.521163171 +0200
+--- boinc.orig/client/app.h 2012-09-15 18:20:12.212434251 +0200
++++ boinc/client/app.h 2012-09-16 21:27:08.033954342 +0200
@@ -47,6 +47,7 @@
typedef int PROCESS_ID;
@@ -121,8 +121,8 @@ Index: boinc/client/app.h
void process_control_poll();
Index: boinc/lib/filesys.cpp
===================================================================
---- boinc.orig/lib/filesys.cpp 2012-09-15 12:23:56.681113074 +0200
-+++ boinc/lib/filesys.cpp 2012-09-15 12:35:40.000000000 +0200
+--- boinc.orig/lib/filesys.cpp 2012-09-16 21:27:07.969955209 +0200
++++ boinc/lib/filesys.cpp 2012-09-16 21:27:29.541663047 +0200
@@ -86,7 +86,7 @@
// routines for enumerating the entries in a directory
@@ -236,7 +236,7 @@ Index: boinc/lib/filesys.cpp
@@ -737,7 +739,7 @@
return 0;
}
-
+
-void boinc_getcwd(char* path) {
+void boinc_getcwd(char* const path) {
#ifdef _WIN32
@@ -251,7 +251,7 @@ Index: boinc/lib/filesys.cpp
boinc_getcwd(path);
if (strlen(relname)) {
strcat(path, "/");
-@@ -762,7 +764,7 @@
+@@ -760,7 +762,7 @@
// get total and free space on current filesystem (in bytes)
//
#ifdef _WIN32
@@ -280,8 +280,8 @@ Index: boinc/lib/filesys.cpp
int retval;
Index: boinc/lib/filesys.h
===================================================================
---- boinc.orig/lib/filesys.h 2012-09-15 12:23:56.677113181 +0200
-+++ boinc/lib/filesys.h 2012-09-15 13:54:49.920386693 +0200
+--- boinc.orig/lib/filesys.h 2012-09-15 18:20:16.792373285 +0200
++++ boinc/lib/filesys.h 2012-09-16 21:27:08.041954235 +0200
@@ -48,19 +48,19 @@
extern FILE* boinc_fopen(const char* path, const char* mode);
extern int boinc_copy(const char* orig, const char* newf);
diff --git a/debian/rules b/debian/rules
index 2b45c32..0452a18 100755
--- a/debian/rules
+++ b/debian/rules
@@ -170,6 +170,7 @@ CFGFLAGS_boinc-client = \
override_dh_clean:
dh_clean
+ rm -rf clientscr/.libs override_dh_auto_install
rm -rf debian/boinc-app-examples debian/boinc-server-maker debian/boinc-app-examples.substvars debian/boinc-server-maker.substvars
rm -rf debian/tmp autoreconf-stamp build-*-stamp install-*-stamp
rm -fr debian/boinc-amd-opencl debian/boinc-screensaver # for cases when this is not in debian/control
--
BOINC packaging
More information about the pkg-boinc-commits
mailing list