[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 489f040dadc480ae9b6decc88cf5d379d7ad4bdf
Author: Steffen Moeller <moeller at debian.org>
Date:   Mon Jun 13 21:35:11 2011 +0200

    Removing slashes from project directory name

diff --git a/SZTAKI_patches_remaining_to_move_into_debian.patch b/SZTAKI_patches_remaining_to_move_into_debian.patch
index 7ae51ee..8dd8c91 100644
--- a/SZTAKI_patches_remaining_to_move_into_debian.patch
+++ b/SZTAKI_patches_remaining_to_move_into_debian.patch
@@ -488,7 +488,9 @@
  
  dir_hier_move_SOURCES = dir_hier_move.cpp
 -dir_hier_move_LDADD = $(SERVERLIBS)
-@@ -209,12 +204,12 @@
+--- boinc-server-6.11.0+r18946.orig/tools/make_project
++++ boinc-server-6.11.0+r18946/tools/make_project
+@@ -209,8 +204,8 @@
      if not query_yesno("Continue?"):
          raise SystemExit('Aborted')
  
@@ -498,11 +500,6 @@
  project = Project(
      project_shortname,
      project_longname,
--    project_dir = options.project_root,
-+    project_dir = delete_slash(options.project_root),
-     master_url = options.html_user_url,
-     cgi_url = options.cgi_url,
-     key_dir = options.key_dir,
 @@ -279,21 +274,33 @@
  t.cmd = 'run_in_ops ./notify.php'
  t.disabled = 1
diff --git a/debian/patches/series b/debian/patches/series
index adb32b1..e72bb0c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,6 +3,7 @@ local_sztaki_backendlib.patch
 upstream_sztaki_simplerInvocationCmdLine.patch
 upstream_sztaki_configLogDirSpec.patch
 upstream_sztaki_removingOpsOptionFromMakeProject.patch
+upstream_sztaki_MakeProjectDeleteSlash.patch
 debian_sztaki_httpdUserIsWwwData.patch
 upstream_sztaki_improveSchedStart.patch
 local_sztaki_toolsUpgradeSimplification.patch
diff --git a/debian/patches/upstream_sztaki_MakeProjectDeleteSlash.patch b/debian/patches/upstream_sztaki_MakeProjectDeleteSlash.patch
new file mode 100644
index 0000000..552744b
--- /dev/null
+++ b/debian/patches/upstream_sztaki_MakeProjectDeleteSlash.patch
@@ -0,0 +1,13 @@
+Index: boinc/tools/make_project
+===================================================================
+--- boinc.orig/tools/make_project	2011-06-13 21:31:22.000000000 +0200
++++ boinc/tools/make_project	2011-06-13 21:32:21.000000000 +0200
+@@ -211,7 +211,7 @@
+ project = Project(
+     project_shortname,
+     project_longname,
+-    project_dir = options.project_root,
++    project_dir = delete_slash(options.project_root),
+     master_url = options.html_user_url,
+     cgi_url = options.cgi_url,
+     key_dir = options.key_dir,

-- 
BOINC packaging