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

[Steffen Moeller]

The following commit has been merged in the master branch:
commit 521f59d09bf43d47eea1d81f627a2e2237e6a966
Author: Steffen Moeller <moeller at debian.org>
Date:   Sun Jun 19 02:38:02 2011 +0200

    Adjusted path for BOINC to server for python code

diff --git a/debian/patches/debian_debian_AdjustBoincTopdirPython.patch b/debian/patches/debian_debian_AdjustBoincTopdirPython.patch
new file mode 100644
index 0000000..4e8ee35
--- /dev/null
+++ b/debian/patches/debian_debian_AdjustBoincTopdirPython.patch
@@ -0,0 +1,11 @@
+Index: boinc/py/boinc_path_config.py.in
+===================================================================
+--- boinc.orig/py/boinc_path_config.py.in	2011-06-19 02:36:44.000000000 +0200
++++ boinc/py/boinc_path_config.py.in	2011-06-19 02:37:42.000000000 +0200
+@@ -8,5 +8,5 @@
+ 
+ import sys, os
+ 
+-TOP_BUILD_DIR = "@TOP_BUILD_DIR@"
++TOP_BUILD_DIR = "/usr/share/boinc-server"
+ sys.path.insert(0, os.path.join(TOP_BUILD_DIR, 'py'))
diff --git a/debian/patches/series b/debian/patches/series
index e0ea1d6..60908f2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,3 +12,4 @@ file_upload_handler_permission.patch
 upstream_sztaki_usingTempfileInUpdateVersions.patch
 upstream_sztaki_reduce_accessibility_of_php_inc_file.patch
 upstream_sztaki_ProperArrayPhpIndexCheck_JobTimes.patch
+debian_debian_AdjustBoincTopdirPython.patch
diff --git a/debian/rules b/debian/rules
index 1b259a4..4335249 100755
--- a/debian/rules
+++ b/debian/rules
@@ -281,7 +281,6 @@ install: install-stamp
 
 install-stamp: build update-boinc-applinks.1
 	$(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
-	sed -i 's%^TOP_BUILD_DIR.*%TOP_BUILD_DIR = "/usr/share/boinc-server-maker"%' $(CURDIR)/debian/tmp/usr/lib/python2.6/site-packages/boinc_path_config.py
 	dh install
 	touch $@
 

-- 
BOINC packaging