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

[Steffen Moeller]

The following commit has been merged in the SZTAKI branch:
commit adac41f314f5323e12d60e15fd205ab95d1d7ab8
Author: Steffen Moeller <moeller at debian.org>
Date:   Mon Jun 13 01:51:41 2011 +0200

    Setting default path in make_project.

diff --git a/SZTAKI_patches_remaining_to_move_into_debian.patch b/SZTAKI_patches_remaining_to_move_into_debian.patch
index 6ea6ea4..5277eeb 100644
--- a/SZTAKI_patches_remaining_to_move_into_debian.patch
+++ b/SZTAKI_patches_remaining_to_move_into_debian.patch
@@ -845,40 +845,6 @@ def builddir(*dirs):
                      break;
 --- boinc-server-6.11.0+r18946.orig/tools/make_project
 +++ boinc-server-6.11.0+r18946/tools/make_project
-@@ -35,7 +35,7 @@
-    --drop_db_first      drop database first (from prev installation)
-    --test_app           install test application
-    --web_only           install web files, no executables (for Bossa, Bolt)
--   --srcdir             where to find the source files (default: current directory)
-+   --srcdir             where to find the source files (default: /usr/share/boinc-server)
- 
- Dir-options:
-    --project_root       default: HOME/projects/PROJECT
-@@ -43,7 +43,6 @@
-    --url_base           default: http://$NODENAME/ (http://%(NODENAME)s/)
- 
-    --html_user_url      default: URL_BASE/PROJECT/
--   --html_ops_url       default: URL_BASE/PROJECT_ops/
-    --cgi_url            default: URL_BASE/PROJECT_cgi/
- 
- Other:
-@@ -86,7 +85,6 @@
-             'project_root=',
-             'url_base=',
-             'html_user_url=',
--            'html_ops_url=',
-             'cgi_url=',
-             'db_name=',
-             'db_user=',
-@@ -102,7 +100,7 @@
- options.test_app = False
- options.web_only = False
- options.delete_prev_inst = False
--options.srcdir = None
-+options.srcdir = '/usr/share/boinc-server'
- 
- for o,a in opts:
-     if o == '-h' or o == '--help':        usage()
 @@ -119,7 +117,6 @@
      elif o == '--project_root':  options.project_root   = a
      elif o == '--url_base':      options.url_base       = a
diff --git a/debian/patches/debian_adjust_path_boinc_make_project.patch b/debian/patches/debian_adjust_path_boinc_make_project.patch
new file mode 100644
index 0000000..4fd450f
--- /dev/null
+++ b/debian/patches/debian_adjust_path_boinc_make_project.patch
@@ -0,0 +1,38 @@
+Index: boinc/tools/make_project
+===================================================================
+--- boinc.orig/tools/make_project	2011-06-13 01:49:39.000000000 +0200
++++ boinc/tools/make_project	2011-06-13 01:49:44.000000000 +0200
+@@ -35,7 +35,7 @@
+    --drop_db_first      drop database first (from prev installation)
+    --test_app           install test application
+    --web_only           install web files, no executables (for Bossa, Bolt)
+-   --srcdir             where to find the source files (default: current directory)
++   --srcdir             where to find the source files (default: /usr/share/boinc-server)
+ 
+ Dir-options:
+    --project_root       default: HOME/projects/PROJECT
+@@ -43,7 +43,6 @@
+    --url_base           default: http://$NODENAME/ (http://%(NODENAME)s/)
+ 
+    --html_user_url      default: URL_BASE/PROJECT/
+-   --html_ops_url       default: URL_BASE/PROJECT_ops/
+    --cgi_url            default: URL_BASE/PROJECT_cgi/
+ 
+ Other:
+@@ -86,7 +85,6 @@
+             'project_root=',
+             'url_base=',
+             'html_user_url=',
+-            'html_ops_url=',
+             'cgi_url=',
+             'db_name=',
+             'db_user=',
+@@ -102,7 +100,7 @@
+ options.test_app = False
+ options.web_only = False
+ options.delete_prev_inst = False
+-options.srcdir = None
++options.srcdir = '/usr/share/boinc-server'
+ 
+ for o,a in opts:
+     if o == '-h' or o == '--help':        usage()
diff --git a/debian/patches/series b/debian/patches/series
index cd1ce85..75f0bbd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+debian_adjust_path_boinc_make_project.patch
 debian_sztaki_UpgradPathBoinc.patch
 upstream_sztaki_NewInstallFunctions.patch
 upstream_sztaki_AssignSchedToProject.patch

-- 
BOINC packaging