[SCM] BOINC packaging branch, master, updated. debian/7.0.65+dfsg-3-21-gbb82724
Gianfranco Costamagna
costamagnagianfranco at yahoo.it
Mon Jun 3 21:00:21 UTC 2013
The following commit has been merged in the master branch:
commit bb8272496cb995cb6d57680bdce7139cae0525d1
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date: Mon Jun 3 22:55:13 2013 +0200
Removed old patch not used anymore, patch refresh
diff --git a/debian/patches/api_NULL_not_defined.patch b/debian/patches/api_NULL_not_defined.patch
deleted file mode 100644
index af18795..0000000
--- a/debian/patches/api_NULL_not_defined.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Description: Picked from http://boinc.berkeley.edu/svn/trunk/boinc@25877
---- a/api/boinc_api.h
-+++ b/api/boinc_api.h
-@@ -20,6 +20,8 @@
-
- #include <stddef.h> // for NULL
-
-+#include <stddef.h> // for NULL
-+
- #ifdef _WIN32
- #include "boinc_win.h"
- #endif
diff --git a/debian/patches/boinclib_shared.patch b/debian/patches/boinclib_shared.patch
index fb2c0d2..50b3971 100644
--- a/debian/patches/boinclib_shared.patch
+++ b/debian/patches/boinclib_shared.patch
@@ -1,7 +1,5 @@
-Index: boinc_debian/lib/Makefile.am
-===================================================================
---- boinc_debian.orig/lib/Makefile.am
-+++ boinc_debian/lib/Makefile.am
+--- a/lib/Makefile.am
++++ b/lib/Makefile.am
@@ -146,13 +146,13 @@
libboinc_la_SOURCES = $(generic_sources) $(mac_sources)
libboinc_la_CFLAGS = $(AM_CFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS)
@@ -23,15 +21,12 @@ Index: boinc_debian/lib/Makefile.am
crypt_prog_SOURCES = crypt_prog.cpp
crypt_prog_CXXFLAGS = $(PTHREAD_CFLAGS)
-crypt_prog_LDADD = $(LIBBOINC_CRYPT_STATIC) $(LIBBOINC) $(SSL_LIBS)
--parse_test_SOURCES = parse_test.cpp
+crypt_prog_LDADD = $(LIBBOINC_CRYPT_STATIC) -L../lib/.libs $(LIBBOINC) $(SSL_LIBS)
-+parse_test_SOURCES = parse_test.cpp
+ parse_test_SOURCES = parse_test.cpp
parse_test_CXXFLAGS = $(PTHREAD_CFLAGS)
parse_test_LDADD = $(LIBBOINC)
-Index: boinc_debian/client/Makefile.am
-===================================================================
---- boinc_debian.orig/client/Makefile.am
-+++ boinc_debian/client/Makefile.am
+--- a/client/Makefile.am
++++ b/client/Makefile.am
@@ -91,7 +91,7 @@
if OS_DARWIN
boinc_client_LDFLAGS += -Wl,-flat_namespace,-undefined,dynamic_lookup
diff --git a/debian/patches/de.po.patch b/debian/patches/de.po.patch
index 218465d..e0cdcd9 100644
--- a/debian/patches/de.po.patch
+++ b/debian/patches/de.po.patch
@@ -1,7 +1,5 @@
-Index: boinc_debian/html/languages/translations/de.po
-===================================================================
---- boinc_debian.orig/html/languages/translations/de.po
-+++ boinc_debian/html/languages/translations/de.po
+--- a/html/languages/translations/de.po
++++ b/html/languages/translations/de.po
@@ -1066,8 +1066,8 @@
#: ../inc/prefs.inc:157
@@ -48,10 +46,8 @@ Index: boinc_debian/html/languages/translations/de.po
#: ../user/moderation.php:30
msgid ""
-Index: boinc_debian/html/languages/translations/ru.po
-===================================================================
---- boinc_debian.orig/html/languages/translations/ru.po
-+++ boinc_debian/html/languages/translations/ru.po
+--- a/html/languages/translations/ru.po
++++ b/html/languages/translations/ru.po
@@ -386,6 +386,7 @@
"<li> Не должно быть оскорбительных комментариев, затрагивающих расу, "
"религию,\n"
diff --git a/debian/patches/filesys_error_message.patch b/debian/patches/filesys_error_message.patch
index cf7f4fc..1bed45f 100644
--- a/debian/patches/filesys_error_message.patch
+++ b/debian/patches/filesys_error_message.patch
@@ -1,7 +1,5 @@
-Index: boinc_debian/lib/filesys.cpp
-===================================================================
---- boinc_debian.orig/lib/filesys.cpp
-+++ boinc_debian/lib/filesys.cpp
+--- a/lib/filesys.cpp
++++ b/lib/filesys.cpp
@@ -145,7 +145,9 @@
#else
dirp = opendir(p);
@@ -40,10 +38,8 @@ Index: boinc_debian/lib/filesys.cpp
int retval=0;
retval = boinc_rename_aux(old, newf);
-Index: boinc_debian/lib/filesys.h
-===================================================================
---- boinc_debian.orig/lib/filesys.h
-+++ boinc_debian/lib/filesys.h
+--- a/lib/filesys.h
++++ b/lib/filesys.h
@@ -47,7 +47,7 @@
extern int boinc_touch_file(const char* const path);
extern FILE* boinc_fopen(const char* const path, const char* mode);
diff --git a/debian/patches/more_clang_warnings.patch b/debian/patches/more_clang_warnings.patch
index 7832844..582f970 100644
--- a/debian/patches/more_clang_warnings.patch
+++ b/debian/patches/more_clang_warnings.patch
@@ -1,7 +1,5 @@
-Index: boinc_debian/client/app_control.cpp
-===================================================================
---- boinc_debian.orig/client/app_control.cpp
-+++ boinc_debian/client/app_control.cpp
+--- a/client/app_control.cpp
++++ b/client/app_control.cpp
@@ -589,8 +589,8 @@
} else {
x = y;
@@ -29,10 +27,8 @@ Index: boinc_debian/client/app_control.cpp
msg_printf(wup->project, MSG_INTERNAL_ERROR,
"no project URL in task state file"
);
-Index: boinc_debian/client/cs_platforms.cpp
-===================================================================
---- boinc_debian.orig/client/cs_platforms.cpp
-+++ boinc_debian/client/cs_platforms.cpp
+--- a/client/cs_platforms.cpp
++++ b/client/cs_platforms.cpp
@@ -143,7 +143,7 @@
strlcat(cmdline," -m",256);
if ((f=popen(cmdline,"r"))) {
@@ -51,10 +47,8 @@ Index: boinc_debian/client/cs_platforms.cpp
// If the library is 32-bit ELF, then we're
// golden.
if (strstr(cmdline, "ELF") && strstr(cmdline, "32-bit")) support32=1;
-Index: boinc_debian/lib/crypt.cpp
-===================================================================
---- boinc_debian.orig/lib/crypt.cpp
-+++ boinc_debian/lib/crypt.cpp
+--- a/lib/crypt.cpp
++++ b/lib/crypt.cpp
@@ -208,14 +208,17 @@
}
if (j != len) return ERR_NULL;
@@ -76,10 +70,8 @@ Index: boinc_debian/lib/crypt.cpp
#endif
return 0;
}
-Index: boinc_debian/lib/diagnostics.cpp
-===================================================================
---- boinc_debian.orig/lib/diagnostics.cpp
-+++ boinc_debian/lib/diagnostics.cpp
+--- a/lib/diagnostics.cpp
++++ b/lib/diagnostics.cpp
@@ -607,7 +607,7 @@
size = backtrace (array, 64);
// Anything that calls malloc here (i.e *printf()) will probably fail
@@ -103,10 +95,8 @@ Index: boinc_debian/lib/diagnostics.cpp
backtrace_symbols_fd(array, size, fileno(stderr));
#endif
-Index: boinc_debian/client/hostinfo_unix.cpp
-===================================================================
---- boinc_debian.orig/client/hostinfo_unix.cpp
-+++ boinc_debian/client/hostinfo_unix.cpp
+--- a/client/hostinfo_unix.cpp
++++ b/client/hostinfo_unix.cpp
@@ -1345,11 +1345,12 @@
#endif
fd = popen(cmd, "r");
@@ -125,10 +115,8 @@ Index: boinc_debian/client/hostinfo_unix.cpp
pclose(fd);
}
}
-Index: boinc_debian/client/app_start.cpp
-===================================================================
---- boinc_debian.orig/client/app_start.cpp
-+++ boinc_debian/client/app_start.cpp
+--- a/client/app_start.cpp
++++ b/client/app_start.cpp
@@ -846,7 +846,10 @@
char* argv[100];
char current_dir[1024];
@@ -154,10 +142,8 @@ Index: boinc_debian/client/app_start.cpp
if (!config.no_priority_change) {
#if HAVE_SETPRIORITY
-Index: boinc_debian/api/graphics2_unix.cpp
-===================================================================
---- boinc_debian.orig/api/graphics2_unix.cpp
-+++ boinc_debian/api/graphics2_unix.cpp
+--- a/api/graphics2_unix.cpp
++++ b/api/graphics2_unix.cpp
@@ -190,7 +190,9 @@
FILE *f = boinc_fopen("gfx_info", "r");
if (f) {
@@ -169,10 +155,8 @@ Index: boinc_debian/api/graphics2_unix.cpp
fclose(f);
}
-Index: boinc_debian/lib/procinfo_unix.cpp
-===================================================================
---- boinc_debian.orig/lib/procinfo_unix.cpp
-+++ boinc_debian/lib/procinfo_unix.cpp
+--- a/lib/procinfo_unix.cpp
++++ b/lib/procinfo_unix.cpp
@@ -219,9 +219,11 @@
sprintf(pidpath, "/proc/%s/stat", piddir->d_name);
fd = fopen(pidpath, "r");
@@ -187,10 +171,8 @@ Index: boinc_debian/lib/procinfo_unix.cpp
if (retval) {
final_retval = retval;
-Index: boinc_debian/client/log_flags.cpp
-===================================================================
---- boinc_debian.orig/client/log_flags.cpp
-+++ boinc_debian/client/log_flags.cpp
+--- a/client/log_flags.cpp
++++ b/client/log_flags.cpp
@@ -526,7 +526,10 @@
#ifdef _WIN32
_chdir(config.data_dir);
@@ -203,10 +185,8 @@ Index: boinc_debian/client/log_flags.cpp
#endif
}
} else {
-Index: boinc_debian/client/switcher.cpp
-===================================================================
---- boinc_debian.orig/client/switcher.cpp
-+++ boinc_debian/client/switcher.cpp
+--- a/client/switcher.cpp
++++ b/client/switcher.cpp
@@ -46,6 +46,8 @@
char newlibs[256];
char *projectDirName;
@@ -246,10 +226,8 @@ Index: boinc_debian/client/switcher.cpp
+ if (errno) fprintf(stderr, "Process creation (%s) failed: errno=%d\n", argv[1], errno);
+ return(errno);
}
-Index: boinc_debian/lib/shmem.cpp
-===================================================================
---- boinc_debian.orig/lib/shmem.cpp
-+++ boinc_debian/lib/shmem.cpp
+--- a/lib/shmem.cpp
++++ b/lib/shmem.cpp
@@ -337,7 +337,10 @@
// area to all zeros because they write beyond the old EOF.
// See the lseek man page for details.
diff --git a/debian/patches/series b/debian/patches/series
index cd008b7..49c755e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -36,7 +36,6 @@ some_extra_clang_warnings.patch
#tmpA# nvidia_direct_invocation.patch
#tmpA# nvidia_direct_invocation_2.patch
nvidia_mem_display_simplification.patch
-api_NULL_not_defined.patch
cppcheck_realloc.patch
MainDocumentWarnings.patch
more_maxpathlen.patch
--
BOINC packaging
More information about the pkg-boinc-commits
mailing list