Make camlp4-extra depend on ocaml-base-nox

1) camlp4-extra is not considered when computing the deps to not have
   to deal with all the redefined modules.
2) camlp4-extra ships some bytecode executables. It has to depend on
   ocaml-base-nox
3) camlp4-extra depends on camlp4 which depends on ocaml-base-nox.
   Adding the dep on ocaml-base-nox for camlp4-extra is used only to
   avoid lintian errors.

diff --git a/debian/changelog b/debian/changelog
index 1539db23dbec0d6c29c46c043ba589aa69154268..6825370991902520af8b5e4b0f5b7d0efdb8e949 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ ocaml (3.11.1-6) UNRELEASED; urgency=low
     - Don't install a manpage for camlp4boot (which is not installed).
   * debian/rules:
     - Do not compute dependencies for camlp4-extra
+  * debian/control:
+    - Make camlp4-extra depend on ocaml-base-nox
 
  -- Mehdi Dogguy <mehdi@debian.org>  Wed, 16 Dec 2009 13:21:56 +0100
 

diff --git a/debian/control b/debian/control
index c4e1d7ac6c89f72f8105718894c63862e5c0663f..fd329dba5d2c18bb64ce89ee887cf8486fea7bf5 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -108,6 +108,7 @@ Depends:
  ${shlibs:Depends},
  ${misc:Depends},
  ${ocaml:Depends},
+ ocaml-nox-${F:OCamlABI},
  camlp4-${F:OCamlABI}
 Description: Pre Processor Pretty Printer for OCaml - extras
  Objective Caml (OCaml) is an implementation of the ML language,

diff --git a/debian/control.in b/debian/control.in
index c4cef1cdd0b48dd95e26390c8ab3434febe87b8b..744bfd5780547b6c33436c317e44d0c2d69040da 100644 (file)
--- a/debian/control.in
+++ b/debian/control.in
@@ -108,6 +108,7 @@ Depends:
  ${shlibs:Depends},
  ${misc:Depends},
  ${ocaml:Depends},
+ ocaml-nox-${F:OCamlABI},
  camlp4-${F:OCamlABI}
 Description: Pre Processor Pretty Printer for OCaml - extras
  Objective Caml (OCaml) is an implementation of the ML language,