[Pkg-ocaml-maint-commits] [SCM] ocaml-batteries packaging branch, master, updated. upstream/0.20090401-107-g9e8e3a8

[Stefano Zacchiroli]

The following commit has been merged in the master branch:
commit ea079fdc4f32f2326542174cb8be8cae78fb481f
Author: Stefano Zacchiroli <zack at upsilon.cc>
Date:   Wed Oct 7 10:49:49 2009 +0200

    use dh-ocaml to infer/provide dependencies
    
    keep hand-written dependencies for the interim
    bump build-dep on dh-ocaml to 0.9

diff --git a/debian/changelog b/debian/changelog
index 28de63a..ae907ff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ ocaml-batteries (0.20090405+beta1-3) UNRELEASED; urgency=low
 
   * debian/control
     - bump Standards-Version to 3.8.3 (no changes needed)
+    - use dh-ocaml to infer/provide dependencies, keep hand-written
+      dependencies for the interim; bump build-dep on dh-ocaml to 0.9
   * debian/rules
     - switch {debhelper,patchsys-quilt}.mk: fix debian/*.log cleanup
     - stop using ocamldoc-api-ref-config (gone now), rather ship a
diff --git a/debian/control b/debian/control
index 8402fda..ad6d97d 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Build-Depends:
  libbin-prot-camlp4-dev,
  libzip-ocaml-dev,
  libocamlnet-ocaml-dev,
- dh-ocaml (>= 0.4),
+ dh-ocaml (>= 0.9),
  camlp4,
  camlp4-extra,
  quilt,
@@ -28,7 +28,6 @@ Package: libbatteries-ocaml-dev
 Section: ocaml
 Architecture: any
 Depends:
- ocaml-nox-${F:OCamlABI},
  camlp4,
  ocaml-findlib,
  libcamomile-ocaml-dev,
@@ -37,11 +36,14 @@ Depends:
  libbin-prot-camlp4-dev,
  libzip-ocaml-dev,
  libocamlnet-ocaml-dev,
+ ${ocaml:Depends},
  ${shlibs:Depends},
  ${misc:Depends}
 Recommends: libbatteries-ocaml-doc
 Suggests: ledit
-Provides: libbatteries-camlp4-dev
+Provides:
+ libbatteries-camlp4-dev,
+ ${ocaml:Provides}
 Description: Batteries included: OCaml development platform - development files
  Batteries included is a community-driven effort to standardize on an
  uniform, documented, and comprehensive OCaml development platform.

-- 
ocaml-batteries packaging