r46477 - in /packages/gmsh-tetgen/trunk/debian/patches: add-missing-headers.patch fix_libdir.patch netgen.patch

trophime-guest at users.alioth.debian.org trophime-guest at users.alioth.debian.org
Mon Jan 27 16:31:38 UTC 2014 

Author: trophime-guest
Date: Mon Jan 27 16:31:38 2014
New Revision: 46477

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

Modified:
    packages/gmsh-tetgen/trunk/debian/patches/add-missing-headers.patch
    packages/gmsh-tetgen/trunk/debian/patches/fix_libdir.patch
    packages/gmsh-tetgen/trunk/debian/patches/netgen.patch

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=46477&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/add-missing-headers.patch	(original)
+++ packages/gmsh-tetgen/trunk/debian/patches/add-missing-headers.patch	Mon Jan 27 16:31:38 2014
@@ -3,40 +3,31 @@
 Reviewed-by: Anton Gladky <gladky.anton at gmail.com>
 Last-Update: 2012-06-24
 
-Index: gmsh-tetgen-2.8.3~svn16711/CMakeLists.txt
+Index: gmsh-tetgen-2.8.3~svn17531/CMakeLists.txt
 ===================================================================
---- gmsh-tetgen-2.8.3~svn16711.orig/CMakeLists.txt	2013-09-13 18:34:18.000000000 +0200
-+++ gmsh-tetgen-2.8.3~svn16711/CMakeLists.txt	2013-09-13 18:34:18.000000000 +0200
-@@ -99,11 +99,12 @@
-   ${CMAKE_CURRENT_BINARY_DIR}/Common/GmshVersion.h
-   Common/Gmsh.h Common/Context.h Common/GmshDefines.h Common/GmshMessage.h
+--- gmsh-tetgen-2.8.3~svn17531.orig/CMakeLists.txt	2014-01-27 17:29:47.449822326 +0100
++++ gmsh-tetgen-2.8.3~svn17531/CMakeLists.txt	2014-01-27 17:29:47.449822326 +0100
+@@ -103,6 +103,7 @@
      Common/VertexArray.h Common/Octree.h Common/OctreeInternals.h 
--    Common/OS.h Common/StringUtils.h Common/OpenFile.h
-+    Common/OS.h Common/Options.h Common/StringUtils.h Common/OpenFile.h
+     Common/OS.h Common/StringUtils.h Common/OpenFile.h
      Common/onelab.h Common/GmshSocket.h Common/onelabUtils.h
++    Common/Options.h
    Numeric/Numeric.h Numeric/GaussIntegration.h Numeric/polynomialBasis.h
      Numeric/JacobianBasis.h Numeric/bezierBasis.h Numeric/fullMatrix.h
      Numeric/simpleFunction.h Numeric/cartesian.h Numeric/ElementType.h
-+    Numeric/mathEvaluator.h Numeric/nodalBasis.h
-   Geo/GModel.h Geo/GEntity.h Geo/GPoint.h Geo/GVertex.h Geo/GEdge.h 
-     Geo/GFace.h Geo/GRegion.h Geo/GEdgeLoop.h Geo/GEdgeCompound.h 
-     Geo/GFaceCompound.h Geo/GRegionCompound.h Geo/GRbf.h Geo/MVertex.h
-@@ -120,7 +121,7 @@
+@@ -122,6 +123,7 @@
      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
--  Numeric/mathEvaluator.h
 +    Mesh/Field.h
+   Numeric/mathEvaluator.h
    Solver/dofManager.h Solver/femTerm.h Solver/laplaceTerm.h Solver/elasticityTerm.h
      Solver/crossConfTerm.h Solver/orthogonalTerm.h
-     Solver/linearSystem.h Solver/linearSystemGMM.h Solver/linearSystemCSR.h 
-@@ -128,8 +129,8 @@
-     Solver/groupOfElements.h Solver/linearSystemPETSc.h
-   Post/PView.h Post/PViewData.h Plugin/PluginManager.h Post/OctreePost.h 
-   Post/PViewDataGModel.h Post/PViewOptions.h Post/ColorTable.h
--   Numeric/nodalBasis.h
+@@ -132,6 +134,7 @@
+   Post/PViewDataList.h Post/PViewDataGModel.h Post/PViewOptions.h Post/ColorTable.h
+    Numeric/nodalBasis.h
    Graphics/drawContext.h
-+    Graphics/Camera.h Graphics/Trackball.h
++   Graphics/Camera.h Graphics/Trackball.h
    contrib/kbipack/gmp_normal_form.h contrib/kbipack/gmp_matrix.h 
      contrib/kbipack/gmp_blas.h contrib/kbipack/mpz.h
    contrib/DiscreteIntegration/Integration3D.h

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=46477&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/fix_libdir.patch	(original)
+++ packages/gmsh-tetgen/trunk/debian/patches/fix_libdir.patch	Mon Jan 27 16:31:38 2014
@@ -2,10 +2,10 @@
 Author: Anton Gladky <gladk at debian.org>
 Last-Update: 2013-03-15
 
