[Pkg-octave-commit] [SCM] octave branch, master, updated. 3.2.2-2-1-g84cb05b

[Thomas Weber]

The following commit has been merged in the master branch:
commit 84cb05b21a9ce8de632575196db1a046bad4498d
Author: Thomas Weber <thomas.weber.mail at gmail.com>
Date:   Tue Sep 15 08:46:34 2009 +0200

    Use libreadline-dev instead of libreadline5-dev for build-dependencies
    
    See http://lists.debian.org/debian-devel/2009/09/msg00562.html

diff --git a/debian/changelog b/debian/changelog
index e155319..2281f37 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+octave3.2 (3.2.2-3) UNRELEASED; urgency=low
+
+  * Change build-dependency on libreadline, as per
+    http://lists.debian.org/debian-devel/2009/09/msg00562.html 
+
+ -- Thomas Weber <thomas.weber.mail at gmail.com>  Tue, 15 Sep 2009 08:45:00 +0200
+
 octave3.2 (3.2.2-2) unstable; urgency=low
 
   * Upload to unstable 
diff --git a/debian/in/control b/debian/in/control
index fe73a8d..679499f 100644
--- a/debian/in/control
+++ b/debian/in/control
@@ -7,7 +7,8 @@ Uploaders: Rafael Laboissiere <rafael at debian.org>,
  Thomas Weber <thomas.weber.mail at gmail.com>
 DM-Upload-Allowed: yes
 Build-Depends: gfortran, debhelper (>= 6.0.7), autoconf, texinfo,
- texlive-latex-base, texlive-generic-recommended, libreadline5-dev,
+ texlive-latex-base, texlive-generic-recommended, 
+ libreadline-dev | libreadline6-dev | libreadline5-dev,
  libncurses5-dev, gperf, libhdf5-serial-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,
@@ -105,7 +106,8 @@ Description: HTML documentation on the GNU Octave language ([V_3_0:3.0:][V_3_2:3
 Package: octave[V_3_0:3.0:][V_3_2:3.2:]-headers
 Architecture: any
 Depends: octave[V_3_0:3.0:][V_3_2:3.2:] (= ${binary:Version}), ${misc:Depends},
- libreadline5-dev, libncurses5-dev, libhdf5-serial-dev (>= 1.6.5)
+ libreadline-dev | libreadline6-dev | libreadline5-dev, libncurses5-dev, 
+ libhdf5-serial-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, gfortran, gcc, g++, f2c [m68k]
 Conflicts: octave-headers (<< 2.1)[V_3_0:, octave2.9-headers (<< 1:3):][V_3_2:, octave3.1-headers:]

-- 
octave