[Pkg-ocaml-maint-commits] [SCM] camlp5 packaging branch, master, updated. debian/5.10-1-3-gb7e61d3

[Stefano Zacchiroli]

The following commit has been merged in the master branch:
commit 146731c6bcb857d583881e8d3ea1c78946893efa
Author: Stefano Zacchiroli <zack at upsilon.cc>
Date:   Tue Feb 24 14:26:11 2009 +0100

    porting to latest dh-ocaml

diff --git a/debian/changelog b/debian/changelog
index 267c226..54eaeca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+camlp5 (5.10-2) unstable; urgency=low
+
+  * uploading to unstable
+  * debian/rules: use ocaml.mk as a CDBS "rules" snippet, bump dh-ocaml
+    build-dep to the minimum version implementing this
+
+ -- Stefano Zacchiroli <zack at debian.org>  Tue, 24 Feb 2009 14:24:21 +0100
+
 camlp5 (5.10-1) experimental; urgency=low
 
   * New upstream release, compatible with OCaml 3.11.0 (Closes: #507884)
diff --git a/debian/control b/debian/control
index 45383dd..976a449 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Uploaders:
 Build-Depends:
  cdbs,
  debhelper (>= 5),
- dh-ocaml,
+ dh-ocaml (>= 0.4),
  ocaml-nox (>= 3.11.0),
  ocaml-compiler-libs
 Standards-Version: 3.8.0
diff --git a/debian/rules b/debian/rules
index cab4f23..0b698b5 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
 
 PKGNAME = camlp5
 OCAML_OCAMLDOC_PACKAGES = $(PKGNAME)

-- 
camlp5 packaging