[Pkg-octave-commit] [octave-nan] 01/01: Build against libsvm-dev

[Rafael Laboissière]

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

rlaboiss-guest pushed a commit to branch master
in repository octave-nan.

commit 332a9ffe9338d68c98709bb5142c662800fc1066
Author: Rafael Laboissiere <rafael at debian.org>
Date:   Sat Aug 13 08:50:57 2016 -0300

    Build against libsvm-dev
    
    + d/control: Build-depends on libsvm-dev
    + d/p/build-against-libsvm-dev.patch: New patch
    
    Gbp-Dch: Full
    Closes: 833940
---
 debian/control                                |  3 +-
 debian/patches/build-against-libsvm-dev.patch | 59 +++++++++++++++++++++++++++
 debian/patches/series                         |  1 +
 3 files changed, 62 insertions(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index 2ce9e7a..d8d850b 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,8 @@ Uploaders: Thomas Weber <tweber at debian.org>,
            Rafael Laboissiere <rafael at debian.org>,
            Sébastien Villemot <sebastien at debian.org>,
            Mike Miller <mtmiller at debian.org>
-Build-Depends: debhelper (>= 9), cdbs, octave-pkg-dev (>= 1.0.0)
+Build-Depends: debhelper (>= 9), cdbs, octave-pkg-dev (>= 1.0.0),
+ libsvm-dev
 Standards-Version: 3.9.8
 Homepage: http://octave.sourceforge.net/nan/
 Vcs-Git: https://anonscm.debian.org/git/pkg-octave/octave-nan.git
diff --git a/debian/patches/build-against-libsvm-dev.patch b/debian/patches/build-against-libsvm-dev.patch
new file mode 100644
index 0000000..b7e192a
--- /dev/null
+++ b/debian/patches/build-against-libsvm-dev.patch
@@ -0,0 +1,59 @@
+Description: Build againts libsvm-dev
+ In src/Makefile, compile the MEX file against -lsvm instead of using
+ the outdated svm.cpp shipped with the package.  In the source files,
+ include the svm.h header file from the installed libsvm-dev package.
+Author: Rafael Laboissiere <rafael at debian.org>
+Bug-Debian: https://bugs.debian.org/833940
+Forwarded: no
+Last-Update: 2016-08-13
+
+--- octave-nan-3.0.2.orig/src/Makefile
++++ octave-nan-3.0.2/src/Makefile
+@@ -92,10 +92,10 @@ clean:
+ #########################################################
+ #	Octave, MATLAB on Linux 
+ #########################################################
+-svm%_mex.mex: svm%_mex.cpp svm.o svm_model_octave.o
+-	env CC=$(CXX) $(OCTMEX) "$<" svm.o svm_model_octave.o
+-svm%_mex.$(MEX_EXT): svm%_mex.cpp svm.o svm_model_matlab.o
+-	$(MATMEX) "$<" svm.o svm_model_matlab.o
++svm%_mex.mex: svm%_mex.cpp svm_model_octave.o
++	env CC=$(CXX) $(OCTMEX) "$<" -lsvm svm_model_octave.o
++svm%_mex.$(MEX_EXT): svm%_mex.cpp svm_model_matlab.o
++	$(MATMEX) "$<" -lsvm svm_model_matlab.o
+ %.$(MEX_EXT): %.cpp
+ 	$(MATMEX) "$<"
+ 
+--- octave-nan-3.0.2.orig/src/svm_model_matlab.c
++++ octave-nan-3.0.2/src/svm_model_matlab.c
+@@ -59,7 +59,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBI
+ 
+ #include <stdlib.h>
+ #include <string.h>
+-#include "svm.h"
++#include <libsvm/svm.h>
+ 
+ #include "mex.h"
+ 
+--- octave-nan-3.0.2.orig/src/svmpredict_mex.cpp
++++ octave-nan-3.0.2/src/svmpredict_mex.cpp
+@@ -28,7 +28,7 @@ along with this program; if not, see <ht
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+-#include "svm.h"
++#include <libsvm/svm.h>
+ 
+ #include "mex.h"
+ #include "svm_model_matlab.h"
+--- octave-nan-3.0.2.orig/src/svmtrain_mex.cpp
++++ octave-nan-3.0.2/src/svmtrain_mex.cpp
+@@ -29,7 +29,7 @@ along with this program; if not, see <ht
+ #include <stdlib.h>
+ #include <string.h>
+ #include <ctype.h>
+-#include "svm.h"
++#include <libsvm/svm.h>
+ 
+ #include "mex.h"
+ #include "svm_model_matlab.h"
diff --git a/debian/patches/series b/debian/patches/series
index 9106d88..8cfe118 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 reduce_test_memory_footprint.patch
+build-against-libsvm-dev.patch

-- 
Alioth's /home/groups/pkg-octave/bin/git-commit-notice on /srv/git.debian.org/git/pkg-octave/octave-nan.git