[saga] 03/05: Refresh patches
Johan Van de Wauw
johanvdw-guest at moszumanska.debian.org
Thu Sep 24 17:19:26 UTC 2015
This is an automated email from the git hooks/post-receive script.
johanvdw-guest pushed a commit to branch master
in repository saga.
commit 3168fa7a96991e088040534731b34e7f8fa67510
Author: Johan Van de Wauw <johan at vandewauw.be>
Date: Thu Sep 24 15:47:29 2015 +0200
Refresh patches
---
.../0001-Remove-references-to-libfire.patch | 20 +++-----
.../patches/0002-Use-debian-version-of-grib2.patch | 4 +-
.../0003-Use-qhull-instead-of-triangle.patch | 8 +---
.../0004-Use-debian-version-of-libsvm.patch | 4 +-
debian/patches/0005-0099-no-hdf5.patch | 4 +-
debian/patches/0006-Fix-vigra-path.patch | 21 ---------
debian/patches/0007-Fix-opencv-module.patch | 54 +---------------------
debian/patches/series | 1 -
8 files changed, 14 insertions(+), 102 deletions(-)
diff --git a/debian/patches/0001-Remove-references-to-libfire.patch b/debian/patches/0001-Remove-references-to-libfire.patch
index 986a7f2..7706be3 100644
--- a/debian/patches/0001-Remove-references-to-libfire.patch
+++ b/debian/patches/0001-Remove-references-to-libfire.patch
@@ -8,35 +8,29 @@ Subject: Remove references to libfire
src/modules/simulation/Makefile.in | 2 +-
3 files changed, 2 insertions(+), 3 deletions(-)
-diff --git a/configure.ac b/configure.ac
-index 8c8b097..64c88ad 100755
--- a/configure.ac
+++ b/configure.ac
-@@ -276,7 +276,6 @@ AC_OUTPUT(Makefile \
+@@ -276,7 +276,6 @@
src/modules/simulation/sim_cellular_automata/Makefile \
src/modules/simulation/sim_ecosystems_hugget/Makefile \
src/modules/simulation/sim_erosion/Makefile \
- src/modules/simulation/sim_fire_spreading/Makefile \
src/modules/simulation/sim_hydrology/Makefile \
src/modules/simulation/sim_ihacres/Makefile \
- src/modules/statistics/Makefile \
-diff --git a/src/modules/simulation/Makefile.am b/src/modules/simulation/Makefile.am
-index 7ec461d..2f378e2 100644
+ src/modules/simulation/sim_rivflow/Makefile \
--- a/src/modules/simulation/Makefile.am
+++ b/src/modules/simulation/Makefile.am
@@ -1 +1 @@
--SUBDIRS = sim_cellular_automata sim_ecosystems_hugget sim_erosion sim_fire_spreading sim_hydrology sim_ihacres
-+SUBDIRS = sim_cellular_automata sim_ecosystems_hugget sim_erosion sim_hydrology sim_ihacres
-diff --git a/src/modules/simulation/Makefile.in b/src/modules/simulation/Makefile.in
-index 65c9896..365d6e3 100644
+-SUBDIRS = sim_cellular_automata sim_ecosystems_hugget sim_erosion sim_fire_spreading sim_hydrology sim_ihacres sim_rivflow
++SUBDIRS = sim_cellular_automata sim_ecosystems_hugget sim_erosion sim_hydrology sim_ihacres sim_rivflow
--- a/src/modules/simulation/Makefile.in
+++ b/src/modules/simulation/Makefile.in
-@@ -322,7 +322,7 @@ target_alias = @target_alias@
+@@ -322,7 +322,7 @@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
--SUBDIRS = sim_cellular_automata sim_ecosystems_hugget sim_erosion sim_fire_spreading sim_hydrology sim_ihacres
-+SUBDIRS = sim_cellular_automata sim_ecosystems_hugget sim_erosion sim_hydrology sim_ihacres
+-SUBDIRS = sim_cellular_automata sim_ecosystems_hugget sim_erosion sim_fire_spreading sim_hydrology sim_ihacres sim_rivflow
++SUBDIRS = sim_cellular_automata sim_ecosystems_hugget sim_erosion sim_hydrology sim_ihacres sim_rivflow
all: all-recursive
.SUFFIXES:
diff --git a/debian/patches/0002-Use-debian-version-of-grib2.patch b/debian/patches/0002-Use-debian-version-of-grib2.patch
index 77784df..aea7eaf 100644
--- a/debian/patches/0002-Use-debian-version-of-grib2.patch
+++ b/debian/patches/0002-Use-debian-version-of-grib2.patch
@@ -6,11 +6,9 @@ Subject: Use debian version of grib2
src/modules/io/io_grid_grib2/Makefile.am | 50 +-------------------------------
1 file changed, 1 insertion(+), 49 deletions(-)
-diff --git a/src/modules/io/io_grid_grib2/Makefile.am b/src/modules/io/io_grid_grib2/Makefile.am
-index 2d6ff24..7e006ae 100644
--- a/src/modules/io/io_grid_grib2/Makefile.am
+++ b/src/modules/io/io_grid_grib2/Makefile.am
-@@ -11,57 +11,9 @@ DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -DUSE_JPEG200
+@@ -11,57 +11,9 @@
CXX_INCS = -I$(top_srcdir)/src/saga_core $(LOCAL_INCS)
AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
#AM_LDFLAGS = -fPIC -shared -avoid-version -lpq -ljasper
diff --git a/debian/patches/0003-Use-qhull-instead-of-triangle.patch b/debian/patches/0003-Use-qhull-instead-of-triangle.patch
index 8bc7d3e..4692ec9 100644
--- a/debian/patches/0003-Use-qhull-instead-of-triangle.patch
+++ b/debian/patches/0003-Use-qhull-instead-of-triangle.patch
@@ -7,11 +7,9 @@ Subject: Use qhull instead of triangle
src/modules/grid/grid_gridding/nn/delaunay.c | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
-diff --git a/src/modules/grid/grid_gridding/Makefile.am b/src/modules/grid/grid_gridding/Makefile.am
-index 75c79c9..bc55004 100644
--- a/src/modules/grid/grid_gridding/Makefile.am
+++ b/src/modules/grid/grid_gridding/Makefile.am
-@@ -13,7 +13,7 @@ endif
+@@ -13,7 +13,7 @@
DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
CXX_INCS = -I$(top_srcdir)/src/saga_core
AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEP_DEFS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
@@ -20,7 +18,7 @@ index 75c79c9..bc55004 100644
pkglib_LTLIBRARIES = libgrid_gridding.la
libgrid_gridding_la_SOURCES =\
Interpolation.cpp\
-@@ -34,7 +34,6 @@ Shepard.cpp\
+@@ -34,7 +34,6 @@
./nn/nnai.c\
./nn/nncommon.c\
./nn/nnpi.c\
@@ -28,8 +26,6 @@ index 75c79c9..bc55004 100644
Interpolation.h\
Interpolation_AngularDistance.h\
Interpolation_InverseDistance.h\
-diff --git a/src/modules/grid/grid_gridding/nn/delaunay.c b/src/modules/grid/grid_gridding/nn/delaunay.c
-index dc98875..e2952fa 100644
--- a/src/modules/grid/grid_gridding/nn/delaunay.c
+++ b/src/modules/grid/grid_gridding/nn/delaunay.c
@@ -24,7 +24,7 @@
diff --git a/debian/patches/0004-Use-debian-version-of-libsvm.patch b/debian/patches/0004-Use-debian-version-of-libsvm.patch
index 4501f7c..4de14a6 100644
--- a/debian/patches/0004-Use-debian-version-of-libsvm.patch
+++ b/debian/patches/0004-Use-debian-version-of-libsvm.patch
@@ -6,11 +6,9 @@ Subject: Use debian version of libsvm
src/modules/imagery/imagery_svm/Makefile.am | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
-diff --git a/src/modules/imagery/imagery_svm/Makefile.am b/src/modules/imagery/imagery_svm/Makefile.am
-index a92c3bd..8a87973 100644
--- a/src/modules/imagery/imagery_svm/Makefile.am
+++ b/src/modules/imagery/imagery_svm/Makefile.am
-@@ -5,16 +5,14 @@ if SAGA_UNICODE
+@@ -5,16 +5,14 @@
UC_DEFS = -D_SAGA_UNICODE
endif
DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
diff --git a/debian/patches/0005-0099-no-hdf5.patch b/debian/patches/0005-0099-no-hdf5.patch
index f970725..1228d1b 100644
--- a/debian/patches/0005-0099-no-hdf5.patch
+++ b/debian/patches/0005-0099-no-hdf5.patch
@@ -6,11 +6,9 @@ Subject: 0099-no-hdf5
src/modules/imagery/imagery_vigra/vigra_random_forest.cpp | 1 +
1 file changed, 1 insertion(+)
-diff --git a/src/modules/imagery/imagery_vigra/vigra_random_forest.cpp b/src/modules/imagery/imagery_vigra/vigra_random_forest.cpp
-index 7a2ab0b..ce9eece 100644
--- a/src/modules/imagery/imagery_vigra/vigra_random_forest.cpp
+++ b/src/modules/imagery/imagery_vigra/vigra_random_forest.cpp
-@@ -96,6 +96,7 @@ public:
+@@ -96,6 +96,7 @@
#include <vigra/random_forest.hxx>
#define WITH_HDF5
diff --git a/debian/patches/0006-Fix-vigra-path.patch b/debian/patches/0006-Fix-vigra-path.patch
deleted file mode 100644
index cee3314..0000000
--- a/debian/patches/0006-Fix-vigra-path.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Johan Van de Wauw <johan.vandewauw at gmail.com>
-Date: Mon, 6 Jul 2015 19:12:04 +0200
-Subject: Fix vigra path
-
----
- src/modules/imagery/imagery_vigra/vigra_random_forest.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/modules/imagery/imagery_vigra/vigra_random_forest.cpp b/src/modules/imagery/imagery_vigra/vigra_random_forest.cpp
-index ce9eece..fa1c67e 100644
---- a/src/modules/imagery/imagery_vigra/vigra_random_forest.cpp
-+++ b/src/modules/imagery/imagery_vigra/vigra_random_forest.cpp
-@@ -71,7 +71,7 @@
- //---------------------------------------------------------
- #if !defined(VIGRA_VERSION_MAJOR) || VIGRA_VERSION_MAJOR < 1 || VIGRA_VERSION_MINOR < 10
- // define some dummies
--#include <vigra\matrix.hxx>
-+#include <vigra/matrix.hxx>
- class CRandom_Forest
- {
- public:
diff --git a/debian/patches/0007-Fix-opencv-module.patch b/debian/patches/0007-Fix-opencv-module.patch
index e460900..cc17277 100644
--- a/debian/patches/0007-Fix-opencv-module.patch
+++ b/debian/patches/0007-Fix-opencv-module.patch
@@ -5,16 +5,11 @@ Subject: Fix opencv module
---
configure.ac | 2 +-
src/modules/imagery/imagery_opencv/Makefile.am | 2 +-
- src/modules/imagery/imagery_opencv/opencv.h | 2 ++
- src/modules/imagery/imagery_opencv/opencv_nnet.cpp | 4 ++--
- src/modules/imagery/imagery_opencv/opencv_nnet.h | 4 ++--
5 files changed, 8 insertions(+), 6 deletions(-)
-diff --git a/configure.ac b/configure.ac
-index 64c88ad..45db13f 100755
--- a/configure.ac
+++ b/configure.ac
-@@ -17,7 +17,7 @@ AC_PROG_INSTALL
+@@ -17,7 +17,7 @@
AC_PROG_LIBTOOL
# Checks for libraries.
@@ -23,11 +18,9 @@ index 64c88ad..45db13f 100755
AC_CHECK_LIB([geotrans], [Set_Mercator_Coordinates])
AC_CHECK_LIB([fftw3],[fftw_execute],FFTWFOUND=1,)
AC_CHECK_LIB([jasper], [jas_calloc],JASPERFOUND=1,,)
-diff --git a/src/modules/imagery/imagery_opencv/Makefile.am b/src/modules/imagery/imagery_opencv/Makefile.am
-index e3210ee..0fa0202 100644
--- a/src/modules/imagery/imagery_opencv/Makefile.am
+++ b/src/modules/imagery/imagery_opencv/Makefile.am
-@@ -11,7 +11,7 @@ if HAVE_CV
+@@ -11,7 +11,7 @@
DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
CXX_INCS = -I$(top_srcdir)/src/saga_core -I/usr/include/opencv
AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
@@ -36,46 +29,3 @@ index e3210ee..0fa0202 100644
pkglib_LTLIBRARIES = libimagery_opencv.la
libimagery_opencv_la_SOURCES =\
MLB_Interface.cpp\
-diff --git a/src/modules/imagery/imagery_opencv/opencv.h b/src/modules/imagery/imagery_opencv/opencv.h
-index 99399cd..d6c4dad 100644
---- a/src/modules/imagery/imagery_opencv/opencv.h
-+++ b/src/modules/imagery/imagery_opencv/opencv.h
-@@ -75,6 +75,8 @@
- //---------------------------------------------------------
- #include <opencv/cv.h>
-
-+#include <opencv2/core/core_c.h>
-+#include <opencv2/imgproc/imgproc_c.h>
-
- ///////////////////////////////////////////////////////////
- // //
-diff --git a/src/modules/imagery/imagery_opencv/opencv_nnet.cpp b/src/modules/imagery/imagery_opencv/opencv_nnet.cpp
-index f123d16..6bbe376 100644
---- a/src/modules/imagery/imagery_opencv/opencv_nnet.cpp
-+++ b/src/modules/imagery/imagery_opencv/opencv_nnet.cpp
-@@ -60,8 +60,8 @@
-
- //---------------------------------------------------------
- #include "opencv_nnet.h"
--#include "opencv\cxcore.h"
--#include "opencv\ml.h"
-+#include "opencv/cxcore.h"
-+#include "opencv/ml.h"
-
- ///////////////////////////////////////////////////////////
- // //
-diff --git a/src/modules/imagery/imagery_opencv/opencv_nnet.h b/src/modules/imagery/imagery_opencv/opencv_nnet.h
-index ed22567..e1e1f1d 100644
---- a/src/modules/imagery/imagery_opencv/opencv_nnet.h
-+++ b/src/modules/imagery/imagery_opencv/opencv_nnet.h
-@@ -64,8 +64,8 @@
-
- //---------------------------------------------------------
- #include "MLB_Interface.h"
--#include "opencv\cxcore.h"
--#include "opencv\ml.h"
-+#include "opencv/cxcore.h"
-+#include "opencv/ml.h"
-
- ///////////////////////////////////////////////////////////
- // //
diff --git a/debian/patches/series b/debian/patches/series
index cebe656..d665f4d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,5 +3,4 @@
0003-Use-qhull-instead-of-triangle.patch
0004-Use-debian-version-of-libsvm.patch
0005-0099-no-hdf5.patch
-0006-Fix-vigra-path.patch
0007-Fix-opencv-module.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/saga.git
More information about the Pkg-grass-devel
mailing list