[Pkg-ocaml-maint-commits] [SCM] type-conv packaging branch, master, updated. debian/1.6.7-1-4-g1cd9b21

[Stefano Zacchiroli]

The following commit has been merged in the master branch:
commit 7f84293c5cd17925e4c3a56ba4a37e023a5bc2c7
Author: Stefano Zacchiroli <zack at upsilon.cc>
Date:   Thu Feb 26 22:32:31 2009 +0100

    debian/rules: use ocaml.mk as a CDBS "rules" snippet

diff --git a/debian/changelog b/debian/changelog
index 343db46..dbd52b0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+type-conv (1.6.7-2) experimental; urgency=low
+
+  * debian/rules: use ocaml.mk as a CDBS "rules" snippet, build-dep on the
+    minimum dh-ocaml implementing that
+
+ --
+
 type-conv (1.6.7-1) experimental; urgency=low
 
   * New Upstream Version
diff --git a/debian/control b/debian/control
index 849dba8..becd55e 100644
--- a/debian/control
+++ b/debian/control
@@ -3,10 +3,14 @@ Section: devel
 Priority: extra
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders: Stefano Zacchiroli <zack at debian.org>, Sylvain Le Gall <gildor at debian.org>
-Build-Depends: cdbs, debhelper (>= 7),
- ocaml-nox (>= 3.11), ocaml-findlib,
- camlp4, camlp4-extra,
- dh-ocaml
+Build-Depends:
+ cdbs,
+ debhelper (>= 7),
+ ocaml-nox (>= 3.11),
+ ocaml-findlib,
+ camlp4,
+ camlp4-extra,
+ dh-ocaml (>= 0.4)
 Standards-Version: 3.8.0
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/type-conv.git
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/type-conv.git
diff --git a/debian/rules b/debian/rules
index f4e41d8..a8dad08 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 = type-conv
 PKG_NAME = lib$(LIB_NAME)-camlp4-dev

-- 
type-conv packaging