[SCM] BOINC packaging branch, master, updated. debian/6.10.17+dfsg-3-414-geec4d18

[Steffen Moeller]

The following commit has been merged in the master branch:
commit e0e8dbd2d99bd21639025a5c2f0bb02ef8245f62
Author: Steffen Moeller <moeller at debian.org>
Date:   Sun Mar 11 14:14:25 2012 +0100

    Reduced patches to minimum.

diff --git a/debian/patches/MoreInformativeAppStartFailure.patch b/debian/patches/MoreInformativeAppStartFailure.patch
index 0a339a4..1ea2407 100644
--- a/debian/patches/MoreInformativeAppStartFailure.patch
+++ b/debian/patches/MoreInformativeAppStartFailure.patch
@@ -1,7 +1,7 @@
 Index: boinc/client/app_start.cpp
 ===================================================================
---- boinc.orig/client/app_start.cpp	2012-03-09 14:16:53.000000000 +0100
-+++ boinc/client/app_start.cpp	2012-03-09 14:31:40.000000000 +0100
+--- boinc.orig/client/app_start.cpp	2012-03-11 13:38:50.000000000 +0100
++++ boinc/client/app_start.cpp	2012-03-11 13:52:26.000000000 +0100
 @@ -320,7 +320,10 @@
          strcat(dir_path, "/");
          strcat(dir_path, p);
@@ -24,7 +24,7 @@ Index: boinc/client/app_start.cpp
          if (g_use_sandbox) {
              char switcher_path[100];
              sprintf(switcher_path, "../../%s/%s",
-@@ -1020,17 +1026,21 @@
+@@ -1020,17 +1026,30 @@
              // so they must be world-readable so BOINC CLient can read them
              //
              umask(2);
@@ -33,10 +33,19 @@ Index: boinc/client/app_start.cpp
              retval = execv(switcher_path, argv);
          } else {
              argv[0] = buf;
++            strcat(errorMsg," buf:");
++            strcat(errorMsg,buf);
              parse_command_line(cmdline, argv+1);
++            strcat(errorMsg," cmdline:");
++            strcat(errorMsg,cmdline);
++            strcat(errorMsg," argv[1]:");
++            strcat(errorMsg,argv[1]);
++            char *cwd=get_current_dir_name();
++            strcat(errorMsg," cwd:");
++            strcat(errorMsg,cwd);
++            free(cwd);
              retval = execv(buf, argv);
          }
-+        strcat(errorMsg,buf);
          msg_printf(wup->project, MSG_INTERNAL_ERROR,
              "Process creation (%s) failed: %s, errno=%d\n",
              buf, boincerror(retval), errno
diff --git a/debian/patches/series b/debian/patches/series
index 2ef0795..e6e1664 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,27 +1,27 @@
-improve_opendir_warning.patch
-termios_is_everywhere.patch
-mac_addresses_cores_in_kfreebsd.patch
+# improve_opendir_warning.patch
+# termios_is_everywhere.patch
+# mac_addresses_cores_in_kfreebsd.patch
 stripchart_debian.patch
-upstream_sztaki_configureEval.patch
-generate_less.patch
+# upstream_sztaki_configureEval.patch
+# generate_less.patch
 texfont_removal.patch
-#Makefile_subdirs.patch
-csh2tcsh.patch
-file_upload_handler_permission.patch
-possible_size_type_error.patch
-upstream_sztaki_reduce_accessibility_of_php_inc_file.patch
-debian_debian_AdjustBoincTopdirPython.patch
+# #Makefile_subdirs.patch
+# csh2tcsh.patch
+# file_upload_handler_permission.patch
+# possible_size_type_error.patch
+# upstream_sztaki_reduce_accessibility_of_php_inc_file.patch
+# debian_debian_AdjustBoincTopdirPython.patch
 libnotify-0.7.patch
-stripchart_security.patch
-#AddSomeConstToMakeClearMemoryIsNotAllocated.patch
-#AddingMoreConst.patch
-#evenMoreConst03.patch
-#andYetMorePatches04.patch
-#erase_while_1.patch
-redundant_i.patch
-cppcheck_realloc.patch
-cwd_handling.patch
-sched_vda_strncpy.patch
-parse_issues.patch
-client_stream_realloc.patch
+# stripchart_security.patch
+# #AddSomeConstToMakeClearMemoryIsNotAllocated.patch
+# #AddingMoreConst.patch
+# #evenMoreConst03.patch
+# #andYetMorePatches04.patch
+# #erase_while_1.patch
+# redundant_i.patch
+# cppcheck_realloc.patch
+# cwd_handling.patch
+# sched_vda_strncpy.patch
+# parse_issues.patch
+# client_stream_realloc.patch
 MoreInformativeAppStartFailure.patch

-- 
BOINC packaging