[saga] 01/02: Fix patch mess part 1
Johan Van de Wauw
johanvdw-guest at moszumanska.debian.org
Tue Jul 15 11:08:01 UTC 2014
This is an automated email from the git hooks/post-receive script.
johanvdw-guest pushed a commit to branch master
in repository saga.
commit fa233764720a62f451acf48eec5a5ab49b6c1ddd
Author: Johan Van de Wauw <johan.vandewauw at gmail.com>
Date: Tue Jul 15 04:18:57 2014 -0400
Fix patch mess part 1
---
...tch => 0001-Fix-gcc-errors-from-upstream.patch} | 1 -
.../0001-Remove-references-to-libfire.patch | 30 ----
.../0001-Use-qhull-instead-of-triangle.patch | 158 ---------------------
.../patches/0002-Remove-reference-to-libfire.patch | 20 ---
.../0002-Remove-references-to-libfire.patch | 42 ++++++
.../patches/0002-Use-debian-version-of-grib2.patch | 85 -----------
...atch => 0003-Use-debian-version-of-grib2.patch} | 14 +-
.../0004-Use-qhull-instead-of-triangle.patch | 9 +-
debian/patches/series | 8 +-
9 files changed, 53 insertions(+), 314 deletions(-)
diff --git a/debian/patches/0004-Fix-gcc-errors-from-upstream.patch b/debian/patches/0001-Fix-gcc-errors-from-upstream.patch
similarity index 98%
rename from debian/patches/0004-Fix-gcc-errors-from-upstream.patch
rename to debian/patches/0001-Fix-gcc-errors-from-upstream.patch
index d6647c6..618d21d 100644
--- a/debian/patches/0004-Fix-gcc-errors-from-upstream.patch
+++ b/debian/patches/0001-Fix-gcc-errors-from-upstream.patch
@@ -2,7 +2,6 @@ From: Johan Van de Wauw <johan.vandewauw at gmail.com>
Date: Fri, 13 Jun 2014 01:04:37 +0200
Subject: Fix gcc errors - from upstream
->From upstream:
errfunc.c: fix bug, refers to bug #191 Missing format strings
2014-05-29 12:13:13
by reklov_w
diff --git a/debian/patches/0001-Remove-references-to-libfire.patch b/debian/patches/0001-Remove-references-to-libfire.patch
deleted file mode 100644
index adb65b1..0000000
--- a/debian/patches/0001-Remove-references-to-libfire.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From: Johan Van de Wauw <johan.vandewauw at gmail.com>
-Date: Thu, 14 Nov 2013 20:58:08 -0500
-Subject: Remove references to libfire
-
-libfire
----
- configure.ac | 2 --
- src/modules_simulation/Makefile.am | 2 +-
- 2 files changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 69eb6fd..7837a32 100755
---- a/configure.ac
-+++ b/configure.ac
-@@ -296,8 +296,6 @@ AC_OUTPUT(Makefile \
- src/modules_simulation/cellular_automata/sim_cellular_automata/Makefile \
- src/modules_simulation/ecosystems/Makefile \
- src/modules_simulation/ecosystems/sim_ecosystems_hugget/Makefile \
-- src/modules_simulation/fire/Makefile \
-- src/modules_simulation/fire/sim_fire_spreading/Makefile \
- src/modules_terrain_analysis/Makefile \
- src/modules_terrain_analysis/terrain_analysis/Makefile \
- src/modules_terrain_analysis/terrain_analysis/ta_channels/Makefile \
-diff --git a/src/modules_simulation/Makefile.am b/src/modules_simulation/Makefile.am
-index 431dee5..0d38f09 100644
---- a/src/modules_simulation/Makefile.am
-+++ b/src/modules_simulation/Makefile.am
-@@ -1 +1 @@
--SUBDIRS = hydrology fire ecosystems cellular_automata erosion
-+SUBDIRS = hydrology ecosystems cellular_automata erosion
diff --git a/debian/patches/0001-Use-qhull-instead-of-triangle.patch b/debian/patches/0001-Use-qhull-instead-of-triangle.patch
deleted file mode 100644
index f528440..0000000
--- a/debian/patches/0001-Use-qhull-instead-of-triangle.patch
+++ /dev/null
@@ -1,158 +0,0 @@
-From: Johan Van de Wauw <johan.vandewauw at gmail.com>
-Date: Fri, 15 Nov 2013 00:06:46 -0500
-Subject: Use qhull instead of triangle
-
----
- debian/changelog | 5 +-
- .../patches/0002-Use-debian-version-of-grib2.patch | 85 ----------------------
- src/modules/grid/grid_gridding/Makefile.am | 3 +-
- src/modules/grid/grid_gridding/nn/delaunay.c | 2 +-
- 4 files changed, 5 insertions(+), 90 deletions(-)
- delete mode 100644 debian/patches/0002-Use-debian-version-of-grib2.patch
-
-diff --git a/debian/changelog b/debian/changelog
-index c7d7aa6..628c2b1 100644
---- a/debian/changelog
-+++ b/debian/changelog
-@@ -1,4 +1,4 @@
--saga (2.1.1+dfsg-1) UNRELEASED; urgency=medium
-+saga (2.1.2+dfsg-1) UNRELEASED; urgency=medium
-
- * Import new upstream (closes: #717624)
- * Fix patches - remove autoreconf results - rename configure.in
-@@ -6,8 +6,9 @@ saga (2.1.1+dfsg-1) UNRELEASED; urgency=medium
- * Remove patch (included upstream)
- * Delete missing icons from menu fil
- * Bump standards version - no changes needed
-+ * New upstream release
-
-- -- Johan Van de Wauw <johan.vandewauw at gmail.com> Thu, 09 Jan 2014 10:53:49 -0500
-+ -- Johan Van de Wauw <johan.vandewauw at gmail.com> Fri, 13 Jun 2014 00:11:04 +0200
-
- saga (2.1.0+dfsg-1) unstable; urgency=low
-
-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 5d7121c..0000000
---- a/debian/patches/0002-Use-debian-version-of-grib2.patch
-+++ /dev/null
-@@ -1,85 +0,0 @@
--From: Johan Van de Wauw <johan.vandewauw at gmail.com>
--Date: Thu, 14 Nov 2013 21:00:49 -0500
--Subject: Use debian version of grib2
--
-----
-- src/modules_io/grid/io_grid_grib2/Makefile.am | 50 +-----------------------
-- src/modules_io/grid/io_grid_grib2/grib2_import.h | 2 +-
-- 2 files changed, 2 insertions(+), 50 deletions(-)
--
--diff --git a/src/modules_io/grid/io_grid_grib2/Makefile.am b/src/modules_io/grid/io_grid_grib2/Makefile.am
--index 2d6ff24..7e006ae 100644
----- a/src/modules_io/grid/io_grid_grib2/Makefile.am
--+++ b/src/modules_io/grid/io_grid_grib2/Makefile.am
--@@ -11,57 +11,9 @@ DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -DUSE_JPEG200
-- 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\
--diff --git a/src/modules_io/grid/io_grid_grib2/grib2_import.h b/src/modules_io/grid/io_grid_grib2/grib2_import.h
--index 6381b89..5ab426b 100644
----- a/src/modules_io/grid/io_grid_grib2/grib2_import.h
--+++ b/src/modules_io/grid/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/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
- 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 @@ Shepard.cpp\
- ./nn/nnai.c\
- ./nn/nncommon.c\
- ./nn/nnpi.c\
--./nn/triangle.c\
- 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 @@
- *
- *****************************************************************************/
-
--//#define USE_QHULL
-+#define USE_QHULL
-
- #include <stdlib.h>
- #include <stdio.h>
diff --git a/debian/patches/0002-Remove-reference-to-libfire.patch b/debian/patches/0002-Remove-reference-to-libfire.patch
deleted file mode 100644
index 91f2711..0000000
--- a/debian/patches/0002-Remove-reference-to-libfire.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Johan Van de Wauw <johan.vandewauw at gmail.com>
-Date: Fri, 13 Jun 2014 00:25:01 +0200
-Subject: Remove reference to libfire
-
----
- configure.ac | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index afa2cc7..82dab2a 100755
---- a/configure.ac
-+++ b/configure.ac
-@@ -276,7 +276,6 @@ AC_OUTPUT(Makefile \
- 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/debian/patches/0002-Remove-references-to-libfire.patch b/debian/patches/0002-Remove-references-to-libfire.patch
new file mode 100644
index 0000000..356ed43
--- /dev/null
+++ b/debian/patches/0002-Remove-references-to-libfire.patch
@@ -0,0 +1,42 @@
+From: Johan Van de Wauw <johan.vandewauw at gmail.com>
+Date: Tue, 15 Jul 2014 04:24:25 -0400
+Subject: Remove references to libfire
+
+---
+ configure.ac | 1 -
+ src/modules/simulation/Makefile.am | 2 +-
+ src/modules/simulation/Makefile.in | 2 +-
+ 3 files changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index afa2cc7..82dab2a 100755
+--- a/configure.ac
++++ b/configure.ac
+@@ -276,7 +276,6 @@ AC_OUTPUT(Makefile \
+ 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
+--- 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 2f58074..7be1b6a 100644
+--- a/src/modules/simulation/Makefile.in
++++ b/src/modules/simulation/Makefile.in
+@@ -260,7 +260,7 @@ target_alias = @target_alias@
+ 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
+ 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
deleted file mode 100644
index 5d7121c..0000000
--- a/debian/patches/0002-Use-debian-version-of-grib2.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From: Johan Van de Wauw <johan.vandewauw at gmail.com>
-Date: Thu, 14 Nov 2013 21:00:49 -0500
-Subject: Use debian version of grib2
-
----
- src/modules_io/grid/io_grid_grib2/Makefile.am | 50 +-----------------------
- src/modules_io/grid/io_grid_grib2/grib2_import.h | 2 +-
- 2 files changed, 2 insertions(+), 50 deletions(-)
-
-diff --git a/src/modules_io/grid/io_grid_grib2/Makefile.am b/src/modules_io/grid/io_grid_grib2/Makefile.am
-index 2d6ff24..7e006ae 100644
---- a/src/modules_io/grid/io_grid_grib2/Makefile.am
-+++ b/src/modules_io/grid/io_grid_grib2/Makefile.am
-@@ -11,57 +11,9 @@ DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -DUSE_JPEG200
- 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\
-diff --git a/src/modules_io/grid/io_grid_grib2/grib2_import.h b/src/modules_io/grid/io_grid_grib2/grib2_import.h
-index 6381b89..5ab426b 100644
---- a/src/modules_io/grid/io_grid_grib2/grib2_import.h
-+++ b/src/modules_io/grid/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-Remove-references-to-internal-grib2-and-libfire.patch b/debian/patches/0003-Use-debian-version-of-grib2.patch
similarity index 79%
rename from debian/patches/0003-Remove-references-to-internal-grib2-and-libfire.patch
rename to debian/patches/0003-Use-debian-version-of-grib2.patch
index bbb18c3..77784df 100644
--- a/debian/patches/0003-Remove-references-to-internal-grib2-and-libfire.patch
+++ b/debian/patches/0003-Use-debian-version-of-grib2.patch
@@ -1,11 +1,10 @@
From: Johan Van de Wauw <johan.vandewauw at gmail.com>
-Date: Fri, 13 Jun 2014 00:40:14 +0200
-Subject: Remove references to internal grib2 and libfire
+Date: Tue, 15 Jul 2014 04:28:04 -0400
+Subject: Use debian version of grib2
---
src/modules/io/io_grid_grib2/Makefile.am | 50 +-------------------------------
- src/modules/simulation/Makefile.am | 2 +-
- 2 files changed, 2 insertions(+), 50 deletions(-)
+ 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
@@ -70,10 +69,3 @@ index 2d6ff24..7e006ae 100644
grib2_import.cpp\
MLB_Interface.cpp\
grib2_import.h\
-diff --git a/src/modules/simulation/Makefile.am b/src/modules/simulation/Makefile.am
-index 7ec461d..2f378e2 100644
---- 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/debian/patches/0004-Use-qhull-instead-of-triangle.patch b/debian/patches/0004-Use-qhull-instead-of-triangle.patch
index ee748e2..8bc7d3e 100644
--- a/debian/patches/0004-Use-qhull-instead-of-triangle.patch
+++ b/debian/patches/0004-Use-qhull-instead-of-triangle.patch
@@ -1,11 +1,11 @@
From: Johan Van de Wauw <johan.vandewauw at gmail.com>
-Date: Fri, 15 Nov 2013 00:06:46 -0500
+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 +-
- 3 files changed, 4 insertions(+), 14 deletions(-)
+ src/modules/grid/grid_gridding/Makefile.am | 3 +--
+ 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
@@ -28,7 +28,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
diff --git a/debian/patches/series b/debian/patches/series
index 11eb524..9c59c65 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,4 @@
-0001-Use-qhull-instead-of-triangle.patch
-0002-Remove-reference-to-libfire.patch
-0003-Remove-references-to-internal-grib2-and-libfire.patch
-0004-Fix-gcc-errors-from-upstream.patch
+0001-Fix-gcc-errors-from-upstream.patch
+0002-Remove-references-to-libfire.patch
+0003-Use-debian-version-of-grib2.patch
+0004-Use-qhull-instead-of-triangle.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