[Pkg-octave-commit] [SCM] octave branch, master, updated. 2ecbaa0375353921ac971b4af5a29887b828a0e1

[Thomas Weber]

The following commit has been merged in the master branch:
commit e021dfdc965de62f40dad863c819a9787c990fc5
Author: Thomas Weber <thomas.weber.mail at gmail.com>
Date:   Sat Aug 22 09:24:20 2009 +0200

    Add ${misc:Depends} to the control file
    
    This is necessary because we use debhelper.

diff --git a/debian/changelog b/debian/changelog
index 9c38647..6251faa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ octave3.2 (3.2.0-3) UNRELEASED; urgency=low
   * New patch: dont_pass_ldflags_to_magickconfig: don't pass magickconfig's
     ldflags into MAGICK_LIBS (closes: #535080)
   * Bump standards version to 3.8.2, no changes needed
+  * Add ${misc:Depends} to all Depends: lines in debian/in/control, thanks
+    lintian.
 
  -- Rafael Laboissiere <rafael at debian.org>  Sat, 20 Jun 2009 19:16:45 +0200
 
diff --git a/debian/in/control b/debian/in/control
index 7a5d70d..8a13eac 100644
--- a/debian/in/control
+++ b/debian/in/control
@@ -23,7 +23,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-octave/octave.git
 
 Package: octave[V_3_0:3.0:][V_3_2:3.2:]
 Architecture: any
-Depends: ${shlibs:Depends}, texinfo, octave[V_3_0:3.0:][V_3_2:3.2:]-common (= ${source:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, texinfo, octave[V_3_0:3.0:][V_3_2:3.2:]-common (= ${source:Version})
 Recommends: gnuplot, libatlas3gf-base
 Suggests: octave[V_3_0:3.0:][V_3_2:3.2:]-info,
  octave[V_3_0:3.0:][V_3_2:3.2:]-doc,
@@ -68,6 +68,7 @@ Description: GNU Octave language for numerical computations ([V_3_0:3.0:][V_3_2:
 
 Package: octave[V_3_0:3.0:][V_3_2:3.2:]-doc
 Architecture: all
+Depends: ${misc:Depends}
 Section: doc
 Suggests: octave[V_3_0:3.0:][V_3_2:3.2:], xpdf | pdf-viewer
 Conflicts: octave-doc (<< 2.1)[V_3_0:, octave2.9-doc (<< 1:3):][V_3_2:, octave3.1-doc:]
@@ -85,6 +86,7 @@ Description: PDF 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:]-htmldoc
 Architecture: all
+Depends: ${misc:Depends}
 Section: doc
 Suggests: octave[V_3_0:3.0:][V_3_2:3.2:], lynx | www-browser
 Conflicts: octave-htmldoc (<< 2.1), octave2.0-htmldoc[V_3_0:, octave2.9-htmldoc (<< 1:3):][V_3_2:, octave3.1-htmldoc:]
@@ -102,7 +104,7 @@ 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}), ${gcc:Depends},
+Depends: octave[V_3_0:3.0:][V_3_2:3.2:] (= ${binary:Version}), ${gcc:Depends}, ${misc:Depends},
  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,
@@ -125,7 +127,7 @@ Description: header files for the GNU Octave language ([V_3_0:3.0:][V_3_2:3.2:]
 Package: octave[V_3_0:3.0:][V_3_2:3.2:]-emacsen
 Architecture: all
 Depends: octave[V_3_0:3.0:][V_3_2:3.2:], emacs22 | xemacs21 | emacsen,
- debianutils (>= 1.6)
+ debianutils (>= 1.6), ${misc:Depends}
 Conflicts: octave2.0-emacsen[V_3_0:, octave2.9-emacsen (<< 1:3):][V_3_2:, octave3.1-emacsen:]
 Replaces: octave (<= 2.0.16-2)[V_3_2:, octave3.1-emacsen:]
 Provides: octave-emacsen[V_3_2:, octave3.1-emacsen:]
@@ -139,7 +141,7 @@ Description: Emacs support for the GNU Octave language ([V_3_0:3.0:][V_3_2:3.2:]
 
 Package: octave[V_3_0:3.0:][V_3_2:3.2:]-info
 Architecture: all
-Depends: info (>= 3.22) | info-browser
+Depends: info (>= 3.22) | info-browser, ${misc:Depends}
 Conflicts: octave2.0-info[V_3_0:, octave2.9-info (<< 1:3):][V_3_2:, octave3.1-info:]
 Replaces: octave (<= 2.0.16-2)[V_3_2:, octave3.1-info:]
 Provides: octave-info[V_3_2:, octave3.1-info:]
@@ -209,7 +211,7 @@ Package: octave[V_3_0:3.0:][V_3_2:3.2:]-dbg
 Section: debug
 Priority: extra
 Architecture: any
-Depends: octave[V_3_0:3.0:][V_3_2:3.2:] (=${binary:Version})
+Depends: octave[V_3_0:3.0:][V_3_2:3.2:] (=${binary:Version}), ${misc:Depends}
 Description: Debug symbols for octave[V_3_0:3.0:][V_3_2:3.2:]
  Octave is a (mostly Matlab (R) compatible) high-level language, primarily
  intended for numerical computations. It provides a convenient command-line
@@ -223,6 +225,7 @@ Description: Debug symbols for octave[V_3_0:3.0:][V_3_2:3.2:]
  This package provides the debug symbols.
 
 Package: octave[V_3_0:3.0:][V_3_2:3.2:]-common
+Depends: ${misc:Depends}
 Section: devel
 Priority: extra
 Architecture: all

-- 
octave