[Pkg-ocaml-maint-commits] [SCM] postgresql-ocaml packaging branch, master, updated. debian/1.7.0-3-18-g17fd15e

[Stefano Zacchiroli]

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

    port to recent dh-ocaml

diff --git a/debian/changelog b/debian/changelog
index 19231c3..af27cdb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ postgresql-ocaml (1.7.0-4) UNRELEASED; urgency=low
   * debian/control
     - bump standards-version to 3.8.0 (no changes needed)
     - add missing ${misc:Depends} to -dev library package
+    - add build-dep on dh-ocaml, which now ships the CDBS class
+  * debian/rules: use ocaml.mk as a "rules" CDBS snippet
   * bump debhelper compatibility level to 7
 
   [ Stephane Glondu ]
diff --git a/debian/control b/debian/control
index 0e1f678..9a41240 100644
--- a/debian/control
+++ b/debian/control
@@ -9,6 +9,7 @@ Build-Depends:
  ocaml-findlib (>= 1.1),
  libpq-dev,
  dpatch,
+ dh-ocaml (>= 0.4),
  cdbs
 Standards-Version: 3.8.0
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/postgresql-ocaml.git
diff --git a/debian/rules b/debian/rules
index 343017d..57a10be 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 = libpostgresql-ocaml-dev
 

-- 
postgresql-ocaml packaging