[Pkg-ocaml-maint-commits] [SCM] bin-prot packaging branch, master, updated. debian/1.0.5-4-5-gf467890

[Stefano Zacchiroli]

The following commit has been merged in the master branch:
commit f4678900b1784675d5387c58348733dab769456f
Author: Stefano Zacchiroli <zack at upsilon.cc>
Date:   Sun Mar 1 09:25:06 2009 +0100

    add build-dep on dh-ocaml, which now ships ocaml.mk

diff --git a/debian/changelog b/debian/changelog
index 603d9fe..efbc4ee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ bin-prot (1.0.5-5) unstable; urgency=low
   * rebuild against ocaml 3.11, bump build-dep to induce dep-waits
   * debian/control
     - bump standards-version to 3.8.0 (no changes needed)
+    - add build-dep on dh-ocaml, which now ships ocaml.mk
+  * debian/rules: use ocaml.mk as a CDBS "rules" file
 
   [ Mehdi Dogguy ]
   * Fix watch file.
diff --git a/debian/control b/debian/control
index 8b47984..1fa7694 100644
--- a/debian/control
+++ b/debian/control
@@ -6,8 +6,9 @@ Uploaders:
  Stefano Zacchiroli <zack at debian.org>,
  Sylvain Le Gall <gildor at debian.org>
 Build-Depends:
- cdbs,
  debhelper (>= 7),
+ cdbs,
+ dh-ocaml (>= 0.4),
  ocaml-nox (>= 3.11),
  ocaml-findlib (>= 1.2.4),
  camlp4,
diff --git a/debian/rules b/debian/rules
index f6f4b16..1cac944 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
-include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/makefile.mk
-include /usr/share/cdbs/1/class/ocaml.mk
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/ocaml.mk
 
 LIB_NAME = bin-prot
 PKG_NAME = lib$(LIB_NAME)-camlp4-dev

-- 
bin-prot packaging