r45134 - in /packages/blas/trunk/debian: changelog control

[sebastien-guest at users.alioth.debian.org]

Author: sebastien-guest
Date: Tue Jun 26 18:46:10 2012
New Revision: 45134

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=45134
Log:
Rather use a Conflicts with octave3.2, to make lintian happy

Modified:
    packages/blas/trunk/debian/changelog
    packages/blas/trunk/debian/control

Modified: packages/blas/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/blas/trunk/debian/changelog?rev=45134&op=diff
==============================================================================
--- packages/blas/trunk/debian/changelog (original)
+++ packages/blas/trunk/debian/changelog Tue Jun 26 18:46:10 2012
@@ -1,7 +1,7 @@
 blas (1.2.20110419-4) UNRELEASED; urgency=low
 
   * libblas3.prerm: avoid crash if libblas.so.3gf already deleted
-  * Indicate that libblas3 breaks octave3.2 (Closes: #677399)
+  * Indicate that libblas3 conflicts with octave3.2 (Closes: #677399)
   * libblas3gf transitional package:
     + move to oldlibs section (Closes: #679104)
     + mark as arch:all

Modified: packages/blas/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/blas/trunk/debian/control?rev=45134&op=diff
==============================================================================
--- packages/blas/trunk/debian/control (original)
+++ packages/blas/trunk/debian/control Tue Jun 26 18:46:10 2012
@@ -18,7 +18,8 @@
 Replaces: libblas3gf (<< 1.2.20110419-3), libatlas3gf-base (<< 3.8.4-4),
  libopenblas-base (<< 0.1.1-3)
 Breaks: libblas3gf (<< 1.2.20110419-3), libatlas3gf-base (<< 3.8.4-4),
- libopenblas-base (<< 0.1.1-3), octave3.2
+ libopenblas-base (<< 0.1.1-3)
+Conflicts: octave3.2
 Description: Basic Linear Algebra Reference implementations, shared library
  BLAS (Basic Linear Algebra Subroutines) is a set of efficient
  routines for most of the basic vector and matrix operations.