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

[Steffen Moeller]

The following commit has been merged in the SZTAKI branch:
commit 656e0075cd1c7b84c5f4665fef0d898fb6e7cb09
Author: Steffen Moeller <moeller at debian.org>
Date:   Sun Jun 12 01:17:18 2011 +0200

    Moved LIBEXEC changes into separate patch
    
    Should be accepted by upstream.

diff --git a/SZTAKI_patches_remaining_to_move_into_debian.patch b/SZTAKI_patches_remaining_to_move_into_debian.patch
index 313c433..c6cb299 100644
--- a/SZTAKI_patches_remaining_to_move_into_debian.patch
+++ b/SZTAKI_patches_remaining_to_move_into_debian.patch
@@ -107,16 +107,6 @@
  
  $(srcdir)/Boinc/boinc_db.py: $(top_srcdir)/db/boinc_db.h $(top_srcdir)/lib/common_defs.h
  	cat $^ | $(top_srcdir)/py/db_def_to_py > $@
---- boinc-server-6.11.0+r18946.orig/py/boinc_path_config.py.in
-+++ boinc-server-6.11.0+r18946/py/boinc_path_config.py.in
-@@ -8,5 +8,5 @@
- 
- import sys, os
- 
--TOP_BUILD_DIR = "@TOP_BUILD_DIR@"
--sys.path.insert(0, os.path.join(TOP_BUILD_DIR, 'py'))
-+# Installation location set by configure
-+LIBEXEC_DIR = "@CONFIG_LIBEXECDIR@"
 --- boinc-server-6.11.0+r18946.orig/py/Boinc/tools.py
 +++ boinc-server-6.11.0+r18946/py/Boinc/tools.py
 @@ -81,17 +81,8 @@
@@ -188,13 +178,8 @@
      os.chmod(name, 755)
  def force_symlink(src, dest):
 @@ -170,15 +173,14 @@
- def srcdir(*dirs):
-     return apply(os.path.join,(options.srcdir,)+dirs)
- 
--def builddir(*dirs):
--    return apply(os.path.join,(boinc_path_config.TOP_BUILD_DIR,)+dirs)
-+def libexecdir(*dirs):
-+    return apply(os.path.join,(boinc_path_config.LIBEXEC_DIR,)+dirs)
+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))
@@ -4124,15 +4109,3 @@
              run_state.tasks.remove_node(run_state_task)
  
  def stop_daemon(pid):
-@@ -710,9 +726,9 @@
- is_main_host = config.config.host == local_hostname
- 
- if 'PATH' in os.environ:
--    os.environ['PATH'] = bin_dir + ':' + os.environ['PATH']
-+    os.environ['PATH'] = bin_dir + ':' + os.path.join(boinc_path_config.LIBEXEC_DIR, 'sched') + ':' + os.environ['PATH']
- else:
--    os.environ['PATH'] = bin_dir
-+    os.environ['PATH'] = bin_dir + ':' + os.path.join(boinc_path_config.LIBEXEC_DIR, 'sched')
- 
- start_lockfile = os.path.join(pid_dir, 'start.lock.'+local_hostname)
- if lock_file(start_lockfile):
diff --git a/debian/patches/series b/debian/patches/series
index fb5cf8f..c7c1591 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+upstream_sztaki_LIBEXEC_DIR.patch
 allow_world_read_and_execute_directory.patch
 AvoidingBlanksInMakefiles.patch
 pythonPath.patch
diff --git a/debian/patches/upstream_sztaki_LIBEXEC_DIR.patch b/debian/patches/upstream_sztaki_LIBEXEC_DIR.patch
new file mode 100644
index 0000000..03e54de
--- /dev/null
+++ b/debian/patches/upstream_sztaki_LIBEXEC_DIR.patch
@@ -0,0 +1,45 @@
+Index: boinc/py/Boinc/setup_project.py
+===================================================================
+--- boinc.orig/py/Boinc/setup_project.py	2011-06-12 01:05:52.000000000 +0200
++++ boinc/py/Boinc/setup_project.py	2011-06-12 01:14:27.000000000 +0200
+@@ -170,8 +170,8 @@
+ def srcdir(*dirs):
+     return apply(os.path.join,(options.srcdir,)+dirs)
+ 
+-def builddir(*dirs):
+-    return apply(os.path.join,(boinc_path_config.TOP_BUILD_DIR,)+dirs)
++def libexecdir(*dirs):
++    return apply(os.path.join,(boinc_path_config.LIBEXEC_DIR,)+dirs)
+ 
+ def run_tool(cmd):
+     verbose_shell_call(builddir('tools', cmd))
+Index: boinc/py/boinc_path_config.py.in
+===================================================================
+--- boinc.orig/py/boinc_path_config.py.in	2011-06-12 01:03:43.000000000 +0200
++++ boinc/py/boinc_path_config.py.in	2011-06-12 01:12:58.000000000 +0200
+@@ -6,7 +6,6 @@
+ # boinc/py/Boinc/boinc_path_config.py.in (in all directories that contain
+ # python scripts, so that they can directly import path_config.py)
+ 
+-import sys, os
++# Installation location set by configure
++LIBEXEC_DIR = "@CONFIG_LIBEXECDIR@"
+ 
+-TOP_BUILD_DIR = "@TOP_BUILD_DIR@"
+-sys.path.insert(0, os.path.join(TOP_BUILD_DIR, 'py'))
+Index: boinc/sched/start
+===================================================================
+--- boinc.orig/sched/start	2011-06-12 01:08:25.000000000 +0200
++++ boinc/sched/start	2011-06-12 01:10:48.000000000 +0200
+@@ -718,9 +718,9 @@
+ is_main_host = config.config.host == local_hostname
+ 
+ if 'PATH' in os.environ:
+-    os.environ['PATH'] = bin_dir + ':' + os.environ['PATH']
++    os.environ['PATH'] = bin_dir ':' + os.path.join(boinc_path_config.LIBEXEC_DIR, 'sched') + ':' + os.environ['PATH']
+ else:
+-    os.environ['PATH'] = bin_dir
++    os.environ['PATH'] = bin_dir ':' + os.path.join(boinc_path_config.LIBEXEC_DIR, 'sched')
+ 
+ start_lockfile = os.path.join(pid_dir, 'start.lock.'+local_hostname)
+ if lock_file(start_lockfile):

-- 
BOINC packaging