[SCM] Packaging for ESyS-Particle - Open Source software for particle-based numerical modelling branch, master, updated. upstream/2.1-15-g4a7f3d9
Anton Gladky
gladky.anton at gmail.com
Sat Dec 24 19:31:19 UTC 2011
The following commit has been merged in the master branch:
commit 026c8ef2586ed5a0d7607bdd55770daa8a0f04d9
Author: Anton Gladky <gladky.anton at gmail.com>
Date: Sat Dec 24 20:22:50 2011 +0100
Remove patches. They were applied by upstream.
diff --git a/debian/patches/fix_boost_1.46_compilation.patch b/debian/patches/fix_boost_1.46_compilation.patch
deleted file mode 100644
index ecb749f..0000000
--- a/debian/patches/fix_boost_1.46_compilation.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Description: Fixes compilation with boost 1.46.
-Author: Anton Gladky <gladky.anton at gmail.com>
-Last-Update: 2011-09-06
-
---- esys-particle-openmpi-2.1.orig/Foundation/PathSearcher.cpp
-+++ esys-particle-openmpi-2.1/Foundation/PathSearcher.cpp
-@@ -30,7 +30,11 @@ namespace esys
- StringUtil::StringVector searchPaths = StringUtil::splitStrings(delimitedPathList, delim);
- for (StringUtil::StringVector::const_iterator it = searchPaths.begin(); it != searchPaths.end(); it++)
- {
-+ #if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
- m_pathVector.push_back(filesystem::path(*it, filesystem::native));
-+ #else
-+ m_pathVector.push_back(filesystem::path(*it));
-+ #endif
- }
- }
-
---- esys-particle-openmpi-2.1.orig/Foundation/PathUtil.cpp
-+++ esys-particle-openmpi-2.1/Foundation/PathUtil.cpp
-@@ -47,9 +47,13 @@ namespace esys
- {
- origPathValue = getenvVal;
- }
--
-- filesystem::path exePath = filesystem::system_complete(filesystem::path(exeName, boost::filesystem::native));
-- std::string newPathValue = origPathValue + ":" + (exePath.branch_path().native_file_string());
-+ #if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
-+ filesystem::path exePath = filesystem::system_complete(filesystem::path(exeName, boost::filesystem::native));
-+ std::string newPathValue = origPathValue + ":" + (exePath.branch_path().native_file_string());
-+ #else
-+ filesystem::path exePath = filesystem::system_complete(filesystem::path(exeName));
-+ std::string newPathValue = origPathValue + ":" + (exePath.parent_path().string());
-+ #endif
- setenv("PATH", newPathValue.c_str(), 1);
- }
- }
diff --git a/debian/patches/fix_compilation_error.patch b/debian/patches/fix_compilation_error.patch
deleted file mode 100644
index 797e2e5..0000000
--- a/debian/patches/fix_compilation_error.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-Description: Fix compilation errors
-Author: Anton Gladky <gladky.anton at gmail.com>, osman <launchpad.net/~osman>
-Last-Update: 2011-07-30
-
---- a/Tools/StressCalculator/Makefile.am
-+++ b/Tools/StressCalculator/Makefile.am
-@@ -13,12 +13,12 @@
- ##
- include $(top_srcdir)/Config/Cpp.am
-
--lib_LTLIBRARIES = libStressCalculator.la
-+lib_LTLIBRARIES = libStressCalculator.la
-
- AM_CPPFLAGS += -I$(top_srcdir)
-
- libStressCalculator_la_LIBADD = \
-- $(top_builddir)/Foundation/libFoundation.la
-+ $(top_builddir)/Foundation/libFoundation.la
-
- libStressCalculator_la_SOURCES = Raw2InteractionReader.h Raw2InteractionReader.cpp InteractionToStressConverter.h InteractionToStressConverter.cpp ContactCollection.cpp ContactCollection.h Contact.h StressTensorCalculator.cpp StressTensorCalculator.h StressTensorCollection.cpp StressTensorCollection.h StressTensor.h VtkUnstructuredGrid.cpp VtkUnstructuredGrid.h VtkDataTypeTuple.h VtkDataTypeTuple.cpp VtkDataArray.h VtkDataType.h CartesianGrid.cpp CartesianGrid.h Vec3Comparer.h VtkStructuredGrid.cpp VtkStructuredGrid.h GaussianGridder.cpp GaussianGridder.h VtkPiece.cpp VtkPiece.h EigenvalueCalculator.cpp EigenvalueCalculator.h Contact.cpp
-
-@@ -27,6 +27,7 @@
- Main.cpp
-
- raw2tostress_LDADD = \
-- libStressCalculator.la \
-+ libStressCalculator.la \
-+ $(top_builddir)/Foundation/libFoundation.la \
- $(BOOST_FILESYSTEM_LIB)
-
---- a/Tools/ExtractFractures/Makefile.am
-+++ b/Tools/ExtractFractures/Makefile.am
-@@ -19,8 +19,9 @@
-
-
- fracextract_LDADD = \
-- $(top_builddir)/Foundation/libFoundation.la \
-- $(top_builddir)/Parallel/libParallel.la \
-+ $(top_builddir)/Foundation/libFoundation.la \
-+ $(top_builddir)/Geometry/libGgGeometry.la \
-+ $(top_builddir)/Parallel/libParallel.la \
- $(BOOST_FILESYSTEM_LIB)
-
- fracextract_SOURCES = \
---- a/MainBE/Makefile.am
-+++ b/MainBE/Makefile.am
-@@ -22,7 +22,7 @@
- -I$(top_srcdir)/Parallel \
- -I$(top_srcdir)/Fields
-
--ESySParticleBEWorker_LDADD = \
-+ESySParticleBEWorker_LDADD = \
- $(top_builddir)/Parallel/libParallel.la \
- $(top_builddir)/ntable/src/libntable.la \
- $(top_builddir)/tml/message/libTmlMessage.la \
-@@ -30,6 +30,7 @@
- $(top_builddir)/ppa/src/libppa.la \
- $(top_builddir)/Fields/libFields.la \
- $(top_builddir)/Geometry/libGgGeometry.la \
-+ $(top_builddir)/Foundation/libFoundation.la \
- $(GTK_LIBS) $(EXTRA_LD_LIBS) $(BOOST_FILESYSTEM_LIB)
-
- ESySParticleBEWorker_SOURCES = Worker.cpp version.h
diff --git a/debian/patches/fix_oneiric_compilation.patch b/debian/patches/fix_oneiric_compilation.patch
deleted file mode 100644
index 9ca5348..0000000
--- a/debian/patches/fix_oneiric_compilation.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- a/Python/MpiPython/Makefile.am
-+++ b/Python/MpiPython/Makefile.am
-@@ -13,7 +13,7 @@
- ##
- include $(top_srcdir)/Config/Python.am
-
--PYTHON_LTLDFLAGS = -L$(PYTHON_SYS_PREFIX)/lib -lpython$(PYTHON_VERSION)
-+PYTHON_LTLDFLAGS = -L$(PYTHON_SYS_PREFIX)/lib -lpython$(PYTHON_VERSION) -lboost_system
-
- bin_SCRIPTS = \
- lamexecLsm \
-@@ -28,6 +28,8 @@
- mpipython_LDADD= \
- $(top_builddir)/Foundation/libFoundation.la \
- $(top_builddir)/Parallel/libParallel.la \
-+ $(top_builddir)/tml/message/libTmlMessage.la \
-+ $(top_builddir)/tml/type/libTmlType.la \
- $(BOOST_FILESYSTEM_LIB)
-
- mpipython_LDFLAGS = $(PYTHON_LTLDFLAGS)
---- a/Tools/dump2pov/Makefile.am
-+++ b/Tools/dump2pov/Makefile.am
-@@ -21,6 +21,8 @@
- dump2pov_LDADD = \
- $(top_builddir)/Foundation/libFoundation.la \
- $(top_builddir)/Parallel/libParallel.la \
-+ $(top_builddir)/tml/message/libTmlMessage.la \
-+ $(top_builddir)/tml/type/libTmlType.la \
- $(BOOST_FILESYSTEM_LIB)
-
- dump2pov_SOURCES = \
---- a/Tools/mesh2pov/Makefile.am
-+++ b/Tools/mesh2pov/Makefile.am
-@@ -20,6 +20,8 @@
- mesh2pov_LDADD = \
- $(top_builddir)/Foundation/libFoundation.la \
- $(top_builddir)/Parallel/libParallel.la \
-+ $(top_builddir)/tml/message/libTmlMessage.la \
-+ $(top_builddir)/tml/type/libTmlType.la \
- $(BOOST_FILESYSTEM_LIB)
-
- mesh2pov_SOURCES = \
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index edea193..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,3 +0,0 @@
-fix_compilation_error.patch
-fix_boost_1.46_compilation.patch
-fix_oneiric_compilation.patch
--
Packaging for ESyS-Particle - Open Source software for particle-based numerical modelling
More information about the debian-science-commits
mailing list