[esys-particle] 02/05: Refresh patches.

Anton Gladky gladk at moszumanska.debian.org
Mon Jun 22 18:17:11 UTC 2015 

This is an automated email from the git hooks/post-receive script.

gladk pushed a commit to branch master
in repository esys-particle.

commit 2e8942ee90be4240a8a3e5ec82461404b2955cc7
Author: Anton Gladky <gladk at debian.org>
Date:   Mon Jun 22 18:47:32 2015 +0200

    Refresh patches.
---
 debian/patches/01_remove_obsolete_dir.patch |  8 ++--
 debian/patches/02_remove_bzr_version.patch  | 14 ++++---
 debian/patches/03_ax-boost.patch            | 60 ++++++++++++++++++-----------
 3 files changed, 50 insertions(+), 32 deletions(-)

diff --git a/debian/patches/01_remove_obsolete_dir.patch b/debian/patches/01_remove_obsolete_dir.patch
index 90ce0f6..c9cc3d0 100644
--- a/debian/patches/01_remove_obsolete_dir.patch
+++ b/debian/patches/01_remove_obsolete_dir.patch
@@ -1,9 +1,11 @@
 Description: remove libltdl from Makefile.am
 Author: Anton Gladky <gladk at debian.org>
-Last-Update: 2013-05-05
+Last-Update: 2015-06-22
 
---- esys-particle-2.2.u1.orig/Makefile.am
-+++ esys-particle-2.2.u1/Makefile.am
+Index: ESyS-Particle-2.3.3/Makefile.am
+===================================================================
+--- ESyS-Particle-2.3.3.orig/Makefile.am
++++ ESyS-Particle-2.3.3/Makefile.am
 @@ -14,7 +14,7 @@
  
  include $(top_srcdir)/Config/Cpp.am
diff --git a/debian/patches/02_remove_bzr_version.patch b/debian/patches/02_remove_bzr_version.patch
index 20186a6..bfa5511 100644
--- a/debian/patches/02_remove_bzr_version.patch
+++ b/debian/patches/02_remove_bzr_version.patch
@@ -1,9 +1,11 @@
 Description: remove bzr version from release
 Author: Anton Gladky <gladk at debian.org>
-Last-Update: 2013-05-05
+Last-Update: 2015-06-22
 
---- a/Parallel/CheckPointInfo.cpp
-+++ b/Parallel/CheckPointInfo.cpp
+Index: ESyS-Particle-2.3.3/Parallel/CheckPointInfo.cpp
+===================================================================
+--- ESyS-Particle-2.3.3.orig/Parallel/CheckPointInfo.cpp
++++ ESyS-Particle-2.3.3/Parallel/CheckPointInfo.cpp
 @@ -15,7 +15,6 @@
  #include "Parallel/CheckPointInfo.h"
  #include "Geometry/GeometryInfo.h"