-Index: gmsh-tetgen-2.8.4~svn16803/wrappers/java/CMakeLists.txt
+Index: gmsh-tetgen-2.8.3~svn17531/wrappers/java/CMakeLists.txt
 ===================================================================
---- gmsh-tetgen-2.8.4~svn16803.orig/wrappers/java/CMakeLists.txt	2013-09-28 09:37:55.000000000 +0200
-+++ gmsh-tetgen-2.8.4~svn16803/wrappers/java/CMakeLists.txt	2013-09-28 09:37:55.000000000 +0200
+--- gmsh-tetgen-2.8.3~svn17531.orig/wrappers/java/CMakeLists.txt	2014-01-27 17:30:15.395116161 +0100
++++ gmsh-tetgen-2.8.3~svn17531/wrappers/java/CMakeLists.txt	2014-01-27 17:30:15.391115963 +0100
 @@ -73,6 +73,6 @@
    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.8.4~svn16803/CMakeLists.txt
+Index: gmsh-tetgen-2.8.3~svn17531/CMakeLists.txt
 ===================================================================
---- gmsh-tetgen-2.8.4~svn16803.orig/CMakeLists.txt	2013-09-28 09:37:55.000000000 +0200
-+++ gmsh-tetgen-2.8.4~svn16803/CMakeLists.txt	2013-09-28 09:37:55.000000000 +0200
-@@ -1347,7 +1347,7 @@
+--- gmsh-tetgen-2.8.3~svn17531.orig/CMakeLists.txt	2014-01-27 17:30:15.395116161 +0100
++++ gmsh-tetgen-2.8.3~svn17531/CMakeLists.txt	2014-01-27 17:30:15.395116161 +0100
+@@ -1428,7 +1428,7 @@
  # (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)
-@@ -1383,7 +1383,7 @@
+@@ -1464,7 +1464,7 @@
        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/netgen.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/netgen.patch?rev=46477&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/netgen.patch	(original)
+++ packages/gmsh-tetgen/trunk/debian/patches/netgen.patch	Mon Jan 27 16:31:38 2014
@@ -1,8 +1,8 @@
-Index: gmsh-tetgen-2.8.4~svn16803/CMakeLists.txt
+Index: gmsh-tetgen-2.8.3~svn17531/CMakeLists.txt
 ===================================================================
---- gmsh-tetgen-2.8.4~svn16803.orig/CMakeLists.txt	2013-09-28 09:38:07.000000000 +0200
-+++ gmsh-tetgen-2.8.4~svn16803/CMakeLists.txt	2013-09-28 09:38:07.000000000 +0200
-@@ -689,10 +689,30 @@
+--- gmsh-tetgen-2.8.3~svn17531.orig/CMakeLists.txt	2014-01-27 17:30:26.147613991 +0100
++++ gmsh-tetgen-2.8.3~svn17531/CMakeLists.txt	2014-01-27 17:30:26.147613991 +0100
+@@ -719,10 +719,30 @@
    endif(ENABLE_BLOSSOM)
  
    if(ENABLE_NETGEN)
@@ -35,7 +35,7 @@
      add_definitions(-DNO_PARALLEL_THREADS -DNOTCL)
    endif(ENABLE_NETGEN)
  
-@@ -994,12 +1014,17 @@
+@@ -1047,12 +1067,17 @@
        include_directories(contrib/SGEOM)
        add_definitions(-DSGEOMGEOMETRY)
        set_config_option(HAVE_SGEOM "SGEOM")
@@ -54,10 +54,10 @@
    endif(HAVE_OCC)
  endif(ENABLE_OCC)
  
-Index: gmsh-tetgen-2.8.4~svn16803/contrib/Netgen/CMakeLists.txt
+Index: gmsh-tetgen-2.8.3~svn17531/contrib/Netgen/CMakeLists.txt
 ===================================================================
---- gmsh-tetgen-2.8.4~svn16803.orig/contrib/Netgen/CMakeLists.txt	2013-09-28 09:38:07.000000000 +0200
-+++ gmsh-tetgen-2.8.4~svn16803/contrib/Netgen/CMakeLists.txt	2013-09-28 09:38:07.000000000 +0200
+--- gmsh-tetgen-2.8.3~svn17531.orig/contrib/Netgen/CMakeLists.txt	2014-01-27 17:30:26.147613991 +0100
++++ gmsh-tetgen-2.8.3~svn17531/contrib/Netgen/CMakeLists.txt	2014-01-27 17:30:26.147613991 +0100
 @@ -3,38 +3,42 @@
  # See the LICENSE.txt file for license information. Please report all
  # bugs and problems to the public mailing list <gmsh at geuz.org>.

More information about the debian-science-commits mailing list