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

Anton Gladky gladk at moszumanska.debian.org
Mon May 29 21:01:19 UTC 2017 

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

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

commit 6cf51037173d3e8ba09d1e546629da530ba4977c
Author: Anton Gladky <gladk at debian.org>
Date:   Sat May 27 23:47:59 2017 +0200

    Refresh patches.
---
 debian/patches/01_remove_obsolete_dir.patch  |  6 ++--
 debian/patches/02_remove_bzr_version.patch   |  6 ++--
 debian/patches/03_ax-boost.patch             | 44 ++++++++++++++--------------
 debian/patches/04_FixDocGeneration.patch     | 18 ------------
 debian/patches/05_fix_epydoc_timestamp.patch |  6 ++--
 debian/patches/06_fix_FTBFS_gcc6.patch       |  6 ++--
 debian/patches/series                        |  1 -
 7 files changed, 34 insertions(+), 53 deletions(-)

diff --git a/debian/patches/01_remove_obsolete_dir.patch b/debian/patches/01_remove_obsolete_dir.patch
index ee2ab05..7fe1156 100644
--- a/debian/patches/01_remove_obsolete_dir.patch
+++ b/debian/patches/01_remove_obsolete_dir.patch
@@ -2,10 +2,10 @@ Description: remove libltdl from Makefile.am
 Author: Anton Gladky <gladk at debian.org>
 Last-Update: 2015-06-22
 
-Index: ESyS-Particle-2.3.4/Makefile.am
+Index: ESyS-Particle-2.3.5/Makefile.am
 ===================================================================
---- ESyS-Particle-2.3.4.orig/Makefile.am
-+++ ESyS-Particle-2.3.4/Makefile.am
+--- ESyS-Particle-2.3.5.orig/Makefile.am
++++ ESyS-Particle-2.3.5/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 eb09057..bd8abab 100644
--- a/debian/patches/02_remove_bzr_version.patch
+++ b/debian/patches/02_remove_bzr_version.patch
@@ -2,10 +2,10 @@ Description: remove bzr version from release
 Author: Anton Gladky <gladk at debian.org>
 Last-Update: 2015-06-22
 
-Index: ESyS-Particle-2.3.4/Parallel/CheckPointInfo.cpp
+Index: ESyS-Particle-2.3.5/Parallel/CheckPointInfo.cpp
 ===================================================================
---- ESyS-Particle-2.3.4.orig/Parallel/CheckPointInfo.cpp
-+++ ESyS-Particle-2.3.4/Parallel/CheckPointInfo.cpp
+--- ESyS-Particle-2.3.5.orig/Parallel/CheckPointInfo.cpp
++++ ESyS-Particle-2.3.5/Parallel/CheckPointInfo.cpp
 @@ -15,7 +15,6 @@
  #include "Parallel/CheckPointInfo.h"
  #include "Geometry/GeometryInfo.h"
diff --git a/debian/patches/03_ax-boost.patch b/debian/patches/03_ax-boost.patch
index 8ca6145..3b74374 100644
--- a/debian/patches/03_ax-boost.patch
+++ b/debian/patches/03_ax-boost.patch
@@ -1,11 +1,11 @@
 Description: use ax_boost_* macros
 Author: Dimitri John Ledkov <xnox at ubuntu.com>
 
-Index: ESyS-Particle-2.3.4/configure.ac
+Index: ESyS-Particle-2.3.5/configure.ac
 ===================================================================
---- ESyS-Particle-2.3.4.orig/configure.ac
-+++ ESyS-Particle-2.3.4/configure.ac
-@@ -357,21 +357,21 @@ AC_SUBST([PYTHON_CPPFLAGS])
+--- ESyS-Particle-2.3.5.orig/configure.ac
++++ ESyS-Particle-2.3.5/configure.ac
+@@ -366,21 +366,21 @@ AC_SUBST([PYTHON_CPPFLAGS])
  
  # Check for boost library
  if [[ $PYTHON_MAJOR_VERSION -ge 4 ]]; then
@@ -33,10 +33,10 @@ Index: ESyS-Particle-2.3.4/configure.ac
  
  # check for SILO library
  if test "x${wants_silo}" = "xtrue"; then
-Index: ESyS-Particle-2.3.4/Foundation/Makefile.am
+Index: ESyS-Particle-2.3.5/Foundation/Makefile.am
 ===================================================================
---- ESyS-Particle-2.3.4.orig/Foundation/Makefile.am
-+++ ESyS-Particle-2.3.4/Foundation/Makefile.am
+--- ESyS-Particle-2.3.5.orig/Foundation/Makefile.am
++++ ESyS-Particle-2.3.5/Foundation/Makefile.am
 @@ -15,9 +15,9 @@ include $(top_srcdir)/Config/Cpp.am
  
  lib_LTLIBRARIES=libFoundation.la
