[Pkg-ocaml-maint-commits] [SCM] ocamlnet packaging branch, master, updated. debian/2.2.9-5-6-g72bcd27

[Stefano Zacchiroli]

The following commit has been merged in the master branch:
commit 6b79b2152bd1cba69dac825e30c3a23db4130707
Author: Stefano Zacchiroli <zack at upsilon.cc>
Date:   Sat Feb 21 14:39:14 2009 +0100

    use ocaml.mk as a CDBS "rules" file

diff --git a/debian/changelog b/debian/changelog
index 1e67fe6..03fff2a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,10 @@ ocamlnet (2.2.9-6) UNRELEASED; urgency=low
 
   * debian/*.in: avoid using @OCamlABI@ for dir path and explicit
     "stublibs/"
-  * debian/rules: use ocamldoc-apiref-config from /usr/share/ocaml/;
-    accordingly: bump dependency on dh-ocaml to >= 0.2
+  * debian/rules:
+    - use ocamldoc-apiref-config from /usr/share/ocaml/
+    - use ocaml.mk as a CDBS "rules" rather than a CDBS "class"
+    - bump dependency on dh-ocaml to >= 0.3
   * debian/*.install.in: avoid specifying debian/tmp/ (is default now)
   * debian/patches/*
     - disable patches to build against camlp5: build_w_camlp5,
diff --git a/debian/control b/debian/control
index 36b28c3..11c1a74 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders: Stefano Zacchiroli <zack at debian.org>
 Build-Depends: debhelper (>> 7.0.0), dpatch, cdbs,
- dh-ocaml (>= 0.2),
+ dh-ocaml (>= 0.3),
  ocaml-nox (>= 3.11.0), camlp5 (>= 5.10),
  ocaml-findlib,
  libpcre-ocaml-dev (>= 5.11.1),
diff --git a/debian/rules b/debian/rules
index e1131cd..de44301 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,7 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/makefile.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 = libocamlnet-ocaml-dev
 

-- 
ocamlnet packaging