[Pkg-octave-commit] [SCM] octave-nan branch, master, updated. 3289640d37547150cc85a84bc1996d6a4033e92a

[Thomas Weber]

The following commit has been merged in the master branch:
commit 280cd02654ceaa2076e17c8555d6aed95467c363
Author: Thomas Weber <tweber at debian.org>
Date:   Sun May 15 13:19:07 2011 +0200

    Adapt the package to octave 3.2

diff --git a/debian/changelog b/debian/changelog
index 73b98d1..5fbf2e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+octave-nan (2.4.1-2) UNRELEASED; urgency=low
+
+  * Add patch fix_makefile, for adapting the values to Octave 3.2
+
+ -- Thomas Weber <tweber at debian.org>  Sun, 15 May 2011 13:18:27 +0200
+
 octave-nan (2.4.1-1) unstable; urgency=low
 
   * New upstream release
diff --git a/debian/patches/fix_makefile b/debian/patches/fix_makefile
new file mode 100644
index 0000000..b3ed28e
--- /dev/null
+++ b/debian/patches/fix_makefile
@@ -0,0 +1,22 @@
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -9,9 +9,6 @@
+ # Octave - global install  (e.g. from debian package)
+ OCTAVE_VERSION = 
+ INCOCTAVE = -I /usr/include/octave 
+-# Octave - local install (e.g. compiled from sources) 
+-OCTAVE_VERSION = -3.4.0
+-INCOCTAVE = -I /usr/local/include/octave$(OCTAVE_VERSION)/octave 
+ 
+ # Matlab configuration
+ MATLABDIR = /usr/local/MATLAB/R2010b
+@@ -37,8 +34,8 @@
+ 
+ PROGS = histo_mex.mex covm_mex.mex kth_element.mex sumskipnan_mex.mex str2array.mex train.mex svmtrain_mex.mex svmpredict_mex.mex xptopen.mex 
+ 
+-MEX_EXT = $(shell $(MATLABDIR)/bin/mexext)
+ octave: $(PROGS)
++MEX_EXT = '.mex'
+ matlab: $(patsubst %.mex, %.$(MEX_EXT), $(PROGS))
+ mexw32 win32:  $(patsubst %.mex, %.mexw32, $(PROGS))
+ all:    octave matlab win32
diff --git a/debian/patches/series b/debian/patches/series
index f4e9315..1a7dff2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 fprintf_does_not_like_cells
+fix_makefile

-- 
octave-nan