[Pkg-octave-commit] [SCM] octave branch, master, updated. 3.2.2-2-33-g5c333a4

[Thomas Weber]

tags 618139 pending
thanks

The following commit has been merged in the master branch:
commit 81c7854d01f50995b68123986c68f6746ccf8e5f
Author: Thomas Weber <tweber at debian.org>
Date:   Sun Mar 20 14:56:34 2011 +0100

    Give an explicit preference for the virtural package libcurl4-dev (fix for 618139)

diff --git a/debian/changelog b/debian/changelog
index a739903..f89eb05 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+octave3.2 (3.2.4-9) UNRELEASED; urgency=low
+
+  * debian/in/control: Give an explicit package name as preference for the
+    virtual build-dependency on libcurl4-dev (closes: #618139).
+
+ -- Thomas Weber <tweber at debian.org>  Sun, 20 Mar 2011 14:52:22 +0100
+
 octave3.2 (3.2.4-8) unstable; urgency=low
 
   * New patch: include_mpi_headers, includes /usr/include/mpi by default when
diff --git a/debian/in/control b/debian/in/control
index 5755f20..57ad2b8 100644
--- a/debian/in/control
+++ b/debian/in/control
@@ -12,7 +12,7 @@ Build-Depends: gfortran, debhelper (>= 6.0.7), autoconf, texinfo,
  libhdf5-lam-dev (>= 1.8.4) | libhdf5-mpich-dev (>= 1.8.4) | libhdf5-openmpi-dev (>= 1.8.4),
  libblas-dev (>=1.2-7), liblapack-dev (>=3.2.1-7), gnuplot-nox, libfftw3-dev, texi2html,
  less, quilt, slice[V_3_2:[V_3_0:, libpcre3-dev, flex, libglpk-dev (>= 4.15),
- libsuitesparse-dev (>= 1:3.2.0), gawk, ghostscript, libcurl4-dev,
+ libsuitesparse-dev (>= 1:3.2.0), gawk, ghostscript, libcurl4-gnutls-dev | libcurl4-dev,
  libqhull-dev, desktop-file-utils:], libfltk1.1-dev,
  libgraphicsmagick++1-dev, libftgl-dev,
  libqrupdate-dev, libarpack2-dev (>= 2.1+parpack96.dfsg-2):]

-- 
octave