[Pkg-ocaml-maint-commits] [SCM] ulex packaging branch, master, updated. debian/1.0-4-15-ga92f852

[Stefano Zacchiroli]

The following commit has been merged in the master branch:
commit cf9eb38d0efe296feef34e08a7ce0ce73a939f18
Author: Stefano Zacchiroli <zack at upsilon.cc>
Date:   Sat Feb 28 22:46:18 2009 +0100

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

diff --git a/debian/changelog b/debian/changelog
index 71c7b6a..d83eac8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ ulex (1.1-1) UNRELEASED; urgency=low
   * New Upstream Version
   * bump debhelper compatibility level to 7
   * rebuild against ocaml 3.11, bump build-deps accordingly
+  * debian/rules: use ocaml.mk as a CDBS "rules" snippet
 
   [ Stephane Glondu ]
   * Switching packaging to git
diff --git a/debian/control b/debian/control
index 6aaa017..9ce35aa 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends:
  camlp4,
  camlp4-extra,
  ocaml-findlib (>= 1.2.4),
- dh-ocaml,
+ dh-ocaml (>= 0.4),
  dpatch,
  cdbs
 Standards-Version: 3.7.3
diff --git a/debian/rules b/debian/rules
index f178dfa..029ad34 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,8 +1,8 @@
 #!/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/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/dpatch.mk
-include /usr/share/cdbs/1/class/ocaml.mk
+include /usr/share/cdbs/1/rules/ocaml.mk
 
 PKGNAME = ocaml-ulex
 OCAML_OCAMLDOC_PACKAGES = $(PKGNAME)

-- 
ulex packaging