r47166 - in /packages/gmsh-tetgen/trunk/debian/patches: fix-cmake.patch petsc.patch python-cmake.patch series

trophime-guest at users.alioth.debian.org trophime-guest at users.alioth.debian.org
Tue Nov 10 09:36:24 UTC 2015 

Author: trophime-guest
Date: Tue Nov 10 09:36:23 2015
New Revision: 47166

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=47166
Log:
update patches for 2.11.0

Added:
    packages/gmsh-tetgen/trunk/debian/patches/fix-cmake.patch
    packages/gmsh-tetgen/trunk/debian/patches/python-cmake.patch
Modified:
    packages/gmsh-tetgen/trunk/debian/patches/petsc.patch
    packages/gmsh-tetgen/trunk/debian/patches/series

Added: packages/gmsh-tetgen/trunk/debian/patches/fix-cmake.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/fix-cmake.patch?rev=47166&op=file
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/fix-cmake.patch	(added)
+++ packages/gmsh-tetgen/trunk/debian/patches/fix-cmake.patch	Tue Nov 10 09:36:23 2015
@@ -0,0 +1,54 @@
+Description: <short summary of the patch>
+ TODO: Put a short summary on the line above and replace this paragraph
+ with a longer explanation of this change. Complete the meta-information
+ with other relevant fields (see below for details). To make it easier, the
+ information below has been extracted from the changelog. Adjust it or drop
+ it.
+ .
+ gmsh-tetgen (2.11.0-1) unstable; urgency=medium
+ .
+   * new usptream release
+Author: Christophe Trophime <christophe.trophime at lncmi.cnrs.fr>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: https://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+Index: gmsh-tetgen-2.11.0/CMakeLists.txt
+===================================================================
+--- gmsh-tetgen-2.11.0.orig/CMakeLists.txt
++++ gmsh-tetgen-2.11.0/CMakeLists.txt
+@@ -1255,11 +1255,11 @@ if(HAVE_PYTHON)
+   endif(ENABLE_NUMPY)
+   if(HAVE_PETSC)
+     if(ENABLE_PETSC4PY)
+-      EXECUTE_PROCESS(
+-        COMMAND ${PYTHON_EXECUTABLE} -c "import petsc4py; print(petsc4py.get_include())"
++      EXEC_PROGRAM (${PYTHON_EXECUTABLE}
++        ARGS "-c \"import petsc4py; print(petsc4py.get_include())\""
+         OUTPUT_VARIABLE PETSC4PY_INC
+-        RESULT_VARIABLE PETSC4PY_NOT_FOUND
+-        ERROR_QUIET
++        RETURN_VALUE PETSC4PY_NOT_FOUND
++	ERROR_QUIET
+         OUTPUT_STRIP_TRAILING_WHITESPACE
+       )
+       if(PETSC4PY_INC)
+@@ -1320,7 +1320,7 @@ endif(WIN32 OR CYGWIN)
+ 
+ # force full warnings to encourage everybody to write clean(er) code
+ check_cxx_compiler_flag("-Wall" WALL)
+-check_cxx_compiler_flag("-Wint-to-void-pointer-cast" WCAST)
++check_cxx_compiler_flag("-Wnoint-to-void-pointer-cast" WCAST)
+ check_cxx_compiler_flag("-Wdeprecated-declarations" WDEPREC)
+ if(WALL AND NOT MSVC)
+   file(GLOB_RECURSE WALL_SRC Common/*.cpp Fltk/*.cpp FunctionSpace/*.cpp

Modified: packages/gmsh-tetgen/trunk/debian/patches/petsc.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/petsc.patch?rev=47166&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/petsc.patch	(original)
+++ packages/gmsh-tetgen/trunk/debian/patches/petsc.patch	Tue Nov 10 09:36:23 2015
@@ -1,8 +1,8 @@
-Index: gmsh-tetgen-2.10.2~svn22060/CMakeLists.txt
+Index: gmsh-tetgen-2.11.0/CMakeLists.txt
 ===================================================================
---- gmsh-tetgen-2.10.2~svn22060.orig/CMakeLists.txt
-+++ gmsh-tetgen-2.10.2~svn22060/CMakeLists.txt
-@@ -1029,13 +1029,26 @@ if(HAVE_SOLVER)
+--- gmsh-tetgen-2.11.0.orig/CMakeLists.txt
++++ gmsh-tetgen-2.11.0/CMakeLists.txt
+@@ -1005,13 +1005,26 @@ if(HAVE_SOLVER)
          endif(PETSC_PACKAGES_INCLUDES)
        endif(PETSC_PACKAGES_INCLUDES)
        # find libraries (<= 3.0)
@@ -30,7 +30,7 @@
        endif(NOT PETSC_LIBS)
        if(PETSC_LIBS)
          set_config_option(HAVE_PETSC "PETSc")
-@@ -1053,15 +1066,22 @@ if(HAVE_SOLVER)
+@@ -1029,15 +1042,22 @@ if(HAVE_SOLVER)
           else(SLEPC_DIR)
            set(ENV_SLEPC_DIR $ENV{SLEPC_DIR})
          endif(SLEPC_DIR)
@@ -57,7 +57,7 @@
              list(APPEND EXTERNAL_INCLUDES ${SLEPC_INC})
              find_path(SLEPC_INC2 "slepcconf.h" PATHS ${ENV_SLEPC_DIR}
                        PATH_SUFFIXES ${ENV_PETSC_ARCH}/include NO_DEFAULT_PATH)
-@@ -1069,7 +1089,7 @@ if(HAVE_SOLVER)
+@@ -1045,7 +1065,7 @@ if(HAVE_SOLVER)
                list(APPEND EXTERNAL_INCLUDES ${SLEPC_INC2})
              endif(SLEPC_INC2)
            endif(SLEPC_INC)

Added: packages/gmsh-tetgen/trunk/debian/patches/python-cmake.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/python-cmake.patch?rev=47166&op=file
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/python-cmake.patch	(added)
+++ packages/gmsh-tetgen/trunk/debian/patches/python-cmake.patch	Tue Nov 10 09:36:23 2015
@@ -0,0 +1,38 @@
+Description: <short summary of the patch>
+ TODO: Put a short summary on the line above and replace this paragraph
+ with a longer explanation of this change. Complete the meta-information
+ with other relevant fields (see below for details). To make it easier, the
+ information below has been extracted from the changelog. Adjust it or drop
+ it.
+ .
+ gmsh-tetgen (2.11.0-1) unstable; urgency=medium
+ .
+   * new usptream release
+Author: Christophe Trophime <christophe.trophime at lncmi.cnrs.fr>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: https://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+Index: gmsh-tetgen-2.11.0/CMakeLists.txt
+===================================================================
+--- gmsh-tetgen-2.11.0.orig/CMakeLists.txt
++++ gmsh-tetgen-2.11.0/CMakeLists.txt
+@@ -1228,6 +1228,8 @@ endif(ENABLE_ZIPPER)
+ if(ENABLE_WRAP_PYTHON)
+   find_package(SWIG)
+   find_package(PythonLibs)
++  string(REPLACE "+" "" PYTHONLIBS_VERSION_STRING "${PYTHONLIBS_VERSION_STRING}")
++  MESSAGE(STATUS, "PYTHONLIBS_VERSION_STRING ${PYTHONLIBS_VERSION_STRING}")
+   find_package(PythonInterp ${PYTHONLIBS_VERSION_STRING} EXACT)
+   if(SWIG_FOUND AND PYTHONLIBS_FOUND)
+     message(STATUS "Found SWIG version " ${SWIG_VERSION})

Modified: packages/gmsh-tetgen/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/series?rev=47166&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/series	(original)
+++ packages/gmsh-tetgen/trunk/debian/patches/series	Tue Nov 10 09:36:23 2015
@@ -20,3 +20,5 @@
 clang.patch
 mmg3d4.0.2.patch
 petsc.patch
+fix-cmake.patch
+python-cmake.patch

More information about the debian-science-commits mailing list