[saga] 04/05: Remove unneeded patches (applied/integrated upstream)
Johan Van de Wauw
johanvdw-guest at moszumanska.debian.org
Thu Feb 25 17:10:11 UTC 2016
This is an automated email from the git hooks/post-receive script.
johanvdw-guest pushed a commit to branch master
in repository saga.
commit 7f913035a579d719922386fd800483109935ae87
Author: Johan Van de Wauw <johan at vandewauw.be>
Date: Thu Feb 25 17:51:52 2016 +0100
Remove unneeded patches (applied/integrated upstream)
---
.../patches/0002-Use-debian-version-of-grib2.patch | 80 ----------------------
.../0003-Use-qhull-instead-of-triangle.patch | 39 -----------
debian/patches/0005-0099-no-hdf5.patch | 18 -----
debian/patches/0007-Fix-opencv-module.patch | 31 ---------
debian/patches/0008-Spelling-errors.patch | 80 ----------------------
debian/patches/series | 5 --
6 files changed, 253 deletions(-)
diff --git a/debian/patches/0002-Use-debian-version-of-grib2.patch b/debian/patches/0002-Use-debian-version-of-grib2.patch
deleted file mode 100644
index 6c852df..0000000
--- a/debian/patches/0002-Use-debian-version-of-grib2.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From: Johan Van de Wauw <johan.vandewauw at gmail.com>
-Date: Tue, 15 Jul 2014 04:28:04 -0400
-Subject: Use debian version of grib2
-
----
- src/modules/io/io_grid_grib2/Makefile.am | 50 +-------------------------------
- 1 file changed, 1 insertion(+), 49 deletions(-)
-
---- a/src/modules/io/io_grid_grib2/Makefile.am
-+++ b/src/modules/io/io_grid_grib2/Makefile.am
-@@ -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
--AM_LDFLAGS = -fPIC -shared -avoid-version $(LOCAL_LIBS) -ljasper
-+AM_LDFLAGS = -fPIC -shared -avoid-version $(LOCAL_LIBS) -ljasper -lgrib2c
- pkglib_LTLIBRARIES = libio_grid_grib2.la
- libio_grid_grib2_la_SOURCES =\
--./g2clib-1.0.4/cmplxpack.c\
--./g2clib-1.0.4/compack.c\
--./g2clib-1.0.4/comunpack.c\
--./g2clib-1.0.4/dec_jpeg2000.c\
--./g2clib-1.0.4/dec_png.c\
--./g2clib-1.0.4/drstemplates.c\
--./g2clib-1.0.4/enc_jpeg2000.c\
--./g2clib-1.0.4/enc_png.c\
--./g2clib-1.0.4/g2_addfield.c\
--./g2clib-1.0.4/g2_addgrid.c\
--./g2clib-1.0.4/g2_addlocal.c\
--./g2clib-1.0.4/g2_create.c\
--./g2clib-1.0.4/g2_free.c\
--./g2clib-1.0.4/g2_getfld.c\
--./g2clib-1.0.4/g2_gribend.c\
--./g2clib-1.0.4/g2_info.c\
--./g2clib-1.0.4/g2_miss.c\
--./g2clib-1.0.4/g2_unpack1.c\
--./g2clib-1.0.4/g2_unpack2.c\
--./g2clib-1.0.4/g2_unpack3.c\
--./g2clib-1.0.4/g2_unpack4.c\
--./g2clib-1.0.4/g2_unpack5.c\
--./g2clib-1.0.4/g2_unpack6.c\
--./g2clib-1.0.4/g2_unpack7.c\
--./g2clib-1.0.4/gbits.c\
--./g2clib-1.0.4/getdim.c\
--./g2clib-1.0.4/getpoly.c\
--./g2clib-1.0.4/gridtemplates.c\
--./g2clib-1.0.4/int_power.c\
--./g2clib-1.0.4/jpcpack.c\
--./g2clib-1.0.4/jpcunpack.c\
--./g2clib-1.0.4/misspack.c\
--./g2clib-1.0.4/mkieee.c\
--./g2clib-1.0.4/pack_gp.c\
--./g2clib-1.0.4/pdstemplates.c\
--./g2clib-1.0.4/pngpack.c\
--./g2clib-1.0.4/pngunpack.c\
--./g2clib-1.0.4/rdieee.c\
--./g2clib-1.0.4/reduce.c\
--./g2clib-1.0.4/seekgb.c\
--./g2clib-1.0.4/simpack.c\
--./g2clib-1.0.4/simunpack.c\
--./g2clib-1.0.4/specpack.c\
--./g2clib-1.0.4/specunpack.c\
--./g2clib-1.0.4/drstemplates.h\
--./g2clib-1.0.4/grib2.h\
--./g2clib-1.0.4/gridtemplates.h\
--./g2clib-1.0.4/pdstemplates.h\
- grib2_import.cpp\
- MLB_Interface.cpp\
- grib2_import.h\
---- a/src/modules/io/io_grid_grib2/grib2_import.h
-+++ b/src/modules/io/io_grid_grib2/grib2_import.h
-@@ -11,7 +11,7 @@
-
- #include "MLB_Interface.h"
- extern "C" {
--#include "g2clib-1.0.4/grib2.h"
-+#include <grib2.h>
- }
-
-
diff --git a/debian/patches/0003-Use-qhull-instead-of-triangle.patch b/debian/patches/0003-Use-qhull-instead-of-triangle.patch
deleted file mode 100644
index 4692ec9..0000000
--- a/debian/patches/0003-Use-qhull-instead-of-triangle.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From: Johan Van de Wauw <johan.vandewauw at gmail.com>
-Date: Tue, 15 Jul 2014 04:30:10 -0400
-Subject: Use qhull instead of triangle
-
----
- src/modules/grid/grid_gridding/Makefile.am | 3 +--
- src/modules/grid/grid_gridding/nn/delaunay.c | 2 +-
- 2 files changed, 2 insertions(+), 3 deletions(-)
-
---- a/src/modules/grid/grid_gridding/Makefile.am
-+++ b/src/modules/grid/grid_gridding/Makefile.am
-@@ -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)
--AM_LDFLAGS = -fPIC -shared -avoid-version
-+AM_LDFLAGS = -fPIC -shared -avoid-version -lqhull
- pkglib_LTLIBRARIES = libgrid_gridding.la
- libgrid_gridding_la_SOURCES =\
- Interpolation.cpp\
-@@ -34,7 +34,6 @@
- ./nn/nnai.c\
- ./nn/nncommon.c\
- ./nn/nnpi.c\
--./nn/triangle.c\
- Interpolation.h\
- Interpolation_AngularDistance.h\
- Interpolation_InverseDistance.h\
---- a/src/modules/grid/grid_gridding/nn/delaunay.c
-+++ b/src/modules/grid/grid_gridding/nn/delaunay.c
-@@ -24,7 +24,7 @@
- *
- *****************************************************************************/
-
--//#define USE_QHULL
-+#define USE_QHULL
-
- #include <stdlib.h>
- #include <stdio.h>
diff --git a/debian/patches/0005-0099-no-hdf5.patch b/debian/patches/0005-0099-no-hdf5.patch
deleted file mode 100644
index 1228d1b..0000000
--- a/debian/patches/0005-0099-no-hdf5.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-From: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
-Date: Mon, 6 Jul 2015 19:11:12 +0200
-Subject: 0099-no-hdf5
-
----
- src/modules/imagery/imagery_vigra/vigra_random_forest.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/src/modules/imagery/imagery_vigra/vigra_random_forest.cpp
-+++ b/src/modules/imagery/imagery_vigra/vigra_random_forest.cpp
-@@ -96,6 +96,7 @@
- #include <vigra/random_forest.hxx>
-
- #define WITH_HDF5
-+#undef WITH_HDF5
- #if defined(WITH_HDF5)
- #include <vigra/random_forest_hdf5_impex.hxx>
- #endif
diff --git a/debian/patches/0007-Fix-opencv-module.patch b/debian/patches/0007-Fix-opencv-module.patch
deleted file mode 100644
index cc17277..0000000
--- a/debian/patches/0007-Fix-opencv-module.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From: Johan Van de Wauw <johan.vandewauw at gmail.com>
-Date: Thu, 9 Jul 2015 17:56:07 +0200
-Subject: Fix opencv module
-
----
- configure.ac | 2 +-
- src/modules/imagery/imagery_opencv/Makefile.am | 2 +-
- 5 files changed, 8 insertions(+), 6 deletions(-)
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -17,7 +17,7 @@
- AC_PROG_LIBTOOL
-
- # Checks for libraries.
--AC_CHECK_LIB([cv], [cvGetRows], CVFOUND=1,,)
-+AC_CHECK_LIB([opencv_core], [cvGetRows], CVFOUND=1,,)
- AC_CHECK_LIB([geotrans], [Set_Mercator_Coordinates])
- AC_CHECK_LIB([fftw3],[fftw_execute],FFTWFOUND=1,)
- AC_CHECK_LIB([jasper], [jas_calloc],JASPERFOUND=1,,)
---- a/src/modules/imagery/imagery_opencv/Makefile.am
-+++ b/src/modules/imagery/imagery_opencv/Makefile.am
-@@ -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)
--AM_LDFLAGS = -fPIC -shared -avoid-version -lcv
-+AM_LDFLAGS = -fPIC -shared -avoid-version -lopencv_legacy -lopencv_imgproc -lopencv_flann
- pkglib_LTLIBRARIES = libimagery_opencv.la
- libimagery_opencv_la_SOURCES =\
- MLB_Interface.cpp\
diff --git a/debian/patches/0008-Spelling-errors.patch b/debian/patches/0008-Spelling-errors.patch
deleted file mode 100644
index f05de1e..0000000
--- a/debian/patches/0008-Spelling-errors.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-Description: Fix various typos.
-Author: Bas Couwenberg <sebastic at debian.org>
-
---- a/src/modules/docs/docs_html/svg_interactive_map.cpp
-+++ b/src/modules/docs/docs_html/svg_interactive_map.cpp
-@@ -2070,7 +2070,7 @@ const char * CSVG_Interactive_Map::_Get_
- " this.showCoords = showCoords;\n"
- " //initialize array of timestamp/layertoLoad values\n"
- " this.nrLayerToLoad = new Array();\n"
-- " this.timestamp = null; //holds the timestamp after a zoom or pan occured\n"
-+ " this.timestamp = null; //holds the timestamp after a zoom or pan occurred\n"
- " //initialize coordinate display if showCoords == true\n"
- " if (this.showCoords == true) {\n"
- " //add event listener for coordinate display\n"
---- a/src/modules/grid/grid_calculus/Grid_Plotter.cpp
-+++ b/src/modules/grid/grid_calculus/Grid_Plotter.cpp
-@@ -62,7 +62,7 @@ CGrid_Plotter::CGrid_Plotter(void)
- Set_Description(_TW(
- "Generate a grid based on a functional expression.\n"
- "The function interpreter uses an expression parser "
-- "that offers the folowing operators:\n\n"
-+ "that offers the following operators:\n\n"
- "+ Addition\n"
- "- Subtraction\n"
- "* Multiplication\n"
---- a/src/modules/grid/grid_gridding/Shepard.cpp
-+++ b/src/modules/grid/grid_gridding/Shepard.cpp
-@@ -147,7 +147,7 @@ void CShepard2d::GetValue(double px, dou
- }
-
- /*/////////////////////////////////////////////////////////////////////////////////////
--The folowing source ist an automatic translation
-+The following source ist an automatic translation
- with f2c of Module 660 in TOMS
-
- QSHEP2D: Fortran routines implementing the quadratic Shepard method for
---- a/src/modules/table/table_calculus/Fit.cpp
-+++ b/src/modules/table/table_calculus/Fit.cpp
-@@ -136,7 +136,7 @@ CFit::CFit(void)
- "abs(x)\n"
- "sqrt(x)\n\n"
-
-- "For Variogram - Fitting you can use the folowing Variogram - Models:\n"
-+ "For Variogram - Fitting you can use the following Variogram - Models:\n"
- "NUG(x)\n"
- "SPH(x,a)\n"
- "EXP(x,a)\n"
---- a/src/modules/grid/grid_calculus_bsl/basistypen.cpp
-+++ b/src/modules/grid/grid_calculus_bsl/basistypen.cpp
-@@ -317,7 +317,7 @@ void ParseVars(int& zeile, int& pos)
- }
- else if (subz[l-1] == ')')
- {
-- printf("loadig files not suported");
-+ printf("loading files not supported");
- return;
- /*
- int posk;
---- a/src/modules/terrain_analysis/ta_slope_stability/TOBIA_01.cpp
-+++ b/src/modules/terrain_analysis/ta_slope_stability/TOBIA_01.cpp
-@@ -122,7 +122,7 @@ CTOBIA::CTOBIA(void)
- );
-
- Parameters.Add_Grid(
-- NULL, "E", "TOBIA classes", "Resulting TOBIA classses (1-7) grid", PARAMETER_OUTPUT
-+ NULL, "E", "TOBIA classes", "Resulting TOBIA classes (1-7) grid", PARAMETER_OUTPUT
- );
-
- Parameters.Add_Grid(
---- a/src/saga_core/saga_cmd/man/saga_cmd.1
-+++ b/src/saga_core/saga_cmd/man/saga_cmd.1
-@@ -213,7 +213,7 @@ export SAGA_MLB=/usr/lib/saga
- .PP
- \&\fBsaga_cmd\fR ta_morphometry \*(L"Local Morphometry\*(R" \-ELEVATION dem.sgrd \-SLOPE slope.sgrd \-ASPECT aspect.sgrd \-METHOD 1
- .PP
--Multiple input files can be specified by seperating them by a semicolon (;).
-+Multiple input files can be specified by separating them by a semicolon (;).
- .PP
- \&\fBsaga_cmd\fR libgrid_tools Merging \-GRIDS test1.sgrd\e;test2.sgrd \-GRID_TARGET merged.sgrd
- .SH "BUGS"
diff --git a/debian/patches/series b/debian/patches/series
index 9af153b..21ba47f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1 @@
-0002-Use-debian-version-of-grib2.patch
-0003-Use-qhull-instead-of-triangle.patch
0004-Use-debian-version-of-libsvm.patch
-0005-0099-no-hdf5.patch
-0007-Fix-opencv-module.patch
-0008-Spelling-errors.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