r47317 - in /packages/gmsh-tetgen/trunk/debian: ./ patches/
trophime-guest at users.alioth.debian.org
trophime-guest at users.alioth.debian.org
Mon Jul 11 07:29:45 UTC 2016
Author: trophime-guest
Date: Mon Jul 11 07:29:45 2016
New Revision: 47317
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=47317
Log:
update for petsc 3.6.4
Modified:
packages/gmsh-tetgen/trunk/debian/changelog
packages/gmsh-tetgen/trunk/debian/control
packages/gmsh-tetgen/trunk/debian/patches/add-missing-headers.patch
packages/gmsh-tetgen/trunk/debian/patches/change_shared_library_name.patch
packages/gmsh-tetgen/trunk/debian/patches/clang.patch
packages/gmsh-tetgen/trunk/debian/patches/delete_gl2ps_from_source.patch
packages/gmsh-tetgen/trunk/debian/patches/fix-cmake-hdf5.patch
packages/gmsh-tetgen/trunk/debian/patches/fix-cmake.patch
packages/gmsh-tetgen/trunk/debian/patches/fix_FTBFS_linking.patch
packages/gmsh-tetgen/trunk/debian/patches/fix_libdir.patch
packages/gmsh-tetgen/trunk/debian/patches/fix_script_header.patch
packages/gmsh-tetgen/trunk/debian/patches/med.patch
packages/gmsh-tetgen/trunk/debian/patches/petsc.patch
packages/gmsh-tetgen/trunk/debian/patches/python-cmake.patch
packages/gmsh-tetgen/trunk/debian/patches/sgeom.patch
packages/gmsh-tetgen/trunk/debian/patches/skip_license_file.patch
packages/gmsh-tetgen/trunk/debian/patches/tetgen.patch
packages/gmsh-tetgen/trunk/debian/patches/tmp_fix_openfile.patch
packages/gmsh-tetgen/trunk/debian/rules
Modified: packages/gmsh-tetgen/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/changelog?rev=47317&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/changelog (original)
+++ packages/gmsh-tetgen/trunk/debian/changelog Mon Jul 11 07:29:45 2016
@@ -1,3 +1,9 @@
+gmsh-tetgen (2.12.2~svn23298-1) unstable; urgency=medium
+
+ * Update to latest svn
+
+ -- Christophe Trophime <christophe.trophime at lncmi.cnrs.fr> Thu, 07 Jul 2016 09:39:42 +0200
+
gmsh-tetgen (2.12.2~svn23232-1) unstable; urgency=medium
* Update to latest svn
Modified: packages/gmsh-tetgen/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/control?rev=47317&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/control (original)
+++ packages/gmsh-tetgen/trunk/debian/control Mon Jul 11 07:29:45 2016
@@ -16,8 +16,8 @@
libgl2ps-dev, freeglut3-dev,
python-dev (>= 2.6.6-3~), swig,
chrpath, libann-dev,
- libpetsc3.6.3-dev [!kfreebsd-amd64 !kfreebsd-i386 !armel !armhf !s390x !powerpcspe],
- libslepc3.6.2-dev [!kfreebsd-amd64 !kfreebsd-i386 !armel !armhf !s390x !powerpcspe],
+ libpetsc3.6.4-dev [!kfreebsd-amd64 !kfreebsd-i386 !armel !armhf !s390x !powerpcspe],
+ libslepc3.6.3-dev [!kfreebsd-amd64 !kfreebsd-i386 !armel !armhf !s390x !powerpcspe],
libhdf5-mpi-dev (>= 1.8.8~) [alpha amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc sparc],
javahelper, default-jdk,
libpoppler-cpp-dev,
Modified: packages/gmsh-tetgen/trunk/debian/patches/add-missing-headers.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/add-missing-headers.patch?rev=47317&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/add-missing-headers.patch (original)
+++ packages/gmsh-tetgen/trunk/debian/patches/add-missing-headers.patch Mon Jul 11 07:29:45 2016
@@ -3,11 +3,11 @@
Reviewed-by: Anton Gladky <gladky.anton at gmail.com>
Last-Update: 2012-06-24
-Index: gmsh-tetgen-2.12.2~svn23232/CMakeLists.txt
+Index: gmsh-tetgen-2.12.2~svn23298/CMakeLists.txt
===================================================================
---- gmsh-tetgen-2.12.2~svn23232.orig/CMakeLists.txt
-+++ gmsh-tetgen-2.12.2~svn23232/CMakeLists.txt
-@@ -129,6 +129,7 @@ set(GMSH_API
+--- gmsh-tetgen-2.12.2~svn23298.orig/CMakeLists.txt
++++ gmsh-tetgen-2.12.2~svn23298/CMakeLists.txt
+@@ -130,6 +130,7 @@ set(GMSH_API
Mesh/meshGFaceElliptic.h Mesh/meshPartition.h Mesh/meshGFaceDelaunayInsertion.h
Mesh/simple3D.h Mesh/meshPartitionOptions.h Mesh/directions3D.h Mesh/yamakawa.h
Mesh/Voronoi3D.h Mesh/Levy3D.h Mesh/periodical.h Mesh/meshMetric.h Mesh/ThinLayer.h
@@ -15,7 +15,7 @@
Numeric/mathEvaluator.h
Solver/dofManager.h Solver/femTerm.h Solver/laplaceTerm.h Solver/elasticityTerm.h
Solver/crossConfTerm.h Solver/orthogonalTerm.h
-@@ -140,6 +141,7 @@ set(GMSH_API
+@@ -141,6 +142,7 @@ set(GMSH_API
Post/PViewDataList.h Post/PViewDataGModel.h Post/PViewOptions.h Post/ColorTable.h
Numeric/nodalBasis.h Post/adaptiveData.h
Graphics/drawContext.h
Modified: packages/gmsh-tetgen/trunk/debian/patches/change_shared_library_name.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/change_shared_library_name.patch?rev=47317&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/change_shared_library_name.patch (original)
+++ packages/gmsh-tetgen/trunk/debian/patches/change_shared_library_name.patch Mon Jul 11 07:29:45 2016
@@ -2,10 +2,10 @@
Author: Anton Gladky <gladky.anton at gmail.com>
Last-Update: 2012-11-28
-Index: gmsh-tetgen-2.12.2~svn23232/wrappers/java/CMakeLists.txt
+Index: gmsh-tetgen-2.12.2~svn23298/wrappers/java/CMakeLists.txt
===================================================================
---- gmsh-tetgen-2.12.2~svn23232.orig/wrappers/java/CMakeLists.txt
-+++ gmsh-tetgen-2.12.2~svn23232/wrappers/java/CMakeLists.txt
+--- gmsh-tetgen-2.12.2~svn23298.orig/wrappers/java/CMakeLists.txt
++++ gmsh-tetgen-2.12.2~svn23298/wrappers/java/CMakeLists.txt
@@ -34,7 +34,11 @@ if(WIN32)
set_target_properties(WrapGmsh PROPERTIES PREFIX "")
endif(WIN32)
@@ -19,11 +19,11 @@
endif(UNIX)
add_custom_command(TARGET WrapGmsh
POST_BUILD # do the rest of the command after the build period
-Index: gmsh-tetgen-2.12.2~svn23232/CMakeLists.txt
+Index: gmsh-tetgen-2.12.2~svn23298/CMakeLists.txt
===================================================================
---- gmsh-tetgen-2.12.2~svn23232.orig/CMakeLists.txt
-+++ gmsh-tetgen-2.12.2~svn23232/CMakeLists.txt
-@@ -1448,7 +1448,7 @@ endforeach(DIR)
+--- gmsh-tetgen-2.12.2~svn23298.orig/CMakeLists.txt
++++ gmsh-tetgen-2.12.2~svn23298/CMakeLists.txt
+@@ -1459,7 +1459,7 @@ endforeach(DIR)
# static library target
if(ENABLE_BUILD_LIB)
add_library(lib STATIC ${GMSH_SRC})
@@ -32,7 +32,7 @@
if(MSVC)
set_target_properties(lib PROPERTIES DEBUG_POSTFIX d)
if(ENABLE_MSVC_STATIC_RUNTIME)
-@@ -1475,7 +1475,7 @@ endif(ENABLE_BUILD_ANDROID)
+@@ -1486,7 +1486,7 @@ endif(ENABLE_BUILD_ANDROID)
if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC OR
ENABLE_WRAP_PYTHON OR ENABLE_WRAP_JAVA)
add_library(shared SHARED ${GMSH_SRC})
Modified: packages/gmsh-tetgen/trunk/debian/patches/clang.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/clang.patch?rev=47317&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/clang.patch (original)
+++ packages/gmsh-tetgen/trunk/debian/patches/clang.patch Mon Jul 11 07:29:45 2016
@@ -1,8 +1,8 @@
-Index: gmsh-tetgen-2.12.2~svn23232/CMakeLists.txt
+Index: gmsh-tetgen-2.12.2~svn23298/CMakeLists.txt
===================================================================
---- gmsh-tetgen-2.12.2~svn23232.orig/CMakeLists.txt
-+++ gmsh-tetgen-2.12.2~svn23232/CMakeLists.txt
-@@ -713,13 +713,15 @@ endif(ENABLE_MATHEX)
+--- gmsh-tetgen-2.12.2~svn23298.orig/CMakeLists.txt
++++ gmsh-tetgen-2.12.2~svn23298/CMakeLists.txt
+@@ -714,13 +714,15 @@ endif(ENABLE_MATHEX)
if(ENABLE_MPI)
find_package(MPI)
if(MPI_FOUND)
Modified: packages/gmsh-tetgen/trunk/debian/patches/delete_gl2ps_from_source.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/delete_gl2ps_from_source.patch?rev=47317&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/delete_gl2ps_from_source.patch (original)
+++ packages/gmsh-tetgen/trunk/debian/patches/delete_gl2ps_from_source.patch Mon Jul 11 07:29:45 2016
@@ -2,10 +2,10 @@
Author: Anton Gladky <gladky.anton at gmail.com>, Julian Taylor <jtaylor.debian at googlemail.com>
Last-Update: 2011-12-09
-Index: gmsh-tetgen-2.12.2~svn23232/Graphics/CMakeLists.txt
+Index: gmsh-tetgen-2.12.2~svn23298/Graphics/CMakeLists.txt
===================================================================
---- gmsh-tetgen-2.12.2~svn23232.orig/Graphics/CMakeLists.txt
-+++ gmsh-tetgen-2.12.2~svn23232/Graphics/CMakeLists.txt
+--- gmsh-tetgen-2.12.2~svn23298.orig/Graphics/CMakeLists.txt
++++ gmsh-tetgen-2.12.2~svn23298/Graphics/CMakeLists.txt
@@ -15,7 +15,6 @@ set(SRC
drawScales.cpp
drawGraph2d.cpp
@@ -14,11 +14,11 @@
gl2gif.cpp
gl2jpeg.cpp
gl2png.cpp
-Index: gmsh-tetgen-2.12.2~svn23232/CMakeLists.txt
+Index: gmsh-tetgen-2.12.2~svn23298/CMakeLists.txt
===================================================================
---- gmsh-tetgen-2.12.2~svn23232.orig/CMakeLists.txt
-+++ gmsh-tetgen-2.12.2~svn23232/CMakeLists.txt
-@@ -1509,7 +1509,7 @@ else(HAVE_FLTK)
+--- gmsh-tetgen-2.12.2~svn23298.orig/CMakeLists.txt
++++ gmsh-tetgen-2.12.2~svn23298/CMakeLists.txt
+@@ -1520,7 +1520,7 @@ else(HAVE_FLTK)
add_executable(gmsh Common/Main.cpp ${GMSH_SRC})
endif(ENABLE_BUILD_DYNAMIC)
endif(HAVE_FLTK)
Modified: packages/gmsh-tetgen/trunk/debian/patches/fix-cmake-hdf5.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/fix-cmake-hdf5.patch?rev=47317&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/fix-cmake-hdf5.patch (original)
+++ packages/gmsh-tetgen/trunk/debian/patches/fix-cmake-hdf5.patch Mon Jul 11 07:29:45 2016
@@ -2,11 +2,11 @@
Author: Gilles Filippini <pini at debian.org>
Last-Update: 2014-07-25
-Index: gmsh-tetgen-2.12.2~svn23232/CMakeLists.txt
+Index: gmsh-tetgen-2.12.2~svn23298/CMakeLists.txt
===================================================================
---- gmsh-tetgen-2.12.2~svn23232.orig/CMakeLists.txt
-+++ gmsh-tetgen-2.12.2~svn23232/CMakeLists.txt
-@@ -832,8 +832,10 @@ if(ENABLE_FOURIER_MODEL)
+--- gmsh-tetgen-2.12.2~svn23298.orig/CMakeLists.txt
++++ gmsh-tetgen-2.12.2~svn23298/CMakeLists.txt
+@@ -833,8 +833,10 @@ if(ENABLE_FOURIER_MODEL)
endif(ENABLE_FOURIER_MODEL)
if(ENABLE_MED OR ENABLE_CGNS)
@@ -19,7 +19,7 @@
if(ENABLE_MED)
find_library(MED_LIB med)
if(MED_LIB)
-@@ -868,9 +870,9 @@ if(ENABLE_MED OR ENABLE_CGNS)
+@@ -869,9 +871,9 @@ if(ENABLE_MED OR ENABLE_CGNS)
endif(ZLIB_FOUND)
endif(NOT HAVE_LIBZ)
endif(MED_LIB OR CGNS_LIB)
Modified: 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=47317&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/fix-cmake.patch (original)
+++ packages/gmsh-tetgen/trunk/debian/patches/fix-cmake.patch Mon Jul 11 07:29:45 2016
@@ -23,11 +23,29 @@
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: <YYYY-MM-DD>
-Index: gmsh-tetgen-2.12.2~svn23232/CMakeLists.txt
+Index: gmsh-tetgen-2.12.2~svn23298/CMakeLists.txt
===================================================================
---- gmsh-tetgen-2.12.2~svn23232.orig/CMakeLists.txt
-+++ gmsh-tetgen-2.12.2~svn23232/CMakeLists.txt
-@@ -1248,11 +1248,11 @@ if(HAVE_PYTHON)
+--- gmsh-tetgen-2.12.2~svn23298.orig/CMakeLists.txt
++++ gmsh-tetgen-2.12.2~svn23298/CMakeLists.txt
+@@ -1016,7 +1016,7 @@ if(HAVE_SOLVER)
+ message(STATUS "Using PETSC_LIBS : ${PETSC_LIBS}")
+ # petsc 3.1 creates only one library (libpetsc)
+ if(NOT PETSC_LIBS)
+- find_library(PETSC_LIBS petsc PATHS ${ENV_PETSC_DIR}/${ENV_PETSC_ARCH}/lib
++ find_library(PETSC_LIBS petsc_real PATHS ${ENV_PETSC_DIR}/${ENV_PETSC_ARCH}/lib
+ NO_DEFAULT_PATH)
+ message(STATUS "Using PETSC_LIBS : ${PETSC_LIBS}")
+ endif(NOT PETSC_LIBS)
+@@ -1041,7 +1041,7 @@ if(HAVE_SOLVER)
+ ${ENV_SLEPC_DIR}/${ENV_PETSC_ARCH}/lib "")
+ message(STATUS "Using SLEPC_LIBS : ${SLEPC_LIBS}")
+ if(NOT SLEPC_LIBS)
+- find_library(SLEPC_LIBS slepc PATHS ${ENV_SLEPC_DIR}/${ENV_PETSC_ARCH}/lib
++ find_library(SLEPC_LIBS slepc_real PATHS ${ENV_SLEPC_DIR}/${ENV_PETSC_ARCH}/lib
+ NO_DEFAULT_PATH)
+ message(STATUS "Using SLEPC_LIB : ${SLEPC_LIBS}")
+ endif(NOT SLEPC_LIBS)
+@@ -1259,11 +1259,11 @@ if(HAVE_PYTHON)
endif(ENABLE_NUMPY)
if(HAVE_PETSC)
if(ENABLE_PETSC4PY)
@@ -43,7 +61,7 @@
OUTPUT_STRIP_TRAILING_WHITESPACE
)
if(PETSC4PY_INC)
-@@ -1315,7 +1315,7 @@ endif(WIN32 OR CYGWIN)
+@@ -1326,7 +1326,7 @@ endif(WIN32 OR CYGWIN)
# force full warnings to encourage everybody to write clean(er) code
check_cxx_compiler_flag("-Wall" WALL)
Modified: packages/gmsh-tetgen/trunk/debian/patches/fix_FTBFS_linking.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/fix_FTBFS_linking.patch?rev=47317&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/fix_FTBFS_linking.patch (original)
+++ packages/gmsh-tetgen/trunk/debian/patches/fix_FTBFS_linking.patch Mon Jul 11 07:29:45 2016
@@ -2,11 +2,11 @@
Author: Anton Gladky <gladky.anton at gmail.com>
Last-Update: 2012-04-08
-Index: gmsh-tetgen-2.12.2~svn23232/CMakeLists.txt
+Index: gmsh-tetgen-2.12.2~svn23298/CMakeLists.txt
===================================================================
---- gmsh-tetgen-2.12.2~svn23232.orig/CMakeLists.txt
-+++ gmsh-tetgen-2.12.2~svn23232/CMakeLists.txt
-@@ -1486,7 +1486,7 @@ if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_D
+--- gmsh-tetgen-2.12.2~svn23298.orig/CMakeLists.txt
++++ gmsh-tetgen-2.12.2~svn23298/CMakeLists.txt
+@@ -1497,7 +1497,7 @@ if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_D
message(STATUS "Note: By enabling ENABLE_MSVC_STATIC_RUNTIME, shared library "
"won't link. In MSVC change /MT to /MD in the shared project properties")
endif(MSVC AND ENABLE_MSVC_STATIC_RUNTIME)
Modified: packages/gmsh-tetgen/trunk/debian/patches/fix_libdir.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/fix_libdir.patch?rev=47317&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/fix_libdir.patch (original)
+++ packages/gmsh-tetgen/trunk/debian/patches/fix_libdir.patch Mon Jul 11 07:29:45 2016
@@ -2,10 +2,10 @@
Author: Anton Gladky <gladk at debian.org>
Last-Update: 2013-03-15
-Index: gmsh-tetgen-2.12.2~svn23232/wrappers/java/CMakeLists.txt
+Index: gmsh-tetgen-2.12.2~svn23298/wrappers/java/CMakeLists.txt
===================================================================
---- gmsh-tetgen-2.12.2~svn23232.orig/wrappers/java/CMakeLists.txt
-+++ gmsh-tetgen-2.12.2~svn23232/wrappers/java/CMakeLists.txt
+--- gmsh-tetgen-2.12.2~svn23298.orig/wrappers/java/CMakeLists.txt
++++ gmsh-tetgen-2.12.2~svn23298/wrappers/java/CMakeLists.txt
@@ -73,6 +73,6 @@ POST_BUILD # do the rest of the command
COMMAND ${CMAKE_COMMAND} -E copy
${CMAKE_CURRENT_SOURCE_DIR}/WrappingJava/build.xml
@@ -15,11 +15,11 @@
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/WrappingJava/WrapGmsh.jar
- DESTINATION lib)
+ DESTINATION ${INSTALL_LIB_DIR})
-Index: gmsh-tetgen-2.12.2~svn23232/CMakeLists.txt
+Index: gmsh-tetgen-2.12.2~svn23298/CMakeLists.txt
===================================================================
---- gmsh-tetgen-2.12.2~svn23232.orig/CMakeLists.txt
-+++ gmsh-tetgen-2.12.2~svn23232/CMakeLists.txt
-@@ -1630,7 +1630,7 @@ endif(WIN32 OR CYGWIN)
+--- gmsh-tetgen-2.12.2~svn23298.orig/CMakeLists.txt
++++ gmsh-tetgen-2.12.2~svn23298/CMakeLists.txt
+@@ -1648,7 +1648,7 @@ endif(WIN32 OR CYGWIN)
# (e.g. "make lib" or "make shared" followed by "make install/fast")
install(TARGETS gmsh DESTINATION ${GMSH_BIN} OPTIONAL)
if(ENABLE_BUILD_LIB)
@@ -28,7 +28,7 @@
endif(ENABLE_BUILD_LIB)
if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC)
if(WIN32 AND NOT MSVC OR CYGWIN)
-@@ -1666,7 +1666,7 @@ if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_D
+@@ -1684,7 +1684,7 @@ if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_D
install(FILES ${GCC_DLL} ${STDC_DLL} DESTINATION ${GMSH_LIB})
endif(GCC_DLL AND STDC_DLL)
else(WIN32 AND NOT MSVC OR CYGWIN)
Modified: packages/gmsh-tetgen/trunk/debian/patches/fix_script_header.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/fix_script_header.patch?rev=47317&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/fix_script_header.patch (original)
+++ packages/gmsh-tetgen/trunk/debian/patches/fix_script_header.patch Mon Jul 11 07:29:45 2016
@@ -2,10 +2,10 @@
Author: Anton Gladky <gladk at debian.org>
Last-Update: 2013-05-12
-Index: gmsh-tetgen-2.12.0/contrib/onelab/python/onelab.py
+Index: gmsh-tetgen-2.12.2~svn23298/contrib/onelab/python/onelab.py
===================================================================
---- gmsh-tetgen-2.12.0.orig/contrib/onelab/python/onelab.py
-+++ gmsh-tetgen-2.12.0/contrib/onelab/python/onelab.py
+--- gmsh-tetgen-2.12.2~svn23298.orig/contrib/onelab/python/onelab.py
++++ gmsh-tetgen-2.12.2~svn23298/contrib/onelab/python/onelab.py
@@ -1,3 +1,4 @@
+#!/usr/bin/env python
"""
Modified: packages/gmsh-tetgen/trunk/debian/patches/med.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/med.patch?rev=47317&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/med.patch (original)
+++ packages/gmsh-tetgen/trunk/debian/patches/med.patch Mon Jul 11 07:29:45 2016
@@ -1,8 +1,8 @@
-Index: gmsh-tetgen-2.12.2~svn23232/CMakeLists.txt
+Index: gmsh-tetgen-2.12.2~svn23298/CMakeLists.txt
===================================================================
---- gmsh-tetgen-2.12.2~svn23232.orig/CMakeLists.txt
-+++ gmsh-tetgen-2.12.2~svn23232/CMakeLists.txt
-@@ -840,6 +840,10 @@ if(ENABLE_MED OR ENABLE_CGNS)
+--- gmsh-tetgen-2.12.2~svn23298.orig/CMakeLists.txt
++++ gmsh-tetgen-2.12.2~svn23298/CMakeLists.txt
+@@ -841,6 +841,10 @@ if(ENABLE_MED OR ENABLE_CGNS)
set_config_option(HAVE_MED "Med")
list(APPEND EXTERNAL_LIBRARIES ${MED_LIB})
endif(MED_LIB)
@@ -13,7 +13,7 @@
endif(ENABLE_MED)
if(ENABLE_CGNS)
find_library(CGNS_LIB cgns PATHS ENV CGNS_ROOT PATH_SUFFIXES lib)
-@@ -1870,7 +1874,7 @@ message(STATUS "")
+@@ -1888,7 +1892,7 @@ message(STATUS "")
mark_as_advanced(GMSH_EXTRA_VERSION
ACIS_LIB ANN_INC ANN_LIB CAIRO_LIB CAIRO_INC CGNS_INC GMM_INC
GMP_INC GMP_LIB MMG3D_INC MMG3D_LIB HDF5_LIB
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=47317&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/petsc.patch (original)
+++ packages/gmsh-tetgen/trunk/debian/patches/petsc.patch Mon Jul 11 07:29:45 2016
@@ -1,8 +1,8 @@
-Index: gmsh-tetgen-2.12.2~svn23232/CMakeLists.txt
+Index: gmsh-tetgen-2.12.2~svn23298/CMakeLists.txt
===================================================================
---- gmsh-tetgen-2.12.2~svn23232.orig/CMakeLists.txt
-+++ gmsh-tetgen-2.12.2~svn23232/CMakeLists.txt
-@@ -998,13 +998,26 @@ if(HAVE_SOLVER)
+--- gmsh-tetgen-2.12.2~svn23298.orig/CMakeLists.txt
++++ gmsh-tetgen-2.12.2~svn23298/CMakeLists.txt
+@@ -999,13 +999,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")
-@@ -1022,15 +1035,22 @@ if(HAVE_SOLVER)
+@@ -1023,15 +1036,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)
-@@ -1038,7 +1058,7 @@ if(HAVE_SOLVER)
+@@ -1039,7 +1059,7 @@ if(HAVE_SOLVER)
list(APPEND EXTERNAL_INCLUDES ${SLEPC_INC2})
endif(SLEPC_INC2)
endif(SLEPC_INC)
Modified: 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=47317&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/python-cmake.patch (original)
+++ packages/gmsh-tetgen/trunk/debian/patches/python-cmake.patch Mon Jul 11 07:29:45 2016
@@ -23,11 +23,11 @@
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: <YYYY-MM-DD>
-Index: gmsh-tetgen-2.12.2~svn23232/CMakeLists.txt
+Index: gmsh-tetgen-2.12.2~svn23298/CMakeLists.txt
===================================================================
---- gmsh-tetgen-2.12.2~svn23232.orig/CMakeLists.txt
-+++ gmsh-tetgen-2.12.2~svn23232/CMakeLists.txt
-@@ -1221,6 +1221,8 @@ endif(ENABLE_ZIPPER)
+--- gmsh-tetgen-2.12.2~svn23298.orig/CMakeLists.txt
++++ gmsh-tetgen-2.12.2~svn23298/CMakeLists.txt
+@@ -1232,6 +1232,8 @@ endif(ENABLE_ZIPPER)
if(ENABLE_WRAP_PYTHON)
find_package(SWIG)
find_package(PythonLibs)
Modified: packages/gmsh-tetgen/trunk/debian/patches/sgeom.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/sgeom.patch?rev=47317&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/sgeom.patch (original)
+++ packages/gmsh-tetgen/trunk/debian/patches/sgeom.patch Mon Jul 11 07:29:45 2016
@@ -1,8 +1,8 @@
-Index: gmsh-tetgen-2.12.2~svn23232/CMakeLists.txt
+Index: gmsh-tetgen-2.12.2~svn23298/CMakeLists.txt
===================================================================
---- gmsh-tetgen-2.12.2~svn23232.orig/CMakeLists.txt
-+++ gmsh-tetgen-2.12.2~svn23232/CMakeLists.txt
-@@ -1107,8 +1107,8 @@ if(ENABLE_OCC)
+--- gmsh-tetgen-2.12.2~svn23298.orig/CMakeLists.txt
++++ gmsh-tetgen-2.12.2~svn23298/CMakeLists.txt
+@@ -1118,8 +1118,8 @@ if(ENABLE_OCC)
# For SGEOM
TKBin TKBinL TKBinTObj TKBinXCAF TKCAF TKCDF TKLCAF TKPLCAF TKMeshVS
TKNIS TKOpenGl TKPCAF TKPShape TKSTL TKService TKShapeSchema TKStdSchema
Modified: packages/gmsh-tetgen/trunk/debian/patches/skip_license_file.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/skip_license_file.patch?rev=47317&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/skip_license_file.patch (original)
+++ packages/gmsh-tetgen/trunk/debian/patches/skip_license_file.patch Mon Jul 11 07:29:45 2016
@@ -2,11 +2,11 @@
Author: Anton Gladky <gladky.anton at gmail.com>
Last-Update: 2011-12-09
-Index: gmsh-tetgen-2.12.2~svn23232/CMakeLists.txt
+Index: gmsh-tetgen-2.12.2~svn23298/CMakeLists.txt
===================================================================
---- gmsh-tetgen-2.12.2~svn23232.orig/CMakeLists.txt
-+++ gmsh-tetgen-2.12.2~svn23232/CMakeLists.txt
-@@ -1561,7 +1561,7 @@ if(UNIX)
+--- gmsh-tetgen-2.12.2~svn23298.orig/CMakeLists.txt
++++ gmsh-tetgen-2.12.2~svn23298/CMakeLists.txt
+@@ -1579,7 +1579,7 @@ if(UNIX)
endif(UNIX)
set(WELCOME_FILE ${CMAKE_CURRENT_SOURCE_DIR}/doc/WELCOME.txt)
@@ -15,7 +15,7 @@
set(CREDITS_FILE ${CMAKE_CURRENT_SOURCE_DIR}/doc/CREDITS.txt)
set(ONELAB_PY ${CMAKE_CURRENT_SOURCE_DIR}/contrib/onelab/python/onelab.py)
file(GLOB TUTORIAL_FILES ${CMAKE_CURRENT_SOURCE_DIR}/tutorial/?*.*)
-@@ -1728,7 +1728,7 @@ execute_process(COMMAND ${CMAKE_COMMAND}
+@@ -1746,7 +1746,7 @@ execute_process(COMMAND ${CMAKE_COMMAND}
if(MAKEINFO AND TEXI2PDF)
add_custom_target(doc COMMAND ${CMAKE_COMMAND} -E tar zcf
${CMAKE_CURRENT_BINARY_DIR}/gmsh-${GMSH_VERSION}-doc.tgz
Modified: packages/gmsh-tetgen/trunk/debian/patches/tetgen.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/tetgen.patch?rev=47317&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/tetgen.patch (original)
+++ packages/gmsh-tetgen/trunk/debian/patches/tetgen.patch Mon Jul 11 07:29:45 2016
@@ -1,8 +1,8 @@
-Index: gmsh-tetgen-2.12.2~svn23232/CMakeLists.txt
+Index: gmsh-tetgen-2.12.2~svn23298/CMakeLists.txt
===================================================================
---- gmsh-tetgen-2.12.2~svn23232.orig/CMakeLists.txt
-+++ gmsh-tetgen-2.12.2~svn23232/CMakeLists.txt
-@@ -798,20 +798,24 @@ if(HAVE_MESH)
+--- gmsh-tetgen-2.12.2~svn23298.orig/CMakeLists.txt
++++ gmsh-tetgen-2.12.2~svn23298/CMakeLists.txt
+@@ -799,20 +799,24 @@ if(HAVE_MESH)
set_config_option(HAVE_MMG3D "Mmg3d")
endif(ENABLE_MMG3D)
Modified: packages/gmsh-tetgen/trunk/debian/patches/tmp_fix_openfile.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/tmp_fix_openfile.patch?rev=47317&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/tmp_fix_openfile.patch (original)
+++ packages/gmsh-tetgen/trunk/debian/patches/tmp_fix_openfile.patch Mon Jul 11 07:29:45 2016
@@ -23,11 +23,11 @@
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: <YYYY-MM-DD>
-Index: gmsh-tetgen-2.12.2~svn23232/CMakeLists.txt
+Index: gmsh-tetgen-2.12.2~svn23298/CMakeLists.txt
===================================================================
---- gmsh-tetgen-2.12.2~svn23232.orig/CMakeLists.txt
-+++ gmsh-tetgen-2.12.2~svn23232/CMakeLists.txt
-@@ -569,6 +569,10 @@ if(ENABLE_BUILD_IOS)
+--- gmsh-tetgen-2.12.2~svn23298.orig/CMakeLists.txt
++++ gmsh-tetgen-2.12.2~svn23298/CMakeLists.txt
+@@ -570,6 +570,10 @@ if(ENABLE_BUILD_IOS)
endif(NOT CMAKE_TOOLCHAIN_FILE)
endif(ENABLE_BUILD_IOS)
@@ -38,7 +38,7 @@
if(HAVE_FLTK OR HAVE_QT OR ENABLE_GRAPHICS)
if(NOT HAVE_MESH OR NOT HAVE_POST OR NOT HAVE_PLUGINS OR NOT HAVE_ONELAB)
message(SEND_ERROR "Cannot compile GUI without Mesh, Post, Plugin and ONELAB")
-@@ -1265,6 +1269,7 @@ if(HAVE_PYTHON)
+@@ -1276,6 +1280,7 @@ if(HAVE_PYTHON)
endif(HAVE_PETSC)
endif(HAVE_PYTHON)
@@ -46,10 +46,10 @@
check_function_exists(vsnprintf HAVE_VSNPRINTF)
if(NOT HAVE_VSNPRINTF AND NOT ENABLE_BUILD_IOS AND NOT ENABLE_BUILD_ANDROID)
set_config_option(HAVE_NO_VSNPRINTF "NoVsnprintf")
-Index: gmsh-tetgen-2.12.2~svn23232/Common/GmshConfig.h.in
+Index: gmsh-tetgen-2.12.2~svn23298/Common/GmshConfig.h.in
===================================================================
---- gmsh-tetgen-2.12.2~svn23232.orig/Common/GmshConfig.h.in
-+++ gmsh-tetgen-2.12.2~svn23232/Common/GmshConfig.h.in
+--- gmsh-tetgen-2.12.2~svn23298.orig/Common/GmshConfig.h.in
++++ gmsh-tetgen-2.12.2~svn23298/Common/GmshConfig.h.in
@@ -25,6 +25,7 @@
#cmakedefine HAVE_KBIPACK
#cmakedefine HAVE_LAPACK
Modified: packages/gmsh-tetgen/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/rules?rev=47317&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/rules (original)
+++ packages/gmsh-tetgen/trunk/debian/rules Mon Jul 11 07:29:45 2016
@@ -52,9 +52,9 @@
endif
# PETSC_DIR is the location of PETSc.
-export PETSC_DIR=/usr/lib/petscdir/3.6.3
+export PETSC_DIR=/usr/lib/petscdir/3.6.4
export PETSC_ARCH=linux-gnu-c-opt
-export SLEPC_DIR=/usr/lib/slepcdir/3.6.2
+export SLEPC_DIR=/usr/lib/slepcdir/3.6.3
override_dh_auto_clean:
rm -rf $(BUILDDIR)
@@ -100,8 +100,8 @@
cd test-dir; $(BUILDDIR)/gmsh transfinite.geo -3 -o transfinite3d.msh
cd test-dir; $(BUILDDIR)/gmsh transfinite.geo -2 -o transfinite2d.stl
cd test-dir; $(BUILDDIR)/gmsh transfinite.geo -3 -o transfinite3d.stl
- cd test-dir; ls -ln;
- ldd $(BUILDDIR)/gmsh | grep ptesmumps
+ # cd test-dir; ls -ln;
+ # ldd $(BUILDDIR)/gmsh | grep ptesmumps
rm -rf test-dir
override_dh_shlibdeps:
More information about the debian-science-commits
mailing list