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

[Rafael Laboissiere]

Author: rafael
Date: 2009-01-05 16:33:42 +0000 (Mon, 05 Jan 2009)
New Revision: 2572

Modified:
   octave/trunk/debian/changelog
   octave/trunk/debian/in/control
Log:
Synch with the lenny branch

Modified: octave/trunk/debian/changelog
===================================================================
--- octave/trunk/debian/changelog	2009-01-04 14:35:24 UTC (rev 2571)
+++ octave/trunk/debian/changelog	2009-01-05 16:33:42 UTC (rev 2572)
@@ -4,6 +4,7 @@
     polyfit.m taken from the Mercurial upstream repository.  This version
     has a new algorithm that improves the numerical stability of the
     results for ill-conditioned input values (closes: #510577).
+  * debian/in/control: Synch with the lenny branch
 
  -- Rafael Laboissiere <rafael at debian.org>  Sat, 03 Jan 2009 12:28:47 +0100
 
@@ -100,6 +101,13 @@
 
  -- Rafael Laboissiere <rafael at debian.org>  Tue, 22 Jul 2008 00:50:49 +0200
 
+octave3.0 (1:3.0.1-6lenny1) unstable; urgency=low
+  
+  * Allow libhdf5-openmpi-dev to satisfy Octave's hdf5 dependency (closes:
+    #494139)
+  
+ -- Thomas Weber <thomas.weber.mail at gmail.com>  Tue, 12 Aug 2008 22:28:01 +0000
+  
 octave3.1 (3.1.50-1) experimental; urgency=low
 
   * New upstream release (development branch)

Modified: octave/trunk/debian/in/control
===================================================================
--- octave/trunk/debian/in/control	2009-01-04 14:35:24 UTC (rev 2571)
+++ octave/trunk/debian/in/control	2009-01-05 16:33:42 UTC (rev 2572)
@@ -10,7 +10,7 @@
  debhelper (>= 6.0.7), autoconf, texinfo,
  texlive-latex-base, texlive-generic-recommended, libreadline5-dev,
  libncurses5-dev, gperf, libhdf5-serial-dev (>= 1.6.6) |
- libhdf5-lam-dev (>= 1.6.6) | libhdf5-mpich-dev (>= 1.6.6),
+ libhdf5-lam-dev (>= 1.6.6) | libhdf5-mpich-dev (>= 1.6.6) | libhdf5-openmpi-dev (>= 1.6.6),
  libblas-dev, liblapack-dev, gnuplot-nox, libfftw3-dev, texi2html,
  less, dpatch, slice[V_3_1:[V_3_0:, libpcre3-dev, flex, libglpk-dev (>= 4.15),
  libsuitesparse-dev (>= 3.1.0-2), gawk, ghostscript, libcurl4-dev,
@@ -104,7 +104,7 @@
 Depends: octave[V_2_1:2.1:][V_3_0:3.0:][V_3_1:3.1:] (= ${binary:Version}), gfortran,
  gcc [!arm], gcc-4.1 [arm], g++ [!arm], g++-4.1 [arm],
  libreadline5-dev, libncurses5-dev, libhdf5-serial-dev (>= 1.6.5)
- | libhdf5-lam-dev (>= 1.6.5) | libhdf5-mpich-dev (>= 1.6.5),
+ | libhdf5-lam-dev (>= 1.6.5) | libhdf5-mpich-dev (>= 1.6.5) | libhdf5-openmpi-dev (>= 1.6.5),
  libblas-dev, liblapack-dev, libfftw3-dev,
  f2c [m68k]
 Conflicts: octave-headers (<< 2.1)[V_3_0:, octave2.9-headers (<< 1:3):]