[Pkg-octave-commit] r1118 - in octave/trunk/debian: . in

[Thomas Weber]

tags 457167 pending
thanks

Author: thomas-guest
Date: 2007-12-20 11:37:34 +0000 (Thu, 20 Dec 2007)
New Revision: 1118

Modified:
   octave/trunk/debian/changelog
   octave/trunk/debian/in/control
Log:
Bug fix for #457167
Drop atlas3-base from control and build-conflict with it


Modified: octave/trunk/debian/changelog
===================================================================
--- octave/trunk/debian/changelog	2007-12-19 22:31:58 UTC (rev 1117)
+++ octave/trunk/debian/changelog	2007-12-20 11:37:34 UTC (rev 1118)
@@ -1,3 +1,11 @@
+octave2.9 (1:2.9.19-3) unstable; urgency=low
+
+  * debian/in/control: 
+    Build-conflict with atlas3-base-dev and remove it from build-depends
+    (closes: 457167)
+
+ -- Thomas Weber <thomas.weber.mail at gmail.com>  Thu, 20 Dec 2007 12:32:57 +0100
+
 octave2.9 (1:2.9.19-2) unstable; urgency=low
 
   * Synched with the last octave2.1 release

Modified: octave/trunk/debian/in/control
===================================================================
--- octave/trunk/debian/in/control	2007-12-19 22:31:58 UTC (rev 1117)
+++ octave/trunk/debian/in/control	2007-12-20 11:37:34 UTC (rev 1118)
@@ -9,13 +9,14 @@
  texlive-latex-base, texlive-generic-recommended, g77, libreadline5-dev,
  libncurses5-dev, gperf, libhdf5-serial-dev (>= 1.6.5) |
  libhdf5-lam-dev (>= 1.6.5) | libhdf5-mpich-dev (>= 1.6.5),
- refblas3-dev | atlas3-base-dev, lapack3-dev | atlas3-base-dev,
+ refblas3-dev, lapack3-dev,
  gnuplot-nox, libfftw3-dev, texi2html, less, dpatch,
  slice[V_2_9:, libpcre3-dev, flex, libglpk-dev (>= 4.15),
  libsuitesparse-dev, gawk, gs-gpl, libcurl4-dev, libqhull-dev,
  desktop-file-utils:][V_3_0:, libpcre3-dev, flex, libglpk-dev (>= 4.15),
  libsuitesparse-dev, gawk, gs-gpl, libcurl4-dev, libqhull-dev,
  desktop-file-utils:]
+Build-Conflicts: atlas3-base-dev
 Standards-Version: 3.7.3
 Homepage: http://www.octave.org/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-octave/octave/
@@ -81,7 +82,7 @@
 Depends: octave[V_2_1:2.1:][V_2_9:2.9:][V_3_0:3.0:] (= ${binary:Version}), g++, g77,
  libreadline5-dev, libncurses5-dev, libhdf5-serial-dev (>= 1.6.5)
  | libhdf5-lam-dev (>= 1.6.5) | libhdf5-mpich-dev (>= 1.6.5),
- refblas3-dev | atlas3-base-dev, lapack3-dev | atlas3-base-dev, libfftw3-dev,
+ refblas3-dev, lapack3-dev, libfftw3-dev,
  ${m68k:Depends}
 Conflicts: octave-headers (<< 2.1)[V_3_0:,octave2.9-headers:]
 Provides: octave-headers