The following commit has been merged in the master branch: commit b8acb5c359f0e13b29296e33d9893d3bb2cb8dd9 Author: Johan Van de Wauw <johan.vandew...@gmail.com> Date: Sat Mar 26 08:59:27 2011 +0100
Correct previous patch for qhull diff --git a/debian/patches/0002-Enable-qhull-replaces-triangle.c.patch b/debian/patches/0002-Enable-qhull-replaces-triangle.c.patch index d29e0e3..456354f 100644 --- a/debian/patches/0002-Enable-qhull-replaces-triangle.c.patch +++ b/debian/patches/0002-Enable-qhull-replaces-triangle.c.patch @@ -3,9 +3,23 @@ Date: Fri, 25 Mar 2011 23:25:10 +0100 Subject: [PATCH] Enable qhull (replaces triangle.c) --- + src/modules/grid/grid_gridding/Makefile.am | 2 +- src/modules/grid/grid_gridding/nn/delaunay.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 2 files changed, 2 insertions(+), 2 deletions(-) +diff --git a/src/modules/grid/grid_gridding/Makefile.am b/src/modules/grid/grid_gridding/Makefile.am +index 88aed2b..646bb20 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) +-AM_LDFLAGS = -fPIC -shared -avoid-version ++AM_LDFLAGS = -fPIC -shared -avoid-version -lqhull + pkglib_LTLIBRARIES = libgrid_gridding.la + libgrid_gridding_la_SOURCES =\ + Interpolation.cpp\ diff --git a/src/modules/grid/grid_gridding/nn/delaunay.c b/src/modules/grid/grid_gridding/nn/delaunay.c index a5ec8ed..f511a63 100644 --- a/src/modules/grid/grid_gridding/nn/delaunay.c diff --git a/debian/patches/0003-Remove-references-to-triangle.c-from-Makefile.am.patch b/debian/patches/0003-Remove-references-to-triangle.c-from-Makefile.am.patch index 8f120f5..4b0295a 100644 --- a/debian/patches/0003-Remove-references-to-triangle.c-from-Makefile.am.patch +++ b/debian/patches/0003-Remove-references-to-triangle.c-from-Makefile.am.patch @@ -7,7 +7,7 @@ Subject: [PATCH] Remove references to triangle.c from Makefile.am 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/src/modules/grid/grid_gridding/Makefile.am b/src/modules/grid/grid_gridding/Makefile.am -index 88aed2b..dfac16b 100644 +index 646bb20..401b164 100644 --- a/src/modules/grid/grid_gridding/Makefile.am +++ b/src/modules/grid/grid_gridding/Makefile.am @@ -33,7 +33,6 @@ Shepard.cpp\ diff --git a/debian/patches/0005-Run-autoconf-fi.patch b/debian/patches/0005-Run-autoconf-fi.patch index 2788837..bc24241 100644 --- a/debian/patches/0005-Run-autoconf-fi.patch +++ b/debian/patches/0005-Run-autoconf-fi.patch @@ -9,11 +9,11 @@ Subject: [PATCH] Run autoconf -fi configure | 497 +- ltmain.sh | 33 +- m4/libtool.m4 | 45 +- - src/modules/grid/grid_gridding/Makefile.in | 12 +- + src/modules/grid/grid_gridding/Makefile.in | 14 +- src/modules_io/grid/io_grid_grib2/Makefile.in | 455 +- src/modules_simulation/Makefile.in | 2 +- src/saga_core/saga_api/saga_api_wrap.cxx |131751 ------------------------- - 10 files changed, 355 insertions(+), 132472 deletions(-) + 10 files changed, 356 insertions(+), 132473 deletions(-) delete mode 100644 src/saga_core/saga_api/saga_api_wrap.cxx diff --git a/aclocal.m4 b/aclocal.m4 @@ -1936,7 +1936,7 @@ index 671cde1..a3fee53 100644 KCC*) # Kuck and Associates, Inc. (KAI) C++ Compiler diff --git a/src/modules/grid/grid_gridding/Makefile.in b/src/modules/grid/grid_gridding/Makefile.in -index 33f2a39..bf4b2e6 100644 +index 33f2a39..9f0a996 100644 --- a/src/modules/grid/grid_gridding/Makefile.in +++ b/src/modules/grid/grid_gridding/Makefile.in @@ -80,7 +80,7 @@ am_libgrid_gridding_la_OBJECTS = Interpolation.lo \ @@ -1948,6 +1948,15 @@ index 33f2a39..bf4b2e6 100644 libgrid_gridding_la_OBJECTS = $(am_libgrid_gridding_la_OBJECTS) DEFAULT_INCLUDES = -I.@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp +@@ -256,7 +256,7 @@ top_srcdir = @top_srcdir@ + 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) +-AM_LDFLAGS = -fPIC -shared -avoid-version ++AM_LDFLAGS = -fPIC -shared -avoid-version -lqhull + pkglib_LTLIBRARIES = libgrid_gridding.la + libgrid_gridding_la_SOURCES = \ + Interpolation.cpp\ @@ -276,7 +276,6 @@ Shepard.cpp\ ./nn/nnai.c\ ./nn/nncommon.c\ -- Saga GIS _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel