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

[Steffen Moeller]

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

    Adjusted source default path for upgrade

diff --git a/SZTAKI_patches_remaining_to_move_into_debian.patch b/SZTAKI_patches_remaining_to_move_into_debian.patch
index be0391b..6ea6ea4 100644
--- a/SZTAKI_patches_remaining_to_move_into_debian.patch
+++ b/SZTAKI_patches_remaining_to_move_into_debian.patch
@@ -716,24 +716,6 @@ def builddir(*dirs):
  major=`expr $nmods / 2`
 --- boinc-server-6.11.0+r18946.orig/tools/upgrade
 +++ boinc-server-6.11.0+r18946/tools/upgrade
-@@ -6,7 +6,7 @@
- Usage: upgrade [options] project_name
- Options:
-   --project_root    default: HOME/projects/
--  --srcdir          default: current directory
-+  --srcdir          default: /usr/share/boinc-server
- 
- Copy source/build files to a project tree,
- overwriting what's already there.
-@@ -35,7 +35,7 @@
- 
- options.project_root = os.path.join(home, 'projects')
- options.web_only = False
--options.srcdir = None
-+options.srcdir = '/usr/share/boinc-server'
- 
- for o,a in opts:
-     if o == '--help':   usage()
 @@ -74,12 +74,6 @@
  
  print "Upgrading files... done"
diff --git a/debian/patches/debian_sztaki_UpgradPathBoinc.patch b/debian/patches/debian_sztaki_UpgradPathBoinc.patch
new file mode 100644
index 0000000..394aba6
--- /dev/null
+++ b/debian/patches/debian_sztaki_UpgradPathBoinc.patch
@@ -0,0 +1,22 @@
+Index: boinc/tools/upgrade
+===================================================================
+--- boinc.orig/tools/upgrade	2011-06-13 01:41:47.000000000 +0200
++++ boinc/tools/upgrade	2011-06-13 01:43:05.000000000 +0200
+@@ -6,7 +6,7 @@
+ Usage: upgrade [options] project_name
+ Options:
+   --project_root    default: HOME/projects/
+-  --srcdir          default: current directory
++  --srcdir          default: /usr/share/boinc-server
+ 
+ Copy source/build files to a project tree,
+ overwriting what's already there.
+@@ -36,7 +36,7 @@
+ options.project_root = os.path.join(home, 'projects')
+ options.web_only = False
+ options.server_only = False
+-options.srcdir = None
++options.srcdir = '/usr/share/boinc-server'
+ 
+ for o,a in opts:
+     if o == '--help':   usage()
diff --git a/debian/patches/series b/debian/patches/series
index d6a5f44..cd1ce85 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+debian_sztaki_UpgradPathBoinc.patch
 upstream_sztaki_NewInstallFunctions.patch
 upstream_sztaki_AssignSchedToProject.patch
 upstream_sztaki_glx_m4_optimisation.patch

-- 
BOINC packaging