[Pkg-octave-commit] [SCM] octave branch, master, updated. 3.2.2-2-31-g550a8d6

[Thomas Weber]

tags 598227 pending
thanks

The following commit has been merged in the master branch:
commit a06d3199554a9c861fd3e79b1cf787665dc0805c
Author: Thomas Weber <tweber at debian.org>
Date:   Mon Oct 25 21:44:35 2010 +0200

    Add mpi's include path to the default path of mkoctfile (fix for 598227)

diff --git a/debian/changelog b/debian/changelog
index 4191596..c3f9a94 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+octave3.2 (3.2.4-8) UNRELEASED; urgency=low
+
+  * New patch: include_mpi_headers, includes /usr/include/mpi by default when
+    using mkoctfile (closes: #598227)
+
+ -- Thomas Weber <tweber at debian.org>  Sun, 24 Oct 2010 22:08:19 +0200
+
 octave3.2 (3.2.4-7) unstable; urgency=low
 
   * New patch: fix_relative_addpath command (closes: #592517)
diff --git a/debian/in/series b/debian/in/series
index cf60394..69f4bcd 100644
--- a/debian/in/series
+++ b/debian/in/series
@@ -18,4 +18,5 @@ normal-markersize.diff
 filter_empty_vector
 handle_new_graphicsmagic
 fix_relative_addpath
+include_mpi_headers
 :]
diff --git a/debian/patches/include_mpi_headers b/debian/patches/include_mpi_headers
new file mode 100644
index 0000000..f993527
--- /dev/null
+++ b/debian/patches/include_mpi_headers
@@ -0,0 +1,11 @@
+--- a/mkoctfile.in
++++ b/mkoctfile.in
+@@ -78,7 +78,7 @@
+ : ${CXXFLAGS=%OCTAVE_CONF_CXXFLAGS%}
+ : ${CXXPICFLAG=%OCTAVE_CONF_CXXPICFLAG%}
+ : ${XTRA_CFLAGS=%OCTAVE_CONF_XTRA_CFLAGS%}
+-: ${XTRA_CXXFLAGS=%OCTAVE_CONF_XTRA_CXXFLAGS%}
++: ${XTRA_CXXFLAGS=-I/usr/include/mpi %OCTAVE_CONF_XTRA_CXXFLAGS%}
+ 
+ : ${DEPEND_FLAGS=%OCTAVE_CONF_DEPEND_FLAGS%}
+ : ${DEPEND_EXTRA_SED_PATTERN=%OCTAVE_CONF_DEPEND_EXTRA_SED_PATTERN%}

-- 
octave