@@ -12,7 +14,7 @@ Last-Update: 2013-05-05
  
  namespace esys
  {
-@@ -29,8 +28,7 @@
+@@ -29,8 +28,7 @@ namespace esys
            m_timeStepSize(0.0),
            m_timeStep(0),
            m_geoInfo(),
@@ -22,7 +24,7 @@ Last-Update: 2013-05-05
        {
        }
  
-@@ -90,7 +88,7 @@
+@@ -90,7 +88,7 @@ namespace esys
            << m_timeStepSize << delim
            << m_timeStep     << delim;
  	// ESyS-Particle version info
@@ -31,7 +33,7 @@ Last-Update: 2013-05-05
          m_geoInfo.writeWithoutVersion(oStream);
          oStream
            << delim
-@@ -107,7 +105,6 @@
+@@ -107,7 +105,6 @@ namespace esys
        int          m_timeStep;
        GeometryInfo m_geoInfo;
        StringVector m_fileNames;
diff --git a/debian/patches/03_ax-boost.patch b/debian/patches/03_ax-boost.patch
index aa25536..0b36a13 100644
--- a/debian/patches/03_ax-boost.patch
+++ b/debian/patches/03_ax-boost.patch
@@ -1,11 +1,13 @@
 Description: use ax_boost_* macros
 Author: Dimitri John Ledkov <xnox at ubuntu.com>
 
---- a/configure.ac
-+++ b/configure.ac
-@@ -352,21 +352,21 @@
- PYTHON_MAJOR_VERSION=`python -c "from __future__ import print_function;import sys;print(sys.version_info[[0]])"`
- PYTHON_MINOR_VERSION=`python -c "from __future__ import print_function;import sys;print(sys.version_info[[1]])"`
+Index: ESyS-Particle-2.3.3/configure.ac
+===================================================================
+--- ESyS-Particle-2.3.3.orig/configure.ac
++++ ESyS-Particle-2.3.3/configure.ac
+@@ -357,21 +357,21 @@ AC_SUBST([PYTHON_CPPFLAGS])
+ 
+ # Check for boost library
  if [[ $PYTHON_MAJOR_VERSION -ge 4 ]]; then
 -  BOOST_REQUIRE([1.47.0])
 +  AX_BOOST_BASE([1.47.0])
@@ -31,9 +33,11 @@ Author: Dimitri John Ledkov <xnox at ubuntu.com>
  
  # check for SILO library
  if test "x${wants_silo}" = "xtrue"; then
---- a/Foundation/Makefile.am
-+++ b/Foundation/Makefile.am
-@@ -15,9 +15,9 @@
+Index: ESyS-Particle-2.3.3/Foundation/Makefile.am
+===================================================================
+--- ESyS-Particle-2.3.3.orig/Foundation/Makefile.am
++++ ESyS-Particle-2.3.3/Foundation/Makefile.am
+@@ -15,9 +15,9 @@ include $(top_srcdir)/Config/Cpp.am
  
  lib_LTLIBRARIES=libFoundation.la
  
@@ -46,18 +50,22 @@ Author: Dimitri John Ledkov <xnox at ubuntu.com>
  
  libFoundation_la_SOURCES = \
  	console.cpp \
---- a/Python/BoostPythonUtil/Makefile.am
-+++ b/Python/BoostPythonUtil/Makefile.am
-@@ -17,5 +17,5 @@
+Index: ESyS-Particle-2.3.3/Python/BoostPythonUtil/Makefile.am
+===================================================================
+--- ESyS-Particle-2.3.3.orig/Python/BoostPythonUtil/Makefile.am
++++ ESyS-Particle-2.3.3/Python/BoostPythonUtil/Makefile.am
+@@ -17,5 +17,5 @@ lib_LTLIBRARIES = libBoostPythonUtil.la
  
  libBoostPythonUtil_la_SOURCES = ListConverter.h ListConverter.cpp Util.h \
  	PythonIterIterator.h PythonIterIterator.hpp
 -libBoostPythonUtil_la_LIBADD = $(BOOST_PYTHON_LIBS)
 +libBoostPythonUtil_la_LIBADD = $(BOOST_PYTHON_LIB)
  
---- a/Python/MpiPython/Makefile.am
-+++ b/Python/MpiPython/Makefile.am
-@@ -29,7 +29,7 @@
+Index: ESyS-Particle-2.3.3/Python/MpiPython/Makefile.am
+===================================================================
+--- ESyS-Particle-2.3.3.orig/Python/MpiPython/Makefile.am
++++ ESyS-Particle-2.3.3/Python/MpiPython/Makefile.am
+@@ -29,7 +29,7 @@ esysparticle_LDADD=
      $(top_builddir)/Model/libModel.la \
      $(top_builddir)/tml/message/libTmlMessage.la \
      $(top_builddir)/tml/type/libTmlType.la \
@@ -66,9 +74,11 @@ Author: Dimitri John Ledkov <xnox at ubuntu.com>
  
  esysparticle_LDFLAGS = $(AM_LDFLAGS) $(PYTHON_LTLDFLAGS)
  
---- a/Python/esys/lsm/util/Makefile.am
-+++ b/Python/esys/lsm/util/Makefile.am
-@@ -48,11 +48,11 @@
+Index: ESyS-Particle-2.3.3/Python/esys/lsm/util/Makefile.am
+===================================================================
+--- ESyS-Particle-2.3.3.orig/Python/esys/lsm/util/Makefile.am
++++ ESyS-Particle-2.3.3/Python/esys/lsm/util/Makefile.am
+@@ -48,11 +48,11 @@ libFoundationPy_la_SOURCES = Vec3Py.cpp
  libFoundationPy_la_LIBADD  =                                     \
      $(top_builddir)/Foundation/libFoundation.la                  \
      $(top_builddir)/Python/BoostPythonUtil/libBoostPythonUtil.la \
@@ -82,9 +92,11 @@ Author: Dimitri John Ledkov <xnox at ubuntu.com>
  
  
  dist_lsmutil_PYTHON =   \
---- a/Tools/StressCalculator/Makefile.am
-+++ b/Tools/StressCalculator/Makefile.am
-@@ -27,7 +27,7 @@
+Index: ESyS-Particle-2.3.3/Tools/StressCalculator/Makefile.am
+===================================================================
+--- ESyS-Particle-2.3.3.orig/Tools/StressCalculator/Makefile.am
++++ ESyS-Particle-2.3.3/Tools/StressCalculator/Makefile.am
+@@ -27,7 +27,7 @@ raw2tostress_SOURCES =                 \
      Main.cpp
  
  raw2tostress_LDADD =                   \
@@ -93,9 +105,11 @@ Author: Dimitri John Ledkov <xnox at ubuntu.com>
      libStressCalculator.la \
      $(top_builddir)/Foundation/libFoundation.la
  
---- a/Tools/dump2vtk/Makefile.am
-+++ b/Tools/dump2vtk/Makefile.am
-@@ -22,7 +22,7 @@
+Index: ESyS-Particle-2.3.3/Tools/dump2vtk/Makefile.am
+===================================================================
+--- ESyS-Particle-2.3.3.orig/Tools/dump2vtk/Makefile.am
++++ ESyS-Particle-2.3.3/Tools/dump2vtk/Makefile.am
+@@ -22,7 +22,7 @@ dump2vtk_LDADD = \
      $(top_builddir)/Foundation/libFoundation.la \
      $(top_builddir)/Geometry/libGgGeometry.la \
      $(top_builddir)/Parallel/libParallel.la \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/esys-particle.git

More information about the debian-science-commits mailing list