[Pkg-octave-commit] [SCM] Debian packaging for octave branch, squeeze-backports, updated. debian/3.6.2-5-7-g4dc53fa

[Sébastien Villemot]

The following commit has been merged in the squeeze-backports branch:
commit aa5eb7e6cf5cf222276fa51985b8574c6af50d42
Merge: 29c7b6fe79eb74807280cf650b4e1226b9d84481 664fad81e8da21380ba626ce9a9accff2c593a6d
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Fri Oct 12 20:03:00 2012 +0200

    Merge tag 'debian/3.6.2-5' into squeeze-backports

diff --combined debian/control
index a3c0090,2aaed93..1509e9e
--- a/debian/control
+++ b/debian/control
@@@ -5,16 -5,17 +5,17 @@@ Maintainer: Debian Octave Group <pkg-oc
  Uploaders: Thomas Weber <tweber at debian.org>,
             Sébastien Villemot <sebastien.villemot at ens.fr>
  DM-Upload-Allowed: yes
 -Build-Depends: gfortran, debhelper (>= 9), automake, dh-autoreconf, texinfo,
 +Build-Depends: gfortran, debhelper (>= 8), automake, dh-autoreconf, texinfo,
   texlive-latex-base, texlive-generic-recommended, epstool, transfig, pstoedit,
   libreadline-dev | libreadline6-dev | libreadline5-dev,
-  libncurses5-dev, gperf, libhdf5-serial-dev,
 - libncurses5-dev, gperf, libhdf5-dev (>= 1.8.8),
 - libblas-dev (>=1.2-7), liblapack-dev (>= 3.4.1-4), gnuplot-nox, libfftw3-dev, texi2html,
++ 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),
 + libblas-dev (>=1.2-7), liblapack-dev (>=3.2.1-7), gnuplot-nox, libfftw3-dev, texi2html,
   less, libpcre3-dev, flex, libglpk-dev (>= 4.15),
   libsuitesparse-dev (>= 1:3.2.0), gawk, ghostscript, libcurl4-gnutls-dev | libcurl4-dev,
   libqhull-dev, desktop-file-utils, libfltk1.1-dev, libgl2ps-dev,
   libgraphicsmagick++1-dev, libftgl-dev, libfontconfig1-dev,
 - libqrupdate-dev, libarpack2-dev (>= 2.1+parpack96.dfsg-2), dh-exec,
 - dpkg-dev (>= 1.16.1)
 + libqrupdate-dev, libarpack2-dev (>= 2.1+parpack96.dfsg-2)
  Standards-Version: 3.9.3
  Homepage: http://www.octave.org/
  Vcs-Git: git://git.debian.org/git/pkg-octave/octave.git
@@@ -23,7 -24,7 +24,7 @@@ Vcs-Browser: http://git.debian.org/?p=p
  Package: octave
  Architecture: any
  Depends: ${shlibs:Depends}, ${misc:Depends}, texinfo, octave-common (= ${source:Version})
 -Recommends: gnuplot-x11 | gnuplot-qt, libatlas3-base | libopenblas-base
 +Recommends: gnuplot, libatlas3gf-base
  Suggests: octave-info,
   octave-doc,
   octave-htmldoc,
@@@ -125,7 -126,8 +126,8 @@@ Package: liboctave-de
  Architecture: any
  Depends: liboctave1 (= ${binary:Version}), octave (= ${binary:Version}), ${misc:Depends},
   libreadline-dev | libreadline6-dev | libreadline5-dev, libncurses5-dev,
-  libhdf5-serial-dev, 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,
++ libhdf5-serial-dev (>= 1.8.4) | libhdf5-lam-dev (>= 1.8.4) | libhdf5-mpich-dev (>= 1.8.4)
++ | libhdf5-openmpi-dev (>= 1.8.4), 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

-- 
Debian packaging for octave