@@ -50,10 +50,10 @@ Index: ESyS-Particle-2.3.4/Foundation/Makefile.am
  
  libFoundation_la_SOURCES = \
  	console.cpp \
-Index: ESyS-Particle-2.3.4/Python/BoostPythonUtil/Makefile.am
+Index: ESyS-Particle-2.3.5/Python/BoostPythonUtil/Makefile.am
 ===================================================================
---- ESyS-Particle-2.3.4.orig/Python/BoostPythonUtil/Makefile.am
-+++ ESyS-Particle-2.3.4/Python/BoostPythonUtil/Makefile.am
+--- ESyS-Particle-2.3.5.orig/Python/BoostPythonUtil/Makefile.am
++++ ESyS-Particle-2.3.5/Python/BoostPythonUtil/Makefile.am
 @@ -17,5 +17,5 @@ lib_LTLIBRARIES = libBoostPythonUtil.la
  
  libBoostPythonUtil_la_SOURCES = ListConverter.h ListConverter.cpp Util.h \
@@ -61,10 +61,10 @@ Index: ESyS-Particle-2.3.4/Python/BoostPythonUtil/Makefile.am
 -libBoostPythonUtil_la_LIBADD = $(BOOST_PYTHON_LIBS)
 +libBoostPythonUtil_la_LIBADD = $(BOOST_PYTHON_LIB)
  
-Index: ESyS-Particle-2.3.4/Python/MpiPython/Makefile.am
+Index: ESyS-Particle-2.3.5/Python/MpiPython/Makefile.am
 ===================================================================
---- ESyS-Particle-2.3.4.orig/Python/MpiPython/Makefile.am
-+++ ESyS-Particle-2.3.4/Python/MpiPython/Makefile.am
+--- ESyS-Particle-2.3.5.orig/Python/MpiPython/Makefile.am
++++ ESyS-Particle-2.3.5/Python/MpiPython/Makefile.am
 @@ -29,7 +29,7 @@ esysparticle_LDADD=
      $(top_builddir)/Model/libModel.la \
      $(top_builddir)/tml/message/libTmlMessage.la \
@@ -74,10 +74,10 @@ Index: ESyS-Particle-2.3.4/Python/MpiPython/Makefile.am
  
  esysparticle_LDFLAGS = $(AM_LDFLAGS) $(PYTHON_LTLDFLAGS)
  
-Index: ESyS-Particle-2.3.4/Python/esys/lsm/util/Makefile.am
+Index: ESyS-Particle-2.3.5/Python/esys/lsm/util/Makefile.am
 ===================================================================
---- ESyS-Particle-2.3.4.orig/Python/esys/lsm/util/Makefile.am
-+++ ESyS-Particle-2.3.4/Python/esys/lsm/util/Makefile.am
+--- ESyS-Particle-2.3.5.orig/Python/esys/lsm/util/Makefile.am
++++ ESyS-Particle-2.3.5/Python/esys/lsm/util/Makefile.am
 @@ -48,11 +48,11 @@ libFoundationPy_la_SOURCES = Vec3Py.cpp
  libFoundationPy_la_LIBADD  =                                     \
      $(top_builddir)/Foundation/libFoundation.la                  \
@@ -92,10 +92,10 @@ Index: ESyS-Particle-2.3.4/Python/esys/lsm/util/Makefile.am
  
  
  dist_lsmutil_PYTHON =   \
-Index: ESyS-Particle-2.3.4/Tools/StressCalculator/Makefile.am
+Index: ESyS-Particle-2.3.5/Tools/StressCalculator/Makefile.am
 ===================================================================
---- ESyS-Particle-2.3.4.orig/Tools/StressCalculator/Makefile.am
-+++ ESyS-Particle-2.3.4/Tools/StressCalculator/Makefile.am
+--- ESyS-Particle-2.3.5.orig/Tools/StressCalculator/Makefile.am
++++ ESyS-Particle-2.3.5/Tools/StressCalculator/Makefile.am
 @@ -27,7 +27,7 @@ raw2tostress_SOURCES =                 \
      Main.cpp
  
@@ -105,10 +105,10 @@ Index: ESyS-Particle-2.3.4/Tools/StressCalculator/Makefile.am
      libStressCalculator.la \
      $(top_builddir)/Foundation/libFoundation.la
  
-Index: ESyS-Particle-2.3.4/Tools/dump2vtk/Makefile.am
+Index: ESyS-Particle-2.3.5/Tools/dump2vtk/Makefile.am
 ===================================================================
