[gmsh] 02/04: remove upstreamed patches
Nico Schlömer
nschloe-guest at moszumanska.debian.org
Mon Nov 6 15:27:58 UTC 2017
This is an automated email from the git hooks/post-receive script.
nschloe-guest pushed a commit to branch master
in repository gmsh.
commit a3c9b4e2dd7947419fe991eb9ea36777c47b61ae
Author: Nico Schlömer <nico.schloemer at gmail.com>
Date: Mon Nov 6 16:13:42 2017 +0100
remove upstreamed patches
---
debian/changelog | 8 +++++
debian/patches/110_fix_cmake_hdf5.patch | 30 -----------------
debian/patches/130_Java_Fix.patch | 21 ------------
debian/patches/60_fix_gmshpy_import.patch | 16 ---------
debian/patches/70_fix_libdir.patch | 39 ----------------------
debian/patches/80_fix_script_header.patch | 17 ----------
.../patches/90_fix_java_wrapper_compilation.patch | 17 ----------
debian/patches/series | 6 ----
8 files changed, 8 insertions(+), 146 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 1b6575c..3846d96 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+gmsh (3.0.6+dfsg1-1) UNRELEASED; urgency=medium
+
+ [ Nico Schlömer ]
+ * [ea6f1b0] New upstream version 3.0.6+dfsg1
+ * remove upstreamed patches
+
+ -- Nico Schlömer <nico.schloemer at gmail.com> Mon, 06 Nov 2017 15:58:22 +0100
+
gmsh (3.0.5+dfsg1-1) unstable; urgency=medium
* [9198f30] Update d/copyright
diff --git a/debian/patches/110_fix_cmake_hdf5.patch b/debian/patches/110_fix_cmake_hdf5.patch
deleted file mode 100644
index 9409e1d..0000000
--- a/debian/patches/110_fix_cmake_hdf5.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Description: _fix_cmake_hdf5
-Index: gmsh-3.0.5-source/CMakeLists.txt
-===================================================================
---- gmsh-3.0.5-source.orig/CMakeLists.txt
-+++ gmsh-3.0.5-source/CMakeLists.txt
-@@ -841,8 +841,10 @@ if(ENABLE_FOURIER_MODEL)
- endif(ENABLE_FOURIER_MODEL)
-
- if(ENABLE_MED OR ENABLE_CGNS)
-- find_library(HDF5_LIB hdf5)
-- if(HDF5_LIB)
-+ find_package(HDF5)
-+ if(HDF5_FOUND)
-+ set(HDF5_LIB "${HDF5_C_LIBRARIES}")
-+ list(APPEND EXTERNAL_INCLUDES ${HDF5_INCLUDE_DIRS})
- if(ENABLE_MED)
- find_library(MED_LIB med)
- if(MED_LIB)
-@@ -873,9 +875,9 @@ if(ENABLE_MED OR ENABLE_CGNS)
- endif(ZLIB_FOUND)
- endif(NOT HAVE_LIBZ)
- endif(MED_LIB OR CGNS_LIB)
-- else(HDF5_LIB)
-+ else(HDF5_FOUND)
- message(STATUS "HDF5 not found")
-- endif(HDF5_LIB)
-+ endif(HDF5_FOUND)
- endif(ENABLE_MED OR ENABLE_CGNS)
-
- if(HAVE_SOLVER)
diff --git a/debian/patches/130_Java_Fix.patch b/debian/patches/130_Java_Fix.patch
deleted file mode 100644
index b867c85..0000000
--- a/debian/patches/130_Java_Fix.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Description: Fix wrapper for Java
-Author: Anton Gladky <gladk at debian.org>
-Last-Update: 2017-10-18
-
---- gmsh-3.0.5+dfsg1.orig/wrappers/java/WrapGmsh.i
-+++ gmsh-3.0.5+dfsg1/wrappers/java/WrapGmsh.i
-@@ -52,10 +52,10 @@ enum meshGenerationStatus {PENDING, DONE
- extern int GModel::indexMeshVertices(bool all, int singlePartition);
- extern int GmshInitialize(int argc, char **argv);
- extern int GmshFinalize();
--extern Vertex *Create_Vertex(int Num, double X, double Y, double Z, double lc, double u);
--extern void add_physical(std::string type, List_T *list, std::string fileName,
-- const std::string &name, int forceTag, bool append,
-- const std::string &mode);
-+extern Vertex *CreateVertex(int Num, double X, double Y, double Z, double lc, double u);
-+extern void add_remove_physical(const std::string &fileName, const std::string &what,
-+ const std::vector<int> &l, const std::string &name,
-+ int forceTag, bool append, const std::string &mode);
- //use the Vector object defined in Java language to wrap the std vector.
- %include "std_vector.i"
- namespace std {
diff --git a/debian/patches/60_fix_gmshpy_import.patch b/debian/patches/60_fix_gmshpy_import.patch
deleted file mode 100644
index 6eca0b6..0000000
--- a/debian/patches/60_fix_gmshpy_import.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Fix import of gmshpy
-Bug-Debian: https://bugs.debian.org/696420
-Author: Anton Gladky <gladk at debian.org>
-Last-Update: 2014-02-06
-Index: gmsh-3.0.5-source/wrappers/gmshpy/__init__.py.in
-===================================================================
---- gmsh-3.0.5-source.orig/wrappers/gmshpy/__init__.py.in
-+++ gmsh-3.0.5-source/wrappers/gmshpy/__init__.py.in
-@@ -1,4 +1,7 @@
- # set Ctrl-C to default signal (terminates immediately)
-+from ctypes import *
-+mpi = CDLL('libmpi.so', RTLD_GLOBAL)
-+
- import signal
- signal.signal(signal.SIGINT, signal.SIG_DFL)
- ${GMSH_PYTHON_OPENMPI_HACK}
diff --git a/debian/patches/70_fix_libdir.patch b/debian/patches/70_fix_libdir.patch
deleted file mode 100644
index 8bc4e83..0000000
--- a/debian/patches/70_fix_libdir.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Description: install libs into ${INSTALL_LIB_DIR}, needed for multiarch
-Author: Anton Gladky <gladk at debian.org>
-Last-Update: 2013-03-15
-
-Index: gmsh-3.0.5-source/wrappers/java/CMakeLists.txt
-===================================================================
---- gmsh-3.0.5-source.orig/wrappers/java/CMakeLists.txt
-+++ gmsh-3.0.5-source/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
- ${CMAKE_CURRENT_BINARY_DIR}/WrappingJava/)
--install(TARGETS WrapGmsh DESTINATION lib OPTIONAL)
-+install(TARGETS WrapGmsh DESTINATION ${INSTALL_LIB_DIR} OPTIONAL)
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/WrappingJava/WrapGmsh.jar
-- DESTINATION lib)
-+ DESTINATION ${INSTALL_LIB_DIR})
-Index: gmsh-3.0.5-source/CMakeLists.txt
-===================================================================
---- gmsh-3.0.5-source.orig/CMakeLists.txt
-+++ gmsh-3.0.5-source/CMakeLists.txt
-@@ -1656,7 +1656,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)
-- install(TARGETS lib DESTINATION ${GMSH_LIB} OPTIONAL)
-+ install(TARGETS lib DESTINATION ${INSTALL_LIB_DIR} OPTIONAL)
- endif(ENABLE_BUILD_LIB)
- if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC)
- if(WIN32 AND NOT MSVC OR CYGWIN)
-@@ -1692,7 +1692,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)
-- install(TARGETS shared DESTINATION ${GMSH_LIB} OPTIONAL)
-+ install(TARGETS shared DESTINATION ${INSTALL_LIB_DIR} OPTIONAL)
- endif(WIN32 AND NOT MSVC OR CYGWIN)
- endif(ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC)
-
diff --git a/debian/patches/80_fix_script_header.patch b/debian/patches/80_fix_script_header.patch
deleted file mode 100644
index 91a939c..0000000
--- a/debian/patches/80_fix_script_header.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: add header into onelab
-Author: Anton Gladky <gladk at debian.org>
-Last-Update: 2013-05-12
-
-Index: gmsh-3.0.5-source/contrib/onelab/python/onelab.py
-===================================================================
---- gmsh-3.0.5-source.orig/contrib/onelab/python/onelab.py
-+++ gmsh-3.0.5-source/contrib/onelab/python/onelab.py
-@@ -27,6 +27,8 @@ Please report all bugs and problems to t
- <gmsh at onelab.info>.
- """
-
-+#!/usr/bin/env python
-+
- import socket, struct, os, sys, subprocess, time
- _VERSION = '1.3'
-
diff --git a/debian/patches/90_fix_java_wrapper_compilation.patch b/debian/patches/90_fix_java_wrapper_compilation.patch
deleted file mode 100644
index 15c7e26..0000000
--- a/debian/patches/90_fix_java_wrapper_compilation.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: <short summary of the patch>
-Author: Anton Gladky <gladk at debian.org>
-Last-Update: 2013-07-24
-
-Index: gmsh-3.0.5-source/wrappers/java/CMakeLists.txt
-===================================================================
---- gmsh-3.0.5-source.orig/wrappers/java/CMakeLists.txt
-+++ gmsh-3.0.5-source/wrappers/java/CMakeLists.txt
-@@ -13,7 +13,7 @@ include_directories(${JAVA_INCLUDE_PATH}
- include_directories(${JAVA_INCLUDE_PATH2})
- include_directories(${CMAKE_CURRENT_SOURCE_DIR})
- # define where the interface file (used by SWIG) are
--set(SWIG_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/WrapGmsh.i)
-+set(SWIG_SOURCES WrapGmsh.i)
- # let swig know that example.i is c++
- set_source_files_properties(${SWIG_SOURCES} PROPERTIES CPLUSPLUS ON)
- # define where the Java files generated by SWIG will be stored
diff --git a/debian/patches/series b/debian/patches/series
index 87fcf36..d9ad349 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,10 +1,4 @@
10_change_shared_library_name.patch
20_skip_license_file.patch
30_delete_gl2ps_from_source.patch
-60_fix_gmshpy_import.patch
-70_fix_libdir.patch
-80_fix_script_header.patch
-90_fix_java_wrapper_compilation.patch
-110_fix_cmake_hdf5.patch
-130_Java_Fix.patch
140_drop_css.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/gmsh.git
More information about the debian-science-commits
mailing list