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

[Steffen Moeller]

The following commit has been merged in the SZTAKI branch:
commit c0eb11e6b581a157bc109e7117a0fe522f038433
Author: Steffen Moeller <moeller at debian.org>
Date:   Mon Jun 13 21:18:07 2011 +0200

    Simplifying command line execution
    
    Tools are presumed to be in path.

diff --git a/SZTAKI_patches_remaining_to_move_into_debian.patch b/SZTAKI_patches_remaining_to_move_into_debian.patch
index c944983..41e87a5 100644
--- a/SZTAKI_patches_remaining_to_move_into_debian.patch
+++ b/SZTAKI_patches_remaining_to_move_into_debian.patch
@@ -128,21 +128,6 @@
  def make_executable(name):
      os.chmod(name, 755)
  def force_symlink(src, dest):
-@@ -170,15 +173,14 @@
-def builddir(*dirs):
-    return apply(os.path.join,(boinc_path_config.TOP_BUILD_DIR,)+dirs)
- 
- def run_tool(cmd):
--    verbose_shell_call(builddir('tools', cmd))
-+    verbose_shell_call(cmd)
- 
- def _gen_key_p(private_key, public_key):
--    shell_call("%s/crypt_prog -genkey 1024 %s %s >/dev/null" % (
--        builddir('lib'),
-+    shell_call("crypt_prog -genkey 1024 %s %s >/dev/null" % (
-         private_key,
-         public_key))
- def _gen_key(key):
 @@ -252,30 +254,30 @@
              pass
      map(lambda d: mkdir2(dir(d)),
diff --git a/debian/patches/series b/debian/patches/series
index 2c3d7f0..8fa0307 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,6 @@
 local_sztaki_workOnTransitioner.patch
 local_sztaki_backendlib.patch
+upstream_sztaki_simplerInvocationCmdLine.patch
 debian_sztaki_httpdUserIsWwwData.patch
 upstream_sztaki_improveSchedStart.patch
 local_sztaki_toolsUpgradeSimplification.patch
diff --git a/debian/patches/upstream_sztaki_simplerInvocationCmdLine.patch b/debian/patches/upstream_sztaki_simplerInvocationCmdLine.patch
new file mode 100644
index 0000000..714afb3
--- /dev/null
+++ b/debian/patches/upstream_sztaki_simplerInvocationCmdLine.patch
@@ -0,0 +1,18 @@
+Index: boinc/py/Boinc/setup_project.py
+===================================================================
+--- boinc.orig/py/Boinc/setup_project.py	2011-06-13 21:13:55.000000000 +0200
++++ boinc/py/Boinc/setup_project.py	2011-06-13 21:15:50.000000000 +0200
+@@ -174,11 +174,10 @@
+     return apply(os.path.join,(boinc_path_config.TOP_BUILD_DIR,)+dirs)
+ 
+ def run_tool(cmd):
+-    verbose_shell_call(builddir('tools', cmd))
++    verbose_shell_call(cmd)
+ 
+ def _gen_key_p(private_key, public_key):
+-    shell_call("%s/crypt_prog -genkey 1024 %s %s >/dev/null" % (
+-        builddir('lib'),
++    shell_call("crypt_prog -genkey 1024 %s %s >/dev/null" % (
+         private_key,
+         public_key))
+ def _gen_key(key):

-- 
BOINC packaging