[Pkg-ocaml-maint-commits] [SCM] cothreads packaging branch, master, updated. debian/0.10-2-4-g2624208

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit c6e1a5ec3cf88ed0cae41c19729331b480dd412a
Author: Mehdi Dogguy <dogguy at pps.jussieu.fr>
Date:   Fri Jul 24 15:50:23 2009 +0200

    Make it work with dh_ocaml (and dh_ocamldoc and dh_ocamlinit)

diff --git a/debian/control b/debian/control
index 2b152a1..489c013 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/cothreads.git
 Package: libcothreads-ocaml-dev
 Section: libdevel
 Architecture: any
-Depends: ocaml-nox-${F:OCamlABI}, ${misc:Depends}
+Depends: ${ocaml:Depends}, ${misc:Depends}
 Description: concurrent programming library for OCaml 
  This library enhances the Threads library of the standard OCaml distribution
  in two dimensions:
diff --git a/debian/libcothreads-ocaml-dev.install.in b/debian/libcothreads-ocaml-dev.install.in
index 9fe02d0..18d47f6 100644
--- a/debian/libcothreads-ocaml-dev.install.in
+++ b/debian/libcothreads-ocaml-dev.install.in
@@ -1,2 +1 @@
 debian/META.cothreads @OCamlStdlibDir@/METAS/
-doc/html/*            /usr/share/doc/libcothreads-ocaml-dev/html/api/
diff --git a/debian/libcothreads-ocaml-dev.ocamldoc b/debian/libcothreads-ocaml-dev.ocamldoc
new file mode 100644
index 0000000..3bb5bf4
--- /dev/null
+++ b/debian/libcothreads-ocaml-dev.ocamldoc
@@ -0,0 +1 @@
+-I src
diff --git a/debian/rules b/debian/rules
index a0d4735..b8b2edf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -30,7 +30,7 @@ PACKAGE_DEV := libcothreads-ocaml-dev
 DESTDIR_DEV := $(CURDIR)/debian/$(PACKAGE_DEV)
 
 DEB_MAKE_CLEAN_TARGET    := clean
-DEB_MAKE_BUILD_TARGET    := all doc 
+DEB_MAKE_BUILD_TARGET    := all
 DEB_MAKE_INSTALL_TARGET  := install \
                             DESTDIR='$(DESTDIR_DEV)'
 ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
@@ -41,7 +41,9 @@ DEB_MAKE_BUILD_TARGET    += NATIVE=no
 DEB_MAKE_INSTALL_TARGET  += NATIVE=no
 endif
 
-OCAML_OCAMLDOC_PACKAGES_DOCBASE := libcothreads-ocaml-dev
+OCAML_DHOCAML_FLAGS := --nodefined-map libcothreads-ocaml-dev:Mutex,Thread,Event,Condition,ThreadUnix
+
+OCAML_OCAMLDOC_PACKAGES := libcothreads-ocaml-dev
 
 install/libcothreads-ocaml-dev::
 	sed -i "s/@VERSION@/$(DEB_UPSTREAM_VERSION)/g" '$(CURDIR)/debian/META.cothreads'

-- 
cothreads packaging