[Pkg-octave-commit] [SCM] Debian packaging for octave branch, master, updated. debian/3.6.2-4-2-g664fad8

[Sébastien Villemot]

The following commit has been merged in the master branch:
commit 30751a2b89eb07b269b784373cf22a63676f598b
Author: Sébastien Villemot <sebastien.villemot at ens.fr>
Date:   Fri Aug 10 12:01:32 2012 +0200

    Make liboctave-dev coinstallable with all HDF5 variants

diff --git a/debian/control b/debian/control
index ed43e0d..2aaed93 100644
--- a/debian/control
+++ b/debian/control
@@ -126,7 +126,8 @@ Package: liboctave-dev
 Architecture: any
 Depends: liboctave1 (= ${binary:Version}), octave (= ${binary:Version}), ${misc:Depends},
  libreadline-dev | libreadline6-dev | libreadline5-dev, libncurses5-dev,
- libhdf5-dev (>= 1.8.8), libgl1-mesa-dev | libgl-dev,
+ libhdf5-dev (>= 1.8.8) | libhdf5-openmpi-dev (>= 1.8.8) | libhdf5-mpich2-dev (>= 1.8.8),
+ libgl1-mesa-dev | libgl-dev,
  libblas-dev (>=1.2-7), liblapack-dev (>=3.2.1-7), libfftw3-dev, gfortran, gcc, g++
 Conflicts: octave3.2-headers
 Replaces: octave3.2-headers
diff --git a/debian/patches/mkoctfile-mpi.diff b/debian/patches/mkoctfile-mpi.diff
new file mode 100644
index 0000000..3413a87
--- /dev/null
+++ b/debian/patches/mkoctfile-mpi.diff
@@ -0,0 +1,18 @@
+Description: Include MPI headers when building Oct/MEX-files
+Author: Thomas Weber <tweber at debian.org>
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=598227
+Forwarded: not-needed
+Last-Update: 2012-08-18
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/src/mkoctfile.in
++++ b/src/mkoctfile.in
+@@ -77,7 +77,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%}
diff --git a/debian/patches/series b/debian/patches/series
index 0799947..a40c692 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@ add_info_dir_categories
 correct_typos
 use_system_gl2ps
 drop_version_from_mkoctfile_function_call
+mkoctfile-mpi.diff

-- 
Debian packaging for octave