[SCM] Gmsh packaging. Gmsh is an automatic 3D finite element mesh generator. branch, master, updated. debian/2.8.1.dfsg-1-4-g27acc54

[Anton Gladky]

The following commit has been merged in the master branch:
commit e7e8053f5dafba463b62059c70879d3a1e9446f0
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Mon Jul 22 21:43:13 2013 +0200

    Refresh patches.

diff --git a/debian/patches/change_shared_library_name.patch b/debian/patches/change_shared_library_name.patch
index d8257a2..7cc4873 100644
--- a/debian/patches/change_shared_library_name.patch
+++ b/debian/patches/change_shared_library_name.patch
@@ -19,7 +19,7 @@ Last-Update: 2012-11-28
  POST_BUILD # do the rest of the command after the build period
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -1160,7 +1160,7 @@
+@@ -1155,7 +1155,7 @@
  # static library target
  if(ENABLE_BUILD_LIB)
    add_library(lib STATIC ${GMSH_SRC})
@@ -28,7 +28,7 @@ Last-Update: 2012-11-28
    if(MSVC)
      set_target_properties(lib PROPERTIES DEBUG_POSTFIX d) 
      if(ENABLE_MSVC_STATIC_RUNTIME)
-@@ -1173,10 +1173,10 @@
+@@ -1168,10 +1168,10 @@
  if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC OR 
     ENABLE_WRAP_PYTHON OR ENABLE_WRAP_JAVA)
    add_library(shared SHARED ${GMSH_SRC})
diff --git a/debian/patches/delete_gl2ps_from_source.patch b/debian/patches/delete_gl2ps_from_source.patch
index b520294..93b3efb 100644
--- a/debian/patches/delete_gl2ps_from_source.patch
+++ b/debian/patches/delete_gl2ps_from_source.patch
@@ -14,7 +14,7 @@ Last-Update: 2012-11-28
    gl2png.cpp
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -1207,7 +1207,7 @@
+@@ -1202,7 +1202,7 @@
      add_executable(gmsh Common/Main.cpp ${GMSH_SRC})
    endif(ENABLE_BUILD_DYNAMIC)
  endif(HAVE_FLTK)
diff --git a/debian/patches/fix_FTBFS_linking.patch b/debian/patches/fix_FTBFS_linking.patch
index d4c2aee..89c633d 100644
--- a/debian/patches/fix_FTBFS_linking.patch
+++ b/debian/patches/fix_FTBFS_linking.patch
@@ -4,7 +4,7 @@ Last-Update: 2012-11-28
 
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -1200,7 +1200,7 @@
+@@ -1195,7 +1195,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)		  
diff --git a/debian/patches/fix_libdir.patch b/debian/patches/fix_libdir.patch
index 48343d6..499eba3 100644
--- a/debian/patches/fix_libdir.patch
+++ b/debian/patches/fix_libdir.patch
@@ -15,7 +15,7 @@ Last-Update: 2013-03-15
 +  DESTINATION ${INSTALL_LIB_DIR})
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -1339,7 +1339,7 @@
+@@ -1334,7 +1334,7 @@
  # (e.g. "make lib" or "make shared" followed by "make install/fast")
  install(TARGETS gmsh DESTINATION ${GMSH_BIN} OPTIONAL)
  if(ENABLE_BUILD_LIB)
@@ -24,7 +24,7 @@ Last-Update: 2013-03-15
  endif(ENABLE_BUILD_LIB)
  if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC)
    if(WIN32 AND NOT MSVC OR CYGWIN)
-@@ -1358,7 +1358,7 @@
+@@ -1353,7 +1353,7 @@
        install(FILES ${GCC_DLL} ${GFORTRAN_DLL} ${STDC_DLL} DESTINATION ${GMSH_LIB})
      endif(GCC_DLL AND GFORTRAN_DLL AND STDC_DLL)
    else(WIN32 AND NOT MSVC OR CYGWIN)
diff --git a/debian/patches/skip_license_file.patch b/debian/patches/skip_license_file.patch
index 6a74182..f92b91c 100644
--- a/debian/patches/skip_license_file.patch
+++ b/debian/patches/skip_license_file.patch
@@ -4,7 +4,7 @@ Last-Update: 2012-11-28
 
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -1256,7 +1256,7 @@
+@@ -1251,7 +1251,7 @@
  endif(UNIX)
  
  set(WELCOME_FILE ${CMAKE_CURRENT_SOURCE_DIR}/doc/WELCOME.txt)
@@ -13,7 +13,7 @@ Last-Update: 2012-11-28
  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/?*.*)
-@@ -1398,7 +1398,7 @@
+@@ -1393,7 +1393,7 @@
  if(MAKEINFO AND TEXI2PDF)
    add_custom_target(doc COMMAND ${CMAKE_COMMAND} -E tar zcf 
                      ${CMAKE_CURRENT_BINARY_DIR}/gmsh-${GMSH_VERSION}-doc.tgz
diff --git a/debian/patches/switch_from_opencascade_to_oce.patch b/debian/patches/switch_from_opencascade_to_oce.patch
index a5b0719..057a472 100644
--- a/debian/patches/switch_from_opencascade_to_oce.patch
+++ b/debian/patches/switch_from_opencascade_to_oce.patch
@@ -6,7 +6,7 @@ Last-Update: 2012-02-10
 
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -924,15 +924,6 @@
+@@ -919,15 +919,6 @@
  endif(HAVE_SOLVER)
  
  if(ENABLE_OCC)
@@ -22,7 +22,7 @@ Last-Update: 2012-02-10
    set(OCC_LIBS_REQUIRED
        # subset of DataExchange
        TKSTEP TKSTEP209 TKSTEPAttr TKSTEPBase TKIGES TKXSBase
-@@ -943,6 +934,30 @@
+@@ -938,6 +929,30 @@
        TKBRep TKGeomBase TKG3d TKG2d
        # FoundationClasses
        TKAdvTools TKMath TKernel)
@@ -53,7 +53,7 @@ Last-Update: 2012-02-10
    list(LENGTH OCC_LIBS_REQUIRED NUM_OCC_LIBS_REQUIRED)
    set(OCC_LIBS)
    foreach(OCC ${OCC_LIBS_REQUIRED})
-@@ -978,6 +993,7 @@
+@@ -973,6 +988,7 @@
        endif(NOT OCC_CONFIG_H)
      endif(OCC_INC)
    endif(NUM_OCC_LIBS EQUAL NUM_OCC_LIBS_REQUIRED)

-- 
Gmsh packaging. Gmsh is an automatic 3D finite element mesh generator.