r46321 - in /packages/gmsh-tetgen/trunk/debian/patches: api_demos.patch cgns.patch delete_gl2ps_from_source.patch fix_FTBFS_linking.patch fix_libdir.patch fix_script_header.patch fix_spelling_errors.patch metis.patch netgen.patch
trophime-guest at users.alioth.debian.org
trophime-guest at users.alioth.debian.org
Sat Sep 28 07:39:51 UTC 2013
Author: trophime-guest
Date: Sat Sep 28 07:39:51 2013
New Revision: 46321
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=46321
Log:
update patches for 2.8.3 version
Modified:
packages/gmsh-tetgen/trunk/debian/patches/api_demos.patch
packages/gmsh-tetgen/trunk/debian/patches/cgns.patch
packages/gmsh-tetgen/trunk/debian/patches/delete_gl2ps_from_source.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/fix_spelling_errors.patch
packages/gmsh-tetgen/trunk/debian/patches/metis.patch
packages/gmsh-tetgen/trunk/debian/patches/netgen.patch
Modified: packages/gmsh-tetgen/trunk/debian/patches/api_demos.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/api_demos.patch?rev=46321&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/api_demos.patch (original)
+++ packages/gmsh-tetgen/trunk/debian/patches/api_demos.patch Sat Sep 28 07:39:51 2013
@@ -1,7 +1,7 @@
-Index: gmsh-tetgen-2.8.2~svn16203/utils/api_demos/mainAntTweakBar.cpp
-===================================================================
---- gmsh-tetgen-2.8.2~svn16203.orig/utils/api_demos/mainAntTweakBar.cpp 2013-07-18 15:58:49.000000000 +0200
-+++ gmsh-tetgen-2.8.2~svn16203/utils/api_demos/mainAntTweakBar.cpp 2013-07-18 15:58:49.000000000 +0200
+Index: gmsh-tetgen-2.8.4~svn16803/utils/api_demos/mainAntTweakBar.cpp
+===================================================================
+--- gmsh-tetgen-2.8.4~svn16803.orig/utils/api_demos/mainAntTweakBar.cpp 2013-09-28 09:34:56.000000000 +0200
++++ gmsh-tetgen-2.8.4~svn16803/utils/api_demos/mainAntTweakBar.cpp 2013-09-28 09:34:56.000000000 +0200
@@ -14,6 +14,7 @@
#include "GModel.h"
#include "MElement.h"
@@ -10,10 +10,10 @@
static drawContext *ctx = 0;
static mousePosition clickPos, prevPos;
-Index: gmsh-tetgen-2.8.2~svn16203/utils/api_demos/mainOcc.cpp
-===================================================================
---- gmsh-tetgen-2.8.2~svn16203.orig/utils/api_demos/mainOcc.cpp 2013-07-18 15:58:49.000000000 +0200
-+++ gmsh-tetgen-2.8.2~svn16203/utils/api_demos/mainOcc.cpp 2013-07-18 15:58:49.000000000 +0200
+Index: gmsh-tetgen-2.8.4~svn16803/utils/api_demos/mainOcc.cpp
+===================================================================
+--- gmsh-tetgen-2.8.4~svn16803.orig/utils/api_demos/mainOcc.cpp 2013-09-28 09:34:56.000000000 +0200
++++ gmsh-tetgen-2.8.4~svn16803/utils/api_demos/mainOcc.cpp 2013-09-28 09:34:56.000000000 +0200
@@ -19,7 +19,7 @@
#include "MElement.h"
@@ -23,11 +23,11 @@
#endif
#include <TopoDS_Shape.hxx>
#include <BRep_Tool.hxx>
-Index: gmsh-tetgen-2.8.2~svn16203/utils/api_demos/CMakeLists.txt
-===================================================================
---- gmsh-tetgen-2.8.2~svn16203.orig/utils/api_demos/CMakeLists.txt 2013-07-18 15:58:49.000000000 +0200
-+++ gmsh-tetgen-2.8.2~svn16203/utils/api_demos/CMakeLists.txt 2013-07-18 15:58:49.000000000 +0200
-@@ -12,44 +12,79 @@
+Index: gmsh-tetgen-2.8.4~svn16803/utils/api_demos/CMakeLists.txt
+===================================================================
+--- gmsh-tetgen-2.8.4~svn16803.orig/utils/api_demos/CMakeLists.txt 2013-09-28 09:34:56.000000000 +0200
++++ gmsh-tetgen-2.8.4~svn16803/utils/api_demos/CMakeLists.txt 2013-09-28 09:34:56.000000000 +0200
+@@ -12,46 +12,81 @@
project(api_demos CXX)
add_subdirectory(../.. "${CMAKE_CURRENT_BINARY_DIR}/gmsh")
@@ -129,10 +129,12 @@
-target_link_libraries(mainSimple shared)
+target_link_libraries(mainSimple ${GMSH_EXTERNAL_LIBRARIES})
-Index: gmsh-tetgen-2.8.2~svn16203/utils/api_demos/mainCartesian.cpp
-===================================================================
---- gmsh-tetgen-2.8.2~svn16203.orig/utils/api_demos/mainCartesian.cpp 2013-07-18 15:58:49.000000000 +0200
-+++ gmsh-tetgen-2.8.2~svn16203/utils/api_demos/mainCartesian.cpp 2013-07-18 15:58:49.000000000 +0200
+ add_executable(mainGeoFactory mainGeoFactory.cpp)
+ target_link_libraries(mainGeoFactory shared)
+Index: gmsh-tetgen-2.8.4~svn16803/utils/api_demos/mainCartesian.cpp
+===================================================================
+--- gmsh-tetgen-2.8.4~svn16803.orig/utils/api_demos/mainCartesian.cpp 2013-09-28 09:34:56.000000000 +0200
++++ gmsh-tetgen-2.8.4~svn16803/utils/api_demos/mainCartesian.cpp 2013-09-28 09:34:56.000000000 +0200
@@ -12,7 +12,7 @@
#include "GmshMessage.h"
#include "cartesian.h"
@@ -240,10 +242,10 @@
Msg::Info("Removing cells outside the structure");
removeOutsideCells(&box);
-Index: gmsh-tetgen-2.8.2~svn16203/utils/api_demos/mainElasticity.cpp
-===================================================================
---- gmsh-tetgen-2.8.2~svn16203.orig/utils/api_demos/mainElasticity.cpp 2013-07-18 15:58:49.000000000 +0200
-+++ gmsh-tetgen-2.8.2~svn16203/utils/api_demos/mainElasticity.cpp 2013-07-18 15:58:49.000000000 +0200
+Index: gmsh-tetgen-2.8.4~svn16803/utils/api_demos/mainElasticity.cpp
+===================================================================
+--- gmsh-tetgen-2.8.4~svn16803.orig/utils/api_demos/mainElasticity.cpp 2013-09-28 09:34:56.000000000 +0200
++++ gmsh-tetgen-2.8.4~svn16803/utils/api_demos/mainElasticity.cpp 2013-09-28 09:34:56.000000000 +0200
@@ -3,6 +3,7 @@
#include "elasticitySolver.h"
#include "PView.h"
@@ -252,10 +254,10 @@
void Info (int i, char* c){
printf("%d %s\n",i,c);
-Index: gmsh-tetgen-2.8.2~svn16203/utils/api_demos/mainHomology.cpp
-===================================================================
---- gmsh-tetgen-2.8.2~svn16203.orig/utils/api_demos/mainHomology.cpp 2013-07-18 15:58:49.000000000 +0200
-+++ gmsh-tetgen-2.8.2~svn16203/utils/api_demos/mainHomology.cpp 2013-07-18 15:58:49.000000000 +0200
+Index: gmsh-tetgen-2.8.4~svn16803/utils/api_demos/mainHomology.cpp
+===================================================================
+--- gmsh-tetgen-2.8.4~svn16803.orig/utils/api_demos/mainHomology.cpp 2013-09-28 09:34:56.000000000 +0200
++++ gmsh-tetgen-2.8.4~svn16803/utils/api_demos/mainHomology.cpp 2013-09-28 09:34:56.000000000 +0200
@@ -8,6 +8,7 @@
#include <stdio.h>
@@ -264,10 +266,10 @@
#include "Gmsh.h"
#include "GModel.h"
#include "MElement.h"
-Index: gmsh-tetgen-2.8.2~svn16203/utils/api_demos/cmake/modules/FindGmsh.cmake
+Index: gmsh-tetgen-2.8.4~svn16803/utils/api_demos/cmake/modules/FindGmsh.cmake
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ gmsh-tetgen-2.8.2~svn16203/utils/api_demos/cmake/modules/FindGmsh.cmake 2013-07-18 15:58:49.000000000 +0200
++++ gmsh-tetgen-2.8.4~svn16803/utils/api_demos/cmake/modules/FindGmsh.cmake 2013-09-28 09:34:56.000000000 +0200
@@ -0,0 +1,119 @@
+# -*- mode: cmake -*-
+#
@@ -388,27 +390,27 @@
+
+
+
-Index: gmsh-tetgen-2.8.2~svn16203/utils/api_demos/cmake/modules/FindAnttweakbar.cmake
+Index: gmsh-tetgen-2.8.4~svn16803/utils/api_demos/cmake/modules/FindAnttweakbar.cmake
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ gmsh-tetgen-2.8.2~svn16203/utils/api_demos/cmake/modules/FindAnttweakbar.cmake 2013-07-18 15:58:49.000000000 +0200
++++ gmsh-tetgen-2.8.4~svn16803/utils/api_demos/cmake/modules/FindAnttweakbar.cmake 2013-09-28 09:36:05.000000000 +0200
@@ -0,0 +1,12 @@
+FIND_LIBRARY(ANTTWEAKBAR_LIB AntTweakBar PATHS /usr/lib /opt/local/lib $ENV{ANTTWEAKBAR_DIR}/lib)
+SET(ANTTWEAKBAR_LIBRARIES ${ANTTWEAKBAR_LIB} )
+
-+find_path(ANTTWEAKBAR_INCLUDE_DIR
++find_path(ANTTWEAKBAR_INCLUDE_DIR
+ AntTweakBar.h
+ PATH_SUFFIXES src include AntTweakBar
+ DOC "Directory where ANTTWEAKBAR header files are stored" )
-+
++
+
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(ANTTWEAKBAR "Could not find ANTTWEAKBAR " ANTTWEAKBAR_INCLUDE_DIR ANTTWEAKBAR_LIB)
+# show the BERKELEY_DB_INCLUDE_DIR and BERKELEY_DB_LIBRARIES variables only in the advanced view
+MARK_AS_ADVANCED(ANTTWEAKBAR_INCLUDE_DIR ANTTWEAKBAR_LIBRARIES )
-Index: gmsh-tetgen-2.8.2~svn16203/utils/api_demos/cmake/modules/FindOCC.cmake
+Index: gmsh-tetgen-2.8.4~svn16803/utils/api_demos/cmake/modules/FindOCC.cmake
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ gmsh-tetgen-2.8.2~svn16203/utils/api_demos/cmake/modules/FindOCC.cmake 2013-07-18 15:58:49.000000000 +0200
++++ gmsh-tetgen-2.8.4~svn16803/utils/api_demos/cmake/modules/FindOCC.cmake 2013-09-28 09:37:15.000000000 +0200
@@ -0,0 +1,34 @@
+set(OCC_LIBS_REQUIRED
+ # subset of DataExchange
@@ -420,11 +422,11 @@
+ TKBRep TKGeomBase TKG3d TKG2d
+ # FoundationClasses
+ TKAdvTools TKMath TKernel)
-+
++
+list(LENGTH OCC_LIBS_REQUIRED NUM_OCC_LIBS_REQUIRED)
+set(OCC_LIBS)
+foreach(OCC ${OCC_LIBS_REQUIRED})
-+ find_library(OCC_LIB ${OCC} HINTS ENV CASROOT PATH_SUFFIXES lib
++ find_library(OCC_LIB ${OCC} HINTS ENV CASROOT PATH_SUFFIXES lib
+ ${OCC_SYS_NAME}/lib ${OCC_SYS_NAME}/vc8/lib)
+ if(OCC_LIB)
+ list(APPEND OCC_LIBS ${OCC_LIB})
@@ -435,19 +437,19 @@
+endforeach(OCC)
+SET(OCC_LIBRARIES ${OCC_LIBS} )
+
-+find_path(OCC_INCLUDE_DIR "BRep_Tool.hxx"
-+ PATHS $ENV{CASROOT}
++find_path(OCC_INCLUDE_DIR "BRep_Tool.hxx"
++ PATHS $ENV{CASROOT}
+ PATH_SUFFIXES inc include include/oce opencascade
+ DOC "Directory where OCC headers files are stored" )
-+
++
+
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(OCC "Could not find OCC " OCC_INCLUDE_DIR OCC_LIBRARIES)
+# show the BERKELEY_DB_INCLUDE_DIR and BERKELEY_DB_LIBRARIES variables only in the advanced view
+MARK_AS_ADVANCED(OCC_INCLUDE_DIR OCC_LIBRARIES )
-Index: gmsh-tetgen-2.8.2~svn16203/utils/api_demos/cmake/modules/FindGLUT.cmake
+Index: gmsh-tetgen-2.8.4~svn16803/utils/api_demos/cmake/modules/FindGLUT.cmake
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ gmsh-tetgen-2.8.2~svn16203/utils/api_demos/cmake/modules/FindGLUT.cmake 2013-07-18 15:58:49.000000000 +0200
++++ gmsh-tetgen-2.8.4~svn16803/utils/api_demos/cmake/modules/FindGLUT.cmake 2013-09-28 09:35:44.000000000 +0200
@@ -0,0 +1,20 @@
+include (FindPackageHandleStandardArgs)
+
@@ -457,7 +459,7 @@
+ PATH_SUFFIXES
+ lib )
+SET(GLUT_LIBRARY ${GLUT_LIB} )
-+
++
+FIND_LIBRARY(GLU_LIB NAMES GLU
+ PATH
+ ${CMAKE_SYSTEM_PREFIX_PATH}
@@ -469,10 +471,10 @@
+# show the BERKELEY_DB_INCLUDE_DIR and BERKELEY_DB_LIBRARIES variables only in the advanced view
+MARK_AS_ADVANCED(GLUT_LIBRARY )
+MARK_AS_ADVANCED(GLU_LIBRARY )
-Index: gmsh-tetgen-2.8.2~svn16203/utils/api_demos/cmake/modules/FindANN.cmake
+Index: gmsh-tetgen-2.8.4~svn16803/utils/api_demos/cmake/modules/FindANN.cmake
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ gmsh-tetgen-2.8.2~svn16203/utils/api_demos/cmake/modules/FindANN.cmake 2013-07-18 15:58:49.000000000 +0200
++++ gmsh-tetgen-2.8.4~svn16803/utils/api_demos/cmake/modules/FindANN.cmake 2013-09-28 09:34:56.000000000 +0200
@@ -0,0 +1,44 @@
+# -*- mode: cmake -*-
+#
Modified: packages/gmsh-tetgen/trunk/debian/patches/cgns.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/cgns.patch?rev=46321&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/cgns.patch (original)
+++ packages/gmsh-tetgen/trunk/debian/patches/cgns.patch Sat Sep 28 07:39:51 2013
@@ -3,10 +3,10 @@
Reviewed-by: Anton Gladky <gladky.anton at gmail.com>
Last-Update: 2013-04-02
-Index: gmsh-tetgen-2.8.3~svn16274/Geo/GModelIO_CGNS.cpp
+Index: gmsh-tetgen-2.8.4~svn16803/Geo/GModelIO_CGNS.cpp
===================================================================
---- gmsh-tetgen-2.8.3~svn16274.orig/Geo/GModelIO_CGNS.cpp 2013-07-18 16:15:26.000000000 +0200
-+++ gmsh-tetgen-2.8.3~svn16274/Geo/GModelIO_CGNS.cpp 2013-07-18 16:15:26.000000000 +0200
+--- gmsh-tetgen-2.8.4~svn16803.orig/Geo/GModelIO_CGNS.cpp 2013-09-28 09:37:33.000000000 +0200
++++ gmsh-tetgen-2.8.4~svn16803/Geo/GModelIO_CGNS.cpp 2013-09-28 09:37:33.000000000 +0200
@@ -155,24 +155,24 @@
// 1D second-order elements
// MSH_NUM_TYPE+1 is used to place non-cgns elements last.
@@ -199,10 +199,10 @@
{
return cgnsErr();
}
-Index: gmsh-tetgen-2.8.3~svn16274/Geo/CustomContainer.h
+Index: gmsh-tetgen-2.8.4~svn16803/Geo/CustomContainer.h
===================================================================
---- gmsh-tetgen-2.8.3~svn16274.orig/Geo/CustomContainer.h 2013-07-18 16:15:26.000000000 +0200
-+++ gmsh-tetgen-2.8.3~svn16274/Geo/CustomContainer.h 2013-07-18 16:15:26.000000000 +0200
+--- gmsh-tetgen-2.8.4~svn16803.orig/Geo/CustomContainer.h 2013-09-28 09:37:33.000000000 +0200
++++ gmsh-tetgen-2.8.4~svn16803/Geo/CustomContainer.h 2013-09-28 09:37:33.000000000 +0200
@@ -570,7 +570,7 @@
}
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=46321&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 Sat Sep 28 07:39:51 2013
@@ -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.8.3~svn16711/Graphics/CMakeLists.txt
+Index: gmsh-tetgen-2.8.4~svn16803/Graphics/CMakeLists.txt
===================================================================
---- gmsh-tetgen-2.8.3~svn16711.orig/Graphics/CMakeLists.txt 2013-09-13 18:25:33.000000000 +0200
-+++ gmsh-tetgen-2.8.3~svn16711/Graphics/CMakeLists.txt 2013-09-13 18:25:33.000000000 +0200
+--- gmsh-tetgen-2.8.4~svn16803.orig/Graphics/CMakeLists.txt 2013-09-28 09:34:49.000000000 +0200
++++ gmsh-tetgen-2.8.4~svn16803/Graphics/CMakeLists.txt 2013-09-28 09:34:49.000000000 +0200
@@ -15,7 +15,6 @@
drawScales.cpp
drawGraph2d.cpp
@@ -14,11 +14,11 @@
gl2gif.cpp
gl2jpeg.cpp
gl2png.cpp
-Index: gmsh-tetgen-2.8.3~svn16711/CMakeLists.txt
+Index: gmsh-tetgen-2.8.4~svn16803/CMakeLists.txt
===================================================================
---- gmsh-tetgen-2.8.3~svn16711.orig/CMakeLists.txt 2013-09-13 18:25:33.000000000 +0200
-+++ gmsh-tetgen-2.8.3~svn16711/CMakeLists.txt 2013-09-13 18:25:33.000000000 +0200
-@@ -1223,7 +1223,7 @@
+--- gmsh-tetgen-2.8.4~svn16803.orig/CMakeLists.txt 2013-09-28 09:34:49.000000000 +0200
++++ gmsh-tetgen-2.8.4~svn16803/CMakeLists.txt 2013-09-28 09:34:49.000000000 +0200
+@@ -1229,7 +1229,7 @@
add_executable(gmsh Common/Main.cpp ${GMSH_SRC})
endif(ENABLE_BUILD_DYNAMIC)
endif(HAVE_FLTK)
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=46321&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/fix_FTBFS_linking.patch (original)
+++ packages/gmsh-tetgen/trunk/debian/patches/fix_FTBFS_linking.patch Sat Sep 28 07:39:51 2013
@@ -2,11 +2,11 @@
Author: Anton Gladky <gladky.anton at gmail.com>
Last-Update: 2012-04-08
-Index: gmsh-tetgen-2.8.3~svn16711/CMakeLists.txt
+Index: gmsh-tetgen-2.8.4~svn16803/CMakeLists.txt
===================================================================
---- gmsh-tetgen-2.8.3~svn16711.orig/CMakeLists.txt 2013-09-13 18:34:10.000000000 +0200
-+++ gmsh-tetgen-2.8.3~svn16711/CMakeLists.txt 2013-09-13 18:34:10.000000000 +0200
-@@ -1200,7 +1200,7 @@
+--- gmsh-tetgen-2.8.4~svn16803.orig/CMakeLists.txt 2013-09-28 09:37:24.000000000 +0200
++++ gmsh-tetgen-2.8.4~svn16803/CMakeLists.txt 2013-09-28 09:37:24.000000000 +0200
+@@ -1206,7 +1206,7 @@
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=46321&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/fix_libdir.patch (original)
+++ packages/gmsh-tetgen/trunk/debian/patches/fix_libdir.patch Sat Sep 28 07:39:51 2013
@@ -2,10 +2,10 @@
Author: Anton Gladky <gladk at debian.org>
Last-Update: 2013-03-15
-Index: gmsh-tetgen-2.8.3~svn16711/wrappers/java/CMakeLists.txt
+Index: gmsh-tetgen-2.8.4~svn16803/wrappers/java/CMakeLists.txt
===================================================================
---- gmsh-tetgen-2.8.3~svn16711.orig/wrappers/java/CMakeLists.txt 2013-09-13 18:34:36.000000000 +0200
-+++ gmsh-tetgen-2.8.3~svn16711/wrappers/java/CMakeLists.txt 2013-09-13 18:34:36.000000000 +0200
+--- 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
@@ -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.3~svn16711/CMakeLists.txt
+Index: gmsh-tetgen-2.8.4~svn16803/CMakeLists.txt
===================================================================
---- gmsh-tetgen-2.8.3~svn16711.orig/CMakeLists.txt 2013-09-13 18:34:36.000000000 +0200
-+++ gmsh-tetgen-2.8.3~svn16711/CMakeLists.txt 2013-09-13 18:34:36.000000000 +0200
-@@ -1340,7 +1340,7 @@
+--- 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 @@
# (e.g. "make lib" or "make shared" followed by "make install/fast")
install(TARGETS gmsh DESTINATION ${GMSH_BIN} OPTIONAL)
if(ENABLE_BUILD_LIB)
@@ -28,9 +28,9 @@
endif(ENABLE_BUILD_LIB)
if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC)
if(WIN32 AND NOT MSVC OR CYGWIN)
-@@ -1359,7 +1359,7 @@
- install(FILES ${GCC_DLL} ${GFORTRAN_DLL} ${STDC_DLL} DESTINATION ${GMSH_LIB})
- endif(GCC_DLL AND GFORTRAN_DLL AND STDC_DLL)
+@@ -1383,7 +1383,7 @@
+ install(FILES ${GCC_DLL} ${STDC_DLL} DESTINATION ${GMSH_LIB})
+ endif(GCC_DLL AND STDC_DLL)
else(WIN32 AND NOT MSVC OR CYGWIN)
- install(TARGETS shared DESTINATION ${GMSH_LIB} OPTIONAL)
+ install(TARGETS shared DESTINATION ${INSTALL_LIB_DIR} OPTIONAL)
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=46321&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/fix_script_header.patch (original)
+++ packages/gmsh-tetgen/trunk/debian/patches/fix_script_header.patch Sat Sep 28 07:39:51 2013
@@ -2,8 +2,10 @@
Author: Anton Gladky <gladk at debian.org>
Last-Update: 2013-05-12
---- a/contrib/onelab/python/onelab.py
-+++ b/contrib/onelab/python/onelab.py
+Index: gmsh-tetgen-2.8.4~svn16803/contrib/onelab/python/onelab.py
+===================================================================
+--- gmsh-tetgen-2.8.4~svn16803.orig/contrib/onelab/python/onelab.py 2013-09-28 09:38:02.000000000 +0200
++++ gmsh-tetgen-2.8.4~svn16803/contrib/onelab/python/onelab.py 2013-09-28 09:38:02.000000000 +0200
@@ -1,3 +1,4 @@
+#!/usr/bin/env python
"""
Modified: packages/gmsh-tetgen/trunk/debian/patches/fix_spelling_errors.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/fix_spelling_errors.patch?rev=46321&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/fix_spelling_errors.patch (original)
+++ packages/gmsh-tetgen/trunk/debian/patches/fix_spelling_errors.patch Sat Sep 28 07:39:51 2013
@@ -2,10 +2,10 @@
Author: Anton Gladky <gladky.anton at gmail.com>
Last-Update: 2011-12-09
-Index: gmsh-tetgen-2.8.2~svn16203/Plugin/Bubbles.cpp
+Index: gmsh-tetgen-2.8.4~svn16803/Plugin/Bubbles.cpp
===================================================================
---- gmsh-tetgen-2.8.2~svn16203.orig/Plugin/Bubbles.cpp 2013-07-18 15:58:49.000000000 +0200
-+++ gmsh-tetgen-2.8.2~svn16203/Plugin/Bubbles.cpp 2013-07-18 15:58:49.000000000 +0200
+--- gmsh-tetgen-2.8.4~svn16803.orig/Plugin/Bubbles.cpp 2013-09-28 09:34:33.000000000 +0200
++++ gmsh-tetgen-2.8.4~svn16803/Plugin/Bubbles.cpp 2013-09-28 09:34:33.000000000 +0200
@@ -31,7 +31,7 @@
{
return "Plugin(Bubbles) constructs a geometry consisting of "
@@ -15,10 +15,10 @@
"The plugin expects a triangulation in the `z = 0' plane to exist "
"in the current model.\n\n"
"Plugin(Bubbles) creates one `.geo' file.";
-Index: gmsh-tetgen-2.8.2~svn16203/contrib/lbfgs/alglibinternal.cpp
+Index: gmsh-tetgen-2.8.4~svn16803/contrib/lbfgs/alglibinternal.cpp
===================================================================
---- gmsh-tetgen-2.8.2~svn16203.orig/contrib/lbfgs/alglibinternal.cpp 2013-07-18 15:58:49.000000000 +0200
-+++ gmsh-tetgen-2.8.2~svn16203/contrib/lbfgs/alglibinternal.cpp 2013-07-18 15:58:49.000000000 +0200
+--- gmsh-tetgen-2.8.4~svn16803.orig/contrib/lbfgs/alglibinternal.cpp 2013-09-28 09:34:33.000000000 +0200
++++ gmsh-tetgen-2.8.4~svn16803/contrib/lbfgs/alglibinternal.cpp 2013-09-28 09:34:33.000000000 +0200
@@ -3679,8 +3679,8 @@
{
return;
@@ -41,20 +41,20 @@
/*
* beta*y
-Index: gmsh-tetgen-2.8.2~svn16203/doc/texinfo/gmsh.texi
+Index: gmsh-tetgen-2.8.4~svn16803/doc/texinfo/gmsh.texi
===================================================================
---- gmsh-tetgen-2.8.2~svn16203.orig/doc/texinfo/gmsh.texi 2013-07-18 15:58:49.000000000 +0200
-+++ gmsh-tetgen-2.8.2~svn16203/doc/texinfo/gmsh.texi 2013-07-18 15:58:49.000000000 +0200
-@@ -999,7 +999,7 @@
- first string is greater than, equal to, or less than the second string).
- @code{TextAttributes} creates attributes for text strings.
+--- gmsh-tetgen-2.8.4~svn16803.orig/doc/texinfo/gmsh.texi 2013-09-28 09:34:33.000000000 +0200
++++ gmsh-tetgen-2.8.4~svn16803/doc/texinfo/gmsh.texi 2013-09-28 09:34:33.000000000 +0200
+@@ -1018,7 +1018,7 @@
+ less than the second string). @code{TextAttributes} creates attributes
+ for text strings.
-The last case in the definition allows to ask the user for a value
+The last case in the definition allows one to ask the user for a value
interactively. For example, inserting @code{GetValue("Value of parameter
alpha?", 5.76)} in an input file will query the user for the value of a
certain parameter alpha, assuming the default value is 5.76. If the
-@@ -1098,7 +1098,7 @@
+@@ -1117,7 +1117,7 @@
contain floating point formatting characters: @code{%e}, @code{%g},
etc.) The various @w{@var{char-option}s} are listed in
@ref{Options}. @code{GetEnvThe} gets the value of an environment
@@ -63,12 +63,12 @@
user for a value interactively. @code{StrReplace}'s arguments are: input
string, old substring, new substring. at footnote{For compatibility with GetDP
(@uref{http://geuz.org/getdp/}), parentheses can be replaced by brackets
-@@ -2646,7 +2646,7 @@
- @item Extrude @{ Surface @{ @var{expression-list} @}; @var{layers} < Using Index[@var{expr}]; > < Using View[@var{expr}]; > @}
+@@ -2726,7 +2726,7 @@
+ @item Extrude @{ Surface @{ @var{expression-list} @}; @var{layers} < Using Index[@var{expr}]; > < Using View[@var{expr}]; > < ScaleLastLayer; > @}
Extrudes a boundary layer from the specified surfaces. If no view is
specified, the boundary layer is created using gouraud-shaped (smoothed)
-normal field. Specifying a boundary layer index allows to extrude
+normal field. Specifying a boundary layer index allows one to extrude
several independent boundary layers (with independent normal smoothing).
- @item Transfinite Line @{ @var{expression-list} @} | "*" = @var{expression} < Using Progression | Bump @var{expression} >;
+ @code{ScaleLastLayer} scales the height of the last (top) layer of each
Modified: packages/gmsh-tetgen/trunk/debian/patches/metis.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/metis.patch?rev=46321&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/metis.patch (original)
+++ packages/gmsh-tetgen/trunk/debian/patches/metis.patch Sat Sep 28 07:39:51 2013
@@ -1,7 +1,7 @@
-Index: gmsh-tetgen-2.8.2~svn16203/contrib/Metis/util.c
+Index: gmsh-tetgen-2.8.4~svn16803/contrib/Metis/util.c
===================================================================
---- gmsh-tetgen-2.8.2~svn16203.orig/contrib/Metis/util.c 2013-07-18 15:58:49.000000000 +0200
-+++ gmsh-tetgen-2.8.2~svn16203/contrib/Metis/util.c 2013-07-18 15:58:49.000000000 +0200
+--- gmsh-tetgen-2.8.4~svn16803.orig/contrib/Metis/util.c 2013-09-28 09:37:41.000000000 +0200
++++ gmsh-tetgen-2.8.4~svn16803/contrib/Metis/util.c 2013-09-28 09:37:41.000000000 +0200
@@ -28,7 +28,7 @@
sprintf(out2, "Error! %s", out1);
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=46321&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/netgen.patch (original)
+++ packages/gmsh-tetgen/trunk/debian/patches/netgen.patch Sat Sep 28 07:39:51 2013
@@ -1,7 +1,7 @@
-Index: gmsh-tetgen-2.8.3~svn16739/CMakeLists.txt
+Index: gmsh-tetgen-2.8.4~svn16803/CMakeLists.txt
===================================================================
---- gmsh-tetgen-2.8.3~svn16739.orig/CMakeLists.txt 2013-09-20 13:28:02.000000000 +0200
-+++ gmsh-tetgen-2.8.3~svn16739/CMakeLists.txt 2013-09-20 13:28:02.000000000 +0200
+--- 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 @@
endif(ENABLE_BLOSSOM)
@@ -54,10 +54,10 @@
endif(HAVE_OCC)
endif(ENABLE_OCC)
-Index: gmsh-tetgen-2.8.3~svn16739/contrib/Netgen/CMakeLists.txt
+Index: gmsh-tetgen-2.8.4~svn16803/contrib/Netgen/CMakeLists.txt
===================================================================
---- gmsh-tetgen-2.8.3~svn16739.orig/contrib/Netgen/CMakeLists.txt 2013-09-20 13:28:02.000000000 +0200
-+++ gmsh-tetgen-2.8.3~svn16739/contrib/Netgen/CMakeLists.txt 2013-09-20 13:28:02.000000000 +0200
+--- 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
@@ -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