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

[Steffen Moeller]

The following commit has been merged in the SZTAKI branch:
commit 79fda972f3f103fbbfcafe3fcde3d4825209d528
Author: Steffen Moeller <moeller at debian.org>
Date:   Mon Jun 13 00:53:30 2011 +0200

    Another two patches.

diff --git a/SZTAKI_patches_remaining_to_move_into_debian.patch b/SZTAKI_patches_remaining_to_move_into_debian.patch
index eab26a8..4a729cc 100644
--- a/SZTAKI_patches_remaining_to_move_into_debian.patch
+++ b/SZTAKI_patches_remaining_to_move_into_debian.patch
@@ -131,34 +131,6 @@
      return signature_text
 --- boinc-server-6.11.0+r18946.orig/py/Boinc/setup_project.py
 +++ boinc-server-6.11.0+r18946/py/Boinc/setup_project.py
-@@ -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):
 @@ -125,17 +139,6 @@
      os.rename(inoutfile, old)
      macro_substitute(macro, replacement, old, inoutfile)
@@ -429,15 +401,6 @@ def builddir(*dirs):
  
          # Copy the sched server in the cgi directory with the cgi names given
          # source_dir/html/user/schedulers.txt
-@@ -521,7 +496,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()
 @@ -537,13 +512,9 @@
  
          self.config.write()
@@ -653,90 +616,6 @@ def builddir(*dirs):
  		if (bio_err == NULL)
  		    bio_err = BIO_new_fp(stdout, BIO_NOCLOSE);
          //enc=EVP_get_cipherbyname("des");
---- boinc-server-6.11.0+r18946.orig/m4/ax_check_glu.m4
-+++ boinc-server-6.11.0+r18946/m4/ax_check_glu.m4
-@@ -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
---- boinc-server-6.11.0+r18946.orig/m4/ax_check_glut.m4
-+++ boinc-server-6.11.0+r18946/m4/ax_check_glut.m4
-@@ -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-server-6.11.0+r18946.orig/m4/ax_check_gl.m4
-+++ boinc-server-6.11.0+r18946/m4/ax_check_gl.m4
-@@ -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}])
 --- boinc-server-6.11.0+r18946.orig/tools/Makefile.am
 +++ boinc-server-6.11.0+r18946/tools/Makefile.am
 @@ -6,11 +6,17 @@
diff --git a/debian/patches/series b/debian/patches/series
index 467f358..66090b0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,6 @@
+upstream_sztaki_NewInstallFunctions.patch
+upstream_sztaki_AssignSchedToProject.patch
+upstream_sztaki_glx_m4_optimisation.patch
 local_sztaki_GeoIP_location.patch
 upstream_sztaki_Help_Function_Declaration_with_void.patch
 local_sztaki_NoWriteFcgiWithHostinfo.patch

-- 
BOINC packaging