[Pkg-ocaml-maint-commits] [SCM] OCaml packaging branch, master, updated. debian/3.11.1-5-5-g9688ab7
Mehdi Dogguy
mehdi at debian.org
Sat Dec 26 19:47:25 UTC 2009
The following commit has been merged in the master branch:
commit 9688ab711acc76a2e55e788e72f4537f4ab289b0
Author: Mehdi Dogguy <mehdi at debian.org>
Date: Sat Dec 26 20:10:24 2009 +0100
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 1539db2..6825370 100644
--- 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 at debian.org> Wed, 16 Dec 2009 13:21:56 +0100
diff --git a/debian/control b/debian/control
index c4e1d7a..fd329db 100644
--- 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 c4cef1c..744bfd5 100644
--- 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,
--
OCaml packaging
More information about the Pkg-ocaml-maint-commits
mailing list