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

[Thomas Weber]

The following commit has been merged in the master branch:
commit f04e926928aee5755e5aa057f0cb528ae2c55ba1
Author: Sébastien Villemot <sebastien.villemot at ens.fr>
Date:   Tue Dec 6 13:58:51 2011 +0100

    Add Conflicts with octave3.2* packages

diff --git a/debian/control b/debian/control
index c33cead..bcc16a4 100644
--- a/debian/control
+++ b/debian/control
@@ -26,6 +26,7 @@ Recommends: gnuplot, libatlas3gf-base
 Suggests: octave-info,
  octave-doc,
  octave-htmldoc,
+Conflicts: octave3.2
 Description: GNU Octave language for numerical computations
  Octave is a (mostly Matlab (R) compatible) high-level language, primarily
  intended for numerical computations. It provides a convenient command-line
@@ -92,6 +93,7 @@ Description: HTML documentation on the GNU Octave language
 Package: octave-info
 Architecture: all
 Depends: info, ${misc:Depends}
+Conflicts: octave3.2-info
 Section: doc
 Description: GNU Info documentation on the GNU Octave language
  Octave is a (mostly Matlab (R) compatible) high-level language, primarily
@@ -120,6 +122,7 @@ Depends: liboctave0 (= ${binary:Version}), octave (= ${binary:Version}), ${misc:
  libreadline-dev | libreadline6-dev | libreadline5-dev, libncurses5-dev,
  libhdf5-serial-dev (>= 1.8.4), 
  libblas-dev (>=1.2-7), liblapack-dev (>=3.2.1-7), libfftw3-dev, gfortran, gcc, g++
+Conflicts: octave3.2-headers
 Section: libdevel
 Description: Development files for the GNU Octave language
  Octave is a (mostly Matlab (R) compatible) high-level language, primarily

-- 
Debian packaging for octave