[SCM] BOINC packaging branch, backports/squeeze, updated. debian/7.0.33+dfsg-1-29-gdfb03b9

[Steffen Moeller]

The following commit has been merged in the backports/squeeze branch:
commit 9613e7fd7b2d37c8843e794431d64f0046a83dd8
Merge: 34bb2d38ae54f31b69fb2454ea948cffb6057061 4d7e489c130b8b8cb255e126e94c3b36ef6027c9
Author: Steffen Moeller <steffen_moeller at gmx.de>
Date:   Thu Aug 30 21:04:40 2012 +0200

    Merge branch 'squeeze-backports' into backports/squeeze
    
    Conflicts:
    	debian/control
    	debian/patches/series

diff --combined debian/patches/series
index 2f039c3,29adaf9..9572172
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,8 -1,7 +1,13 @@@
  # patches to get Debian going
++<<<<<<< HEAD
 +texfont_removal.patch
++=======
+ #texfont_removal.patch
+ #libnotify-0.7.patch
++>>>>>>> squeeze-backports
  # undisputed patches above
 +#libnotify-0.7.patch
 +# undisputed for Wheezy and beyond above
  sched_driver_f_free.patch
  sched_driver_char_buffers.patch
  improve_opendir_warning.patch
@@@ -11,9 -10,7 +16,7 @@@ mac_addresses_cores_in_kfreebsd.patc
  stripchart_debian.patch
  upstream_sztaki_configureEval.patch
  generate_less.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
@@@ -24,31 -21,51 +27,51 @@@ stripchart_security.patc
  #andYetMorePatches04.patch
  redundant_i.patch
  cppcheck_realloc.patch
- cwd_handling.patch
+ #convinceDavid#cwd_handling.patch
  parse_issues.patch
  client_stream_realloc.patch
  # --- A
- MoreInformativeAppStartFailure.patch
+ #convinceDavid# bug672328  MoreInformativeAppStartFailure.patch
+ #send to David#
  stream_memory_leak_fix.patch
- app_ipc_uninitialised.patch
- client_types_buffer_size.patch
- uninitialised_client_types.patch
+ #SETIprobCandidate#app_ipc_uninitialised_A_reorder.patch
+ #SETIprobCandidate#app_ipc_uninitialised_B_buffer.patch
  uninitialised_client_states.patch
- MainDocumentConst.patch
- #MainDocumentWarnings.patch
+ MainDocumentWarnings.patch
  # --- B 
- add_init_to_client_state_constructor.patch
- client_path_char_array_length.patch
+ #tmpA# add_init_to_client_state_constructor.patch
+ #convinceDavid# client_path_char_array_length.patch
  # --- Z --- Currently not applicable
  #Z#no_std_string.patch
  clang_incompatibilities.patch
+ printf.patch
  #either these 3
- nvidia_detect_buffers.patch
- nvidia_detect_bugs.patch
- nvidia_detect_optinal.patch
+ #convinceDavid# nvidia_detect_buffers.patch
+ #convinceDavid# nvidia_detect_bugs.patch
+ #convinceDavid# nvidia_detect_optinal.patch
  #or this one
  #debian/patches/nvidia_detect_experiments.patch
  some_extra_clang_warnings.patch
- nvidia_direct_invocation.patch
- nvidia_direct_invocation_2.patch
- EAH_more_random_random_string.patch
+ #tmpA# nvidia_direct_invocation.patch
+ #tmpA# nvidia_direct_invocation_2.patch
+ dTotalGlobalMem.patch
+ nvidia_mem_display_simplification.patch
+ api_NULL_not_defined.patch
+ #convinceRom#wxWidgets_observations.patch
+ unlink_undefined.patch
+ 0001-Patch-from-Steffen-Moeller-for-recent-Xcb.patch
+ 0002-re-enable-X11-screensaver-build.patch
+ screen_saver_boinc_extra.patch
+ #socklenBuildFixByDavid.patch
+ boinclib_shared.patch
+ dynamic_libboinc.patch
+ #boinc_manager_project_info_page.patch
+ ensure_there_is_no_newline_in_passwd.patch
+ Missing_libSched.patch
+ add_hardening_flags.patch
+ cmath_missing.patch
+ investigate_boinc_api.patch
+ opendir_error_messages.patch
+ more_maxpathlen.patch
+ slot_dir_source_trace.patch
+ ignored_return_value.patch

-- 
BOINC packaging