[Pkg-ocaml-maint-commits] [SCM] ocamldap packaging branch, master, updated. debian/2.1.8-6-7-g00a606b

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit 8f052e0b72acf94d6ffe185669a33e60d29884c1
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Thu Oct 8 23:12:27 2009 +0200

    Use new features of dh-ocaml

diff --git a/debian/changelog b/debian/changelog
index 9f9d6d8..c2131db 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,10 @@ ocamldap (2.1.8-7) UNRELEASED; urgency=low
   * Move the package to section ocaml
   * Remove old cmi files when cleaning (Closes: #549769)
   * Upgrade Standards-Version to 3.8.3
+  * Use new features of dh-ocaml (>= 0.9)
+    - Generate documentation using dh_ocamldoc
 
- -- Mehdi Dogguy <mehdi at debian.org>  Tue, 06 Oct 2009 16:05:33 +0200
+ -- Mehdi Dogguy <mehdi at debian.org>  Thu, 08 Oct 2009 23:18:01 +0200
 
 ocamldap (2.1.8-6) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 6ad878b..2f893cb 100644
--- a/debian/control
+++ b/debian/control
@@ -9,10 +9,10 @@ Build-Depends: cdbs (>= 0.4.23-1.1),
  debhelper (>= 7), 
  dpatch, 
  ocaml-nox (>= 3.10.0-9), 
- ocaml-findlib (>= 1.1.2pl1-4), 
- libocamlnet-ocaml-dev (>= 2.2.9-6), 
- libssl-ocaml-dev (>= 0.4.3-2),
- dh-ocaml (>= 0.4.1)
+ ocaml-findlib (>= 1.2.5),
+ libocamlnet-ocaml-dev (>= 2.2.9-7),
+ libssl-ocaml-dev (>= 0.4.3-3),
+ dh-ocaml (>= 0.9)
 Standards-Version: 3.8.3
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocamldap.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocamldap.git
@@ -20,7 +20,12 @@ Homepage: http://sourceforge.net/projects/ocamldap/
 
 Package: libldap-ocaml-dev
 Architecture: any
-Depends:  ocaml-nox-${F:OCamlABI}, libocamlnet-ocaml-dev (>= 2.2.8.1-1), libssl-ocaml-dev (>= 0.4.2-3), ${misc:Depends}
+Depends:
+ ${ocaml:Depends},
+ ${shlibs:Depends},
+ libocamlnet-ocaml-dev (>= 2.2.8.1-1),
+ libssl-ocaml-dev (>= 0.4.2-3),
+ ${misc:Depends}
 Description: LDAP bindings for OCaml 
  It supports the core ldap-client functions, including search, add,
  modify, and delete.
diff --git a/debian/libldap-ocaml-dev.ocamldoc b/debian/libldap-ocaml-dev.ocamldoc
new file mode 100644
index 0000000..c31341c
--- /dev/null
+++ b/debian/libldap-ocaml-dev.ocamldoc
@@ -0,0 +1 @@
+ -package ssl
diff --git a/debian/rules b/debian/rules
index b6d15ac..e044caf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -34,7 +34,3 @@ endif
 
 DEB_MAKE_INSTALL_TARGET  := install \
   OCAMLFIND_INSTFLAGS="-ldconf ignore -destdir $(DESTDIR_DEV)/$(OCAML_STDLIB_DIR)"
-
-OCAML_OCAMLDOC_PACKAGES := libldap-ocaml-dev
-OCAML_OCAMLDOC_OCAMLFIND_FLAGS := -package ssl
-

-- 
ocamldap packaging