[Pkg-octave-commit] [SCM] Debian packaging for octave branch, master, updated. 3.2.2-2-102-g2b393c2

[Thomas Weber]

The following commit has been merged in the master branch:
commit 20265b5480c141dbbd21ae019d800c2f91da7b1a
Author: Thomas Weber <tweber at debian.org>
Date:   Tue Nov 15 23:32:48 2011 +0100

    Only allow the serial HDF5 library when building
    
    Drop patch include_mpi_headers as well, as it was only needed for the
    HDF5 libraries with MPI support.
    Closes: #601511

diff --git a/debian/control b/debian/control
index b58aa21..62f2c13 100644
--- a/debian/control
+++ b/debian/control
@@ -7,8 +7,7 @@ DM-Upload-Allowed: yes
 Build-Depends: gfortran, debhelper (>= 7.0.50~), automake, dh-autoreconf, texinfo,
  texlive-latex-base, texlive-generic-recommended,
  libreadline-dev | libreadline6-dev | libreadline5-dev,
- libncurses5-dev, gperf, libhdf5-serial-dev (>= 1.8.4) |
- libhdf5-lam-dev (>= 1.8.4) | libhdf5-mpich-dev (>= 1.8.4) | libhdf5-openmpi-dev (>= 1.8.4),
+ libncurses5-dev, gperf, libhdf5-serial-dev (>= 1.8.4),
  libblas-dev (>=1.2-7), liblapack-dev (>=3.2.1-7), gnuplot-nox, libfftw3-dev, texi2html,
  less, quilt, libpcre3-dev, flex, libglpk-dev (>= 4.15),
  libsuitesparse-dev (>= 1:3.2.0), gawk, ghostscript, libcurl4-gnutls-dev | libcurl4-dev,
@@ -119,8 +118,7 @@ Package: liboctave-dev
 Architecture: any
 Depends: liboctave0 (= ${binary:Version}), octave (= ${binary:Version}), ${misc:Depends},
  libreadline-dev | libreadline6-dev | libreadline5-dev, libncurses5-dev,
- libhdf5-serial-dev (>= 1.8.4)
- | libhdf5-lam-dev (>= 1.8.4) | libhdf5-mpich-dev (>= 1.8.4) | libhdf5-openmpi-dev (>= 1.8.4),
+ libhdf5-serial-dev (>= 1.8.4), 
  libblas-dev (>=1.2-7), liblapack-dev (>=3.2.1-7), libfftw3-dev, gfortran, gcc, g++, f2c [m68k]
 Section: libdevel
 Description: Development files for the GNU Octave language
diff --git a/debian/patches/include_mpi_headers b/debian/patches/include_mpi_headers
deleted file mode 100644
index f993527..0000000
--- a/debian/patches/include_mpi_headers
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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%}

-- 
Debian packaging for octave