[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 079222ed0f6369eeb119082f647ec709c1e552a5
Author: Steffen Moeller <moeller at debian.org>
Date:   Mon Jun 13 21:28:57 2011 +0200

    Removed Ops config options from make_project

diff --git a/SZTAKI_patches_remaining_to_move_into_debian.patch b/SZTAKI_patches_remaining_to_move_into_debian.patch
index 877e230..7ae51ee 100644
--- a/SZTAKI_patches_remaining_to_move_into_debian.patch
+++ b/SZTAKI_patches_remaining_to_move_into_debian.patch
@@ -488,32 +488,6 @@
  
  dir_hier_move_SOURCES = dir_hier_move.cpp
 -dir_hier_move_LDADD = $(SERVERLIBS)
---- boinc-server-6.11.0+r18946.orig/tools/make_project
-+++ boinc-server-6.11.0+r18946/tools/make_project
-@@ -119,7 +117,6 @@
-     elif o == '--project_root':  options.project_root   = a
-     elif o == '--url_base':      options.url_base       = a
-     elif o == '--html_user_url': options.html_user_url  = a
--    elif o == '--html_ops_url':  options.html_ops_url   = a
-     elif o == '--cgi_url':       options.cgi_url        = a
-     elif o == '--db_name':       options.db_name        = a
-     elif o == '--db_user':       options.db_user        = a
-@@ -166,7 +163,6 @@
-     syntax_error('url_base needs to be an URL')
- 
- defopt('html_user_url' , 'URL_BASE/PROJECT')
--defopt('html_ops_url'  , 'URL_BASE/PROJECT_ops')
- defopt('cgi_url'       , 'URL_BASE/PROJECT_cgi')
- 
- defopt('user_name'     , USER, isdir=False)
-@@ -183,7 +179,6 @@
-     'project_root',
-     'url_base',
-     'html_user_url',
--    'html_ops_url',
-     'cgi_url',
-     'key_dir',
-     'db_name',
 @@ -209,12 +204,12 @@
      if not query_yesno("Continue?"):
          raise SystemExit('Aborted')
diff --git a/debian/patches/series b/debian/patches/series
index f7474ef..adb32b1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,6 +2,7 @@ local_sztaki_workOnTransitioner.patch
 local_sztaki_backendlib.patch
 upstream_sztaki_simplerInvocationCmdLine.patch
 upstream_sztaki_configLogDirSpec.patch
+upstream_sztaki_removingOpsOptionFromMakeProject.patch
 debian_sztaki_httpdUserIsWwwData.patch
 upstream_sztaki_improveSchedStart.patch
 local_sztaki_toolsUpgradeSimplification.patch
diff --git a/debian/patches/upstream_sztaki_removingOpsOptionFromMakeProject.patch b/debian/patches/upstream_sztaki_removingOpsOptionFromMakeProject.patch
new file mode 100644
index 0000000..f33f687
--- /dev/null
+++ b/debian/patches/upstream_sztaki_removingOpsOptionFromMakeProject.patch
@@ -0,0 +1,28 @@
+Index: boinc/tools/make_project
+===================================================================
+--- boinc.orig/tools/make_project	2011-06-13 21:27:54.000000000 +0200
++++ boinc/tools/make_project	2011-06-13 21:28:01.000000000 +0200
+@@ -119,7 +119,6 @@
+     elif o == '--project_root':  options.project_root   = a
+     elif o == '--url_base':      options.url_base       = a
+     elif o == '--html_user_url': options.html_user_url  = a
+-    elif o == '--html_ops_url':  options.html_ops_url   = a
+     elif o == '--cgi_url':       options.cgi_url        = a
+     elif o == '--db_name':       options.db_name        = a
+     elif o == '--db_user':       options.db_user        = a
+@@ -166,7 +165,6 @@
+     syntax_error('url_base needs to be an URL')
+ 
+ defopt('html_user_url' , 'URL_BASE/PROJECT')
+-defopt('html_ops_url'  , 'URL_BASE/PROJECT_ops')
+ defopt('cgi_url'       , 'URL_BASE/PROJECT_cgi')
+ 
+ defopt('user_name'     , USER, isdir=False)
+@@ -183,7 +181,6 @@
+     'project_root',
+     'url_base',
+     'html_user_url',
+-    'html_ops_url',
+     'cgi_url',
+     'key_dir',
+     'db_name',

-- 
BOINC packaging