Add ${shlibs:Depends} and ${misc:Depends} to all packages.

Some packages contain ELF binaries, so should get dpkg-shlibdeps-generated
dependencies.  Other packages don't need that but adding the substvars makes
it less likely that dependencies will go missing in the future.

diff --git a/debian/changelog b/debian/changelog
index 7139ac5a9172f49b67290c4e09722cbfd1f38fa8..b42411a16c11e0d9f32267e5a505b8bb47f5fb3b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,14 +1,17 @@
 ocaml (3.10.0-14) UNRELEASED; urgency=low
 
   * NOT RELEASED YET
-  
+
   [ Stefano Zacchiroli ]
   * fix vcs-svn field to point just above the debian/ dir
-  
+
   [ Ralf Treinen ]
   * Policy: add section on correct spelling OCaml, bump version to 0.7.2
 
- -- Ralf Treinen <treinen@debian.org>  Sat, 12 Jan 2008 11:34:28 +0100
+  [ Julien Cristau ]
+  * Add ${shlibs:Depends} and ${misc:Depends} to all packages.
+
+ -- Julien Cristau <jcristau@debian.org>  Thu, 17 Jan 2008 18:48:51 +0100
 
 ocaml (3.10.0-13) unstable; urgency=low
 

diff --git a/debian/control b/debian/control
index dda14118fd651b34fd26149c4dd777ed2bfdb9da..4fcb928417197b3d4d2f0ef4bb6db76ab2179de0 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Homepage: http://caml.inria.fr/
 
 Package: ocaml-nox
 Architecture: any
-Depends: libncurses5-dev, ocaml-base-nox (=${binary:Version}), ocaml-base-nox-${F:OCamlABI}, ocaml-interp-${F:OCamlABI}, gcc, binutils
+Depends: ${shlibs:Depends}, ${misc:Depends}, libncurses5-dev, ocaml-base-nox (=${binary:Version}), ocaml-base-nox-${F:OCamlABI}, ocaml-interp-${F:OCamlABI}, gcc, binutils
 Suggests: ocaml-doc, libgdbm-dev, tuareg-mode | ocaml-mode
 Recommends: camlp4, ledit, file
 Provides: ocaml-nox-${F:OCamlABI}, ${F:BestProvides}, libnums-ocaml-dev
@@ -42,7 +42,7 @@ Description: ML language implementation with a class-based object system
 
 Package: camlp4
 Architecture: any
-Depends: ocaml-nox-${F:OCamlABI}
+Depends: ${shlibs:Depends}, ${misc:Depends}, ocaml-nox-${F:OCamlABI}
 Provides: camlp4-${F:OCamlABI}
 Description: Pre Processor Pretty Printer for OCaml
  Objective Caml (OCaml) is an implementation of the ML language,
@@ -61,7 +61,7 @@ Description: Pre Processor Pretty Printer for OCaml
 
 Package: camlp4-extra
 Architecture: any
-Depends: camlp4-${F:OCamlABI}
+Depends: ${shlibs:Depends}, ${misc:Depends}, camlp4-${F:OCamlABI}
 Description: Pre Processor Pretty Printer for OCaml - extras
  Objective Caml (OCaml) is an implementation of the ML language,
  based on the Caml Light dialect extended with a complete
@@ -79,7 +79,7 @@ Description: Pre Processor Pretty Printer for OCaml - extras
 
 Package: ocaml
 Architecture: any
-Depends: ocaml-base (= ${binary:Version}), ocaml-base-${F:OCamlABI}, ocaml-nox-${F:OCamlABI}
+Depends: ${shlibs:Depends}, ${misc:Depends}, ocaml-base (= ${binary:Version}), ocaml-base-${F:OCamlABI}, ocaml-nox-${F:OCamlABI}
 Suggests: tcl8.4-dev, tk8.4-dev
 Provides: ocaml-${F:OCamlABI}
 Replaces: ocaml-nox (<< 3.10.0-12)
@@ -109,7 +109,7 @@ Description: ML language implementation with a class-based object system
 Package: ocaml-base-nox
 Architecture: any
 Provides: ocaml-base-nox-${F:OCamlABI}, libnums-ocaml
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Replaces: ocaml-base (<< 3.07.2a-3), libnums-ocaml
 Conflicts: ocaml (<< 3.04-2), ocaml-base (<< 3.07.2a-3), libnums-ocaml
 Description: Runtime system for ocaml bytecode executables
@@ -123,7 +123,7 @@ Description: Runtime system for ocaml bytecode executables
 
 Package: ocaml-base
 Architecture: any
-Depends: ${shlibs:Depends}, ocaml-base-nox-${F:OCamlABI}
+Depends: ${shlibs:Depends}, ${misc:Depends}, ocaml-base-nox-${F:OCamlABI}
 Provides: ocaml-base-${F:OCamlABI}
 Description: Runtime system for ocaml bytecode executables
  Objective Caml (OCaml) is an implementation of the ML language, based on
@@ -137,7 +137,7 @@ Description: Runtime system for ocaml bytecode executables
 
 Package: ocaml-native-compilers
 Architecture: amd64 hurd-i386 i386 kfreebsd-i386 powerpc sparc
-Depends: ocaml-nox (= ${binary:Version}), ocaml-nox-${F:OCamlABI}, gcc, binutils, ${shlibs:Depends}
+Depends: ocaml-nox (= ${binary:Version}), ocaml-nox-${F:OCamlABI}, gcc, binutils, ${shlibs:Depends}, ${misc:Depends}
 Provides: ocaml-best-compilers
 Replaces: ocaml-nox (<= 3.09.2-3)
 Description: Native code compilers of the ocaml suite (the .opt ones)
@@ -166,7 +166,7 @@ Description: Sources for Objective Caml
 Package: ocaml-interp
 Architecture: any
 Provides: ocaml-interp-${F:OCamlABI}
-Depends: ocaml-base-nox-${F:OCamlABI}
+Depends: ocaml-base-nox-${F:OCamlABI}, ${shlibs:Depends}, ${misc:Depends}
 Recommends: ledit
 Replaces: ocaml (<< 3.07.2a-3)
 Conflicts: ocaml (<< 3.07.2a-3)
@@ -181,7 +181,7 @@ Description: OCaml interactive interpreter and standard libraries
 Package: ocaml-compiler-libs
 Architecture: any
 Provides: ocaml-compiler-libs-${F:OCamlABI}
-Depends: ocaml-nox-${F:OCamlABI}
+Depends: ocaml-nox-${F:OCamlABI}, ${shlibs:Depends}, ${misc:Depends}
 Description: OCaml interpreter and standard libraries
  Objective (OCaml) is an implementation of the ML language, based on
  the Caml Light dialect extended with a complete class-based object system
@@ -193,7 +193,7 @@ Description: OCaml interpreter and standard libraries
 
 Package: ocaml-mode
 Architecture: all
-Depends: emacs22 | emacsen
+Depends: emacs22 | emacsen, ${shlibs:Depends}, ${misc:Depends}
 Suggests: ocaml
 Conflicts: ocaml-nox (<< 3.08.3-8)
 Description: A major mode for editing Objective Caml in Emacs