---- ESyS-Particle-2.3.4.orig/Tools/dump2vtk/Makefile.am
-+++ ESyS-Particle-2.3.4/Tools/dump2vtk/Makefile.am
+--- ESyS-Particle-2.3.5.orig/Tools/dump2vtk/Makefile.am
++++ ESyS-Particle-2.3.5/Tools/dump2vtk/Makefile.am
 @@ -22,7 +22,7 @@ dump2vtk_LDADD = \
      $(top_builddir)/Foundation/libFoundation.la \
      $(top_builddir)/Geometry/libGgGeometry.la \
diff --git a/debian/patches/04_FixDocGeneration.patch b/debian/patches/04_FixDocGeneration.patch
deleted file mode 100644
index f7e659e..0000000
--- a/debian/patches/04_FixDocGeneration.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: Fix doc-generation
-Author: Anton Gladky <gladk at debian.org>
-Last-Update: 2015-06-23
-
-Index: ESyS-Particle-2.3.4/Doc/Tutorial/Makefile.am
-===================================================================
---- ESyS-Particle-2.3.4.orig/Doc/Tutorial/Makefile.am
-+++ ESyS-Particle-2.3.4/Doc/Tutorial/Makefile.am
-@@ -76,9 +76,6 @@ CLEANFILES = $(TUTNAME).pdf $(TUTNAME).l
- 			 $(TUTNAME).lof $(TUTPDF)
- 
- $(TUTPDF): $(TUTSOURCE)
--	test "x$(srcdir)" != "x." && cp -pr $(srcdir)/* .
--	test -d examples || mkdir examples
--	test -d tables || mkdir tables
- 	$(PDFLATEX) $(TUTNAME)
- 	$(BIBTEX) $(TUTNAME) || true
- 	$(MAKEGLOS) $(TUTNAME).glo
diff --git a/debian/patches/05_fix_epydoc_timestamp.patch b/debian/patches/05_fix_epydoc_timestamp.patch
index ca02d42..5d4700b 100644
--- a/debian/patches/05_fix_epydoc_timestamp.patch
+++ b/debian/patches/05_fix_epydoc_timestamp.patch
@@ -3,10 +3,10 @@ Description: Prevent epydoc from putting timestamp in doc.
 Author: Anton Gladky <gladk at debian.org>
 Last-Update: 2015-06-23
 
-Index: ESyS-Particle-2.3.4/Python/Makefile.am
+Index: ESyS-Particle-2.3.5/Python/Makefile.am
 ===================================================================
---- ESyS-Particle-2.3.4.orig/Python/Makefile.am
-+++ ESyS-Particle-2.3.4/Python/Makefile.am
+--- ESyS-Particle-2.3.5.orig/Python/Makefile.am
++++ ESyS-Particle-2.3.5/Python/Makefile.am
 @@ -43,7 +43,7 @@ install-exec-hook:
  	if test -d "$(LSMDATADOCDIR)"; then chmod 755 "$(LSMDATADOCDIR)"; else ${INSTALL} -m 755 -d "$(LSMDATADOCDIR)"; fi; \
  	if test -d "$(PYTHONAPIDOCDIR)"; then chmod 755 "$(PYTHONAPIDOCDIR)"; else ${INSTALL} -m 755 -d "$(PYTHONAPIDOCDIR)"; fi; \
diff --git a/debian/patches/06_fix_FTBFS_gcc6.patch b/debian/patches/06_fix_FTBFS_gcc6.patch
index 720726e..167a001 100644
--- a/debian/patches/06_fix_FTBFS_gcc6.patch
+++ b/debian/patches/06_fix_FTBFS_gcc6.patch
@@ -3,10 +3,10 @@ Author: Anton Gladky <gladk at debian.org>
 Bug-Debian: https://bugs.debian.org/811838
 Last-Update: 2016-08-10
 
-Index: ESyS-Particle-2.3.4/Tools/dump2vtk/frame_vtk.cpp
+Index: ESyS-Particle-2.3.5/Tools/dump2vtk/frame_vtk.cpp
 ===================================================================
---- ESyS-Particle-2.3.4.orig/Tools/dump2vtk/frame_vtk.cpp
-+++ ESyS-Particle-2.3.4/Tools/dump2vtk/frame_vtk.cpp
+--- ESyS-Particle-2.3.5.orig/Tools/dump2vtk/frame_vtk.cpp
++++ ESyS-Particle-2.3.5/Tools/dump2vtk/frame_vtk.cpp
 @@ -1276,7 +1276,7 @@ void writeMeshFile(const string& infilen
    string header,skip;
    int numMeshIG;
diff --git a/debian/patches/series b/debian/patches/series
index 5ebda05..cddbeaa 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
 01_remove_obsolete_dir.patch
 02_remove_bzr_version.patch
 03_ax-boost.patch
-04_FixDocGeneration.patch
 05_fix_epydoc_timestamp.patch
 06_fix_FTBFS_gcc6.patch

-- 
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