[Pkg-octave-commit] [octave] 03/05: Remove obsolete Conflicts/Replaces against octave3.2* packages.

[Sébastien Villemot]

This is an automated email from the git hooks/post-receive script.

sebastien pushed a commit to branch master
in repository octave.

commit bca560bcae27bfafd23bfd63f8e683c0a0b6b569
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Fri Apr 24 15:50:43 2015 +0200

    Remove obsolete Conflicts/Replaces against octave3.2* packages.
---
 debian/changelog | 1 +
 debian/control   | 8 ++------
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 48070ec..9ce3767 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -29,6 +29,7 @@ octave (4.0.0~rc3-1) UNRELEASED; urgency=low
   * Bump SONAME of liboctave (2->3).
     - d/p/bump-soname.patch: patch to anticipate the bump by upstream.
     - d/control, d/liboctave?.install: rename the package
+  * Remove obsolete Conflicts/Replaces against octave3.2* packages.
 
  -- Rafael Laboissiere <rafael at laboissiere.net>  Wed, 22 Apr 2015 06:25:00 -0300
 
diff --git a/debian/control b/debian/control
index 1cb76ff..770d91a 100644
--- a/debian/control
+++ b/debian/control
@@ -67,8 +67,8 @@ Recommends: gnuplot-x11 | gnuplot-qt, libopenblas-base | libatlas3-base,
 Suggests: octave-info,
  octave-doc,
  octave-htmldoc,
-Conflicts: octave3.2, octave-java
-Replaces: octave3.2, octave-java
+Conflicts: octave-java
+Replaces: octave-java
 Breaks: dynare (<= 4.4.3-1),
   h5utils (<= 1.12.1-2.1),
   libsbml5-octave (<= 5.8.0-2),
@@ -186,8 +186,6 @@ Description: HTML documentation on the GNU Octave language
 Package: octave-info
 Architecture: all
 Depends: info, ${misc:Depends}
-Conflicts: octave3.2-info
-Replaces: 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
@@ -220,8 +218,6 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
  libgl1-mesa-dev | libgl-dev,
  libblas-dev (>=1.2-7) | libblas.so, liblapack-dev (>=3.2.1-7) | liblapack.so,
  libfftw3-dev, gfortran, gcc, g++
-Conflicts: octave3.2-headers
-Replaces: octave3.2-headers
 Section: libdevel
 Description: Development files for the GNU Octave language
  Octave is a (mostly Matlab (R) compatible) high-level language, primarily

-- 
Alioth's /home/groups/pkg-octave/bin/git-commit-notice on /srv/git.debian.org/git/pkg-octave/octave.git