[SCM] BOINC packaging branch, SZTAKI, updated. debian/6.10.17+dfsg-3-312-g6584182
Steffen Moeller
moeller at debian.org
Sun Jun 12 23:38:50 UTC 2011
The following commit has been merged in the SZTAKI branch:
commit fefbb964522559504234e23c2edd4271351c7585
Author: Steffen Moeller <moeller at debian.org>
Date: Mon Jun 13 01:20:38 2011 +0200
Forgotten files.
diff --git a/debian/patches/upstream_sztaki_AssignSchedToProject.patch b/debian/patches/upstream_sztaki_AssignSchedToProject.patch
new file mode 100644
index 0000000..b37a1cc
--- /dev/null
+++ b/debian/patches/upstream_sztaki_AssignSchedToProject.patch
@@ -0,0 +1,13 @@
+Index: boinc/py/Boinc/setup_project.py
+===================================================================
+--- boinc.orig/py/Boinc/setup_project.py 2011-06-13 00:40:11.000000000 +0200
++++ boinc/py/Boinc/setup_project.py 2011-06-13 00:40:46.000000000 +0200
+@@ -539,7 +539,7 @@
+ f.close()
+ else:
+ scheduler_file = 'schedulers.txt'
+- f = open(self.dir('html/user', scheduler_file), 'w')
++ f = open(self.dir('html/project', scheduler_file), 'w')
+ print >>f, "<!-- <scheduler>" + self.scheduler_url.strip() + "</scheduler> -->"
+ print >>f, "<link rel=\"boinc_scheduler\" href=\"" + self.scheduler_url.strip()+ "\">"
+ f.close()
diff --git a/debian/patches/upstream_sztaki_NewInstallFunctions.patch b/debian/patches/upstream_sztaki_NewInstallFunctions.patch
new file mode 100644
index 0000000..575e5f4
--- /dev/null
+++ b/debian/patches/upstream_sztaki_NewInstallFunctions.patch
@@ -0,0 +1,32 @@
+Index: boinc/py/Boinc/setup_project.py
+===================================================================
+--- boinc.orig/py/Boinc/setup_project.py 2011-06-13 00:35:59.000000000 +0200
++++ boinc/py/Boinc/setup_project.py 2011-06-13 00:36:17.000000000 +0200
+@@ -111,6 +111,14 @@
+ print 'failed to copy ' + src + ' to ' + dest
+ return
+
++def install_copy(src, dest, unless_exists = False):
++ if unless_exists and os.path.exists(dest):
++ return
++ try:
++ shutil.copy(src, dest)
++ except:
++ print 'failed to copy ' + src + ' to ' + dest
++ return
+
+ def install_glob(glob_source, dest, failok=False):
+ dest = os.path.join(dest, '') # append '/' if necessary
+@@ -118,6 +126,12 @@
+ if not os.path.isdir(src):
+ install(src, dest)
+
++def install_glob_copy(glob_source, dest, failok=False):
++ dest = os.path.join(dest, '') # append '/' if necessary
++ for src in glob.glob(glob_source):
++ if not os.path.isdir(src):
++ install_copy(src, dest)
++
+ def macro_substitute(macro, replacement, infile, outfile):
+ open(outfile, 'w').write(open(infile).read().replace(macro, replacement))
+ def macro_substitute_inplace(macro, replacement, inoutfile):
diff --git a/debian/patches/upstream_sztaki_glx_m4_optimisation.patch b/debian/patches/upstream_sztaki_glx_m4_optimisation.patch
new file mode 100644
index 0000000..aa58cd0
--- /dev/null
+++ b/debian/patches/upstream_sztaki_glx_m4_optimisation.patch
@@ -0,0 +1,90 @@
+Index: boinc/m4/ax_check_gl.m4
+===================================================================
+--- boinc.orig/m4/ax_check_gl.m4 2011-06-13 00:48:03.000000000 +0200
++++ boinc/m4/ax_check_gl.m4 2011-06-13 00:50:32.000000000 +0200
+@@ -26,21 +26,8 @@
+
+ AX_LANG_COMPILER_MS
+ if test X$ax_compiler_ms = Xno; then
+- GL_CFLAGS="${PTHREAD_CFLAGS}"
+- GL_LIBS="${PTHREAD_LIBS} -lm"
+- fi
+-
+- #
+- # Use x_includes and x_libraries if they have been set (presumably by
+- # AC_PATH_X).
+- #
+- if test "X$no_x" != "Xyes"; then
+- if test -n "$x_includes"; then
+- GL_CFLAGS="-I${x_includes} -I${prefix}/include ${GL_CFLAGS}"
+- fi
+- if test -n "$x_libraries"; then
+- GL_LIBS="-L${x_libraries} -L${prefix}/lib -lX11 ${GL_LIBS}"
+- fi
++ GL_CFLAGS="${X_CFLAGS} ${PTHREAD_CFLAGS}"
++ GL_LIBS="${X_LIBS} ${PTHREAD_LIBS} -lm"
+ fi
+
+ AC_CHECK_HEADERS([windows.h])
+@@ -58,7 +45,7 @@
+ else
+ ax_try_lib="${ax_lib}"
+ fi
+- LIBS="-L${prefix}/lib ${ax_try_lib} ${GL_LIBS} ${ax_save_LIBS}"
++ LIBS="${ax_try_lib} ${GL_LIBS} ${ax_save_LIBS}"
+ AC_LINK_IFELSE(
+ [AC_LANG_PROGRAM([[
+ # if HAVE_WINDOWS_H && defined(_WIN32)
+@@ -66,7 +53,7 @@
+ # endif
+ # include <GL/gl.h>]],
+ [[glBegin(0)]])],
+- [ax_cv_check_gl_libgl="-L${prefix}/lib ${ax_try_lib}"; break])
++ [ax_cv_check_gl_libgl="${ax_try_lib}"; break])
+ done
+ LIBS=${ax_save_LIBS}
+ CPPFLAGS=${ax_save_CPPFLAGS}])
+Index: boinc/m4/ax_check_glu.m4
+===================================================================
+--- boinc.orig/m4/ax_check_glu.m4 2011-06-13 00:45:39.000000000 +0200
++++ boinc/m4/ax_check_glu.m4 2011-06-13 00:46:43.000000000 +0200
+@@ -19,7 +19,7 @@
+ else
+ ax_try_lib="${ax_lib}"
+ fi
+- LIBS="-L${prefix}/lib ${ax_try_lib} ${GL_LIBS} ${ax_save_LIBS}"
++ LIBS="${ax_try_lib} ${GL_LIBS} ${ax_save_LIBS}"
+ #
+ # libGLU typically links with libstdc++ on POSIX platforms. However,
+ # setting the language to C++ means that test program source is named
+@@ -37,7 +37,7 @@
+ # endif
+ # include <GL/glu.h>]],
+ [[gluBeginCurve(0)]])],
+- [ax_cv_check_glu_libglu="-L${prefix}/lib ${ax_try_lib}"; break])
++ [ax_cv_check_glu_libglu="${ax_try_lib}"; break])
+ if test X$ax_compiler_ms = Xyes; then
+ AC_LANG_POP([C])
+ fi
+Index: boinc/m4/ax_check_glut.m4
+===================================================================
+--- boinc.orig/m4/ax_check_glut.m4 2011-06-13 00:46:53.000000000 +0200
++++ boinc/m4/ax_check_glut.m4 2011-06-13 00:47:14.000000000 +0200
+@@ -35,7 +35,7 @@
+ else
+ ax_try_lib="${ax_lib}"
+ fi
+- LIBS="-L${prefix}/lib ${ax_try_lib} ${GLUT_LIBS} ${ax_save_LIBS}"
++ LIBS="${ax_try_lib} ${GLUT_LIBS} ${ax_save_LIBS}"
+ AC_LINK_IFELSE(
+ [AC_LANG_PROGRAM([[
+ # if HAVE_WINDOWS_H && (defined(_WIN32) || defined(CYGWIN_USE_WIN32))
+@@ -43,7 +43,7 @@
+ # endif
+ # include <GL/glut.h>]],
+ [[glutMainLoop()]])],
+- [ax_cv_check_glut_libglut="-L${prefix}/lib ${ax_try_lib}"; break])
++ [ax_cv_check_glut_libglut="${ax_try_lib}"; break])
+
+ done
+ LIBS=${ax_save_LIBS}
--
BOINC packaging
More information about the pkg-boinc-commits
mailing list