[saga] 04/04: Fix SVM patch

[Johan Van de Wauw]

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

johanvdw-guest pushed a commit to branch master
in repository saga.

commit 3d685007d97ef45cedb3ae4f3ec4ff5d045e0144
Author: Johan Van de Wauw <johan at vandewauw.be>
Date:   Thu Mar 31 16:35:40 2016 +0200

    Fix SVM patch
---
 .../0004-Use-debian-version-of-libsvm.patch        | 29 ----------------------
 debian/patches/Use-debian-version-of-libsvm.patch  | 18 ++++++++++++++
 debian/patches/series                              |  2 +-
 3 files changed, 19 insertions(+), 30 deletions(-)

diff --git a/debian/patches/0004-Use-debian-version-of-libsvm.patch b/debian/patches/0004-Use-debian-version-of-libsvm.patch
deleted file mode 100644
index 9f11875..0000000
--- a/debian/patches/0004-Use-debian-version-of-libsvm.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: Johan Van de Wauw <johan.vandewauw at gmail.com>
-Date: Mon, 3 Nov 2014 20:38:24 +0100
-Subject: Use debian version of libsvm
-
----
- src/modules/imagery/imagery_svm/Makefile.am | 6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
---- a/src/modules/imagery/imagery_svm/Makefile.am
-+++ b/src/modules/imagery/imagery_svm/Makefile.am
-@@ -5,16 +5,14 @@ if SAGA_UNICODE
- UC_DEFS = -D_SAGA_UNICODE
- endif
- DEF_SAGA           = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
--CXX_INCS           = -I$(top_srcdir)/src/saga_core
-+CXX_INCS           = -I$(top_srcdir)/src/saga_core -I/usr/include/libsvm
- AM_CXXFLAGS        = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
--AM_LDFLAGS         = -fPIC -shared -avoid-version
-+AM_LDFLAGS         = -fPIC -shared -avoid-version -lsvm
- pkglib_LTLIBRARIES = libimagery_svm.la
- libimagery_svm_la_SOURCES =\
- MLB_Interface.cpp\
--svm.cpp\
- svm_grids.cpp\
- MLB_Interface.h\
--svm.h\
- svm_grids.h
- 
- libimagery_svm_la_LIBADD = $(top_srcdir)/src/saga_core/saga_api/libsaga_api.la
diff --git a/debian/patches/Use-debian-version-of-libsvm.patch b/debian/patches/Use-debian-version-of-libsvm.patch
new file mode 100644
index 0000000..8140814
--- /dev/null
+++ b/debian/patches/Use-debian-version-of-libsvm.patch
@@ -0,0 +1,18 @@
+--- a/src/modules/imagery/imagery_svm/Makefile.am
++++ b/src/modules/imagery/imagery_svm/Makefile.am
+@@ -5,14 +5,12 @@
+ DEF_SAGA           = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
+ CXX_INCS           = -I$(top_srcdir)/src/saga_core
+ AM_CXXFLAGS        = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
+-AM_LDFLAGS         = -fPIC -shared -avoid-version
++AM_LDFLAGS         = -fPIC -shared -avoid-version -lsvm
+ pkglib_LTLIBRARIES = libimagery_svm.la
+ libimagery_svm_la_SOURCES =\
+ MLB_Interface.cpp\
+-svm.cpp\
+ svm_grids.cpp\
+ MLB_Interface.h\
+-svm.h\
+ svm_grids.h
+ 
+ libimagery_svm_la_LIBADD = $(top_srcdir)/src/saga_core/saga_api/libsaga_api.la
diff --git a/debian/patches/series b/debian/patches/series
index ba954fa..cf9631d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,4 @@
-0004-Use-debian-version-of-libsvm.patch
+Use-debian-version-of-libsvm.patch
 0001-vigra-hdf5-include.patch
 disable-grid-gridding.patch
 desktop-keywords.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/saga.git