[SCM] BOINC packaging branch, SZTAKI, updated. debian/6.10.17+dfsg-3-320-g05a36d6

[Steffen Moeller]

The following commit has been merged in the SZTAKI branch:
commit a1c99c1ff5d582f4ecb6fa785675b9c07377076a
Merge: 8cd9756b066be71548a7fde43304e3cb46213d80 9d14ae6eb66ca1d2df2367d8c3b33af6fff7bc72
Author: Steffen Moeller <moeller at debian.org>
Date:   Mon Jun 13 13:37:05 2011 +0200

    Merge branch 'master' into SZTAKI
    
    Conflicts:
    	debian/patches/series

diff --combined debian/patches/series
index ba5ebcb,e0ea1d6..f77d566
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,17 -1,4 +1,18 @@@
 +upstream_sztaki_cryptProg_simplification.patch
 +local_sztaki_toolsSZDG.patch
 +debian_adjust_path_boinc_make_project.patch
 +debian_sztaki_UpgradPathBoinc.patch
 +upstream_sztaki_NewInstallFunctions.patch
 +upstream_sztaki_AssignSchedToProject.patch
 +upstream_sztaki_glx_m4_optimisation.patch
 +local_sztaki_GroupWritableSchedFile.patch
 +local_sztaki_GeoIP_location.patch
 +upstream_sztaki_Help_Function_Declaration_with_void.patch
 +local_sztaki_NoWriteFcgiWithHostinfo.patch
 +local_sztaki_m4_libcurl_update.patch
 +upstream_sztaki_LIBEXEC_DIR.patch
 +local_sztaki_allow_world_read_and_execute_directory.patch
+ upstream_sztaki_configureEval.patch
  AvoidingBlanksInMakefiles.patch
  pythonPath.patch
  calculate_credit_multiplier.patch
@@@ -24,9 -11,4 +25,9 @@@ csh2tcsh.patc
  file_upload_handler_permission.patch
  upstream_sztaki_usingTempfileInUpdateVersions.patch
  upstream_sztaki_reduce_accessibility_of_php_inc_file.patch
 +upstream_sztaki_moreVoidArgumentsMadeExplicit_Boinc_API.patch
 +upstream_sztaki_NewSQLindices.patch
 +upstream_sztaki_html_path.patch
  upstream_sztaki_ProperArrayPhpIndexCheck_JobTimes.patch
 +upstream_sztaki_provideHostinfoPhp.patch
 +upstream_sztaki_userPerformance.php

-- 
BOINC packaging