[Pkg-ocaml-maint-commits] [SCM] camlimages packaging branch, master, updated. debian/3.0.1-3-3-g2f64302

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit c1959c79d5b3790acca1473f4b79ba9ce6920d10
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Tue Oct 6 17:10:10 2009 +0200

    Use dh_ocamldoc to generate and install the documentation (Closes: #549763)

diff --git a/debian/changelog b/debian/changelog
index f6990f5..27617dc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
 camlimages (1:3.0.1-4) unstable; urgency=low
 
   * Update e-mail address
+  * Use dh_ocamldoc to generate and install the documentation
+    (Closes: #549763)
 
- -- Mehdi Dogguy <mehdi at debian.org>  Tue, 06 Oct 2009 17:02:03 +0200
+ -- Mehdi Dogguy <mehdi at debian.org>  Tue, 06 Oct 2009 17:09:31 +0200
 
 camlimages (1:3.0.1-3) unstable; urgency=low
 
diff --git a/debian/libcamlimages-ocaml-doc.ocamldoc.in b/debian/libcamlimages-ocaml-doc.ocamldoc.in
new file mode 100644
index 0000000..508c183
--- /dev/null
+++ b/debian/libcamlimages-ocaml-doc.ocamldoc.in
@@ -0,0 +1,2 @@
+ -package lablgtk2
+--include debian/tmp/@OCamlStdlibDir@/site-lib/camlimages/
diff --git a/debian/rules b/debian/rules
index 57284ba..4623096 100755
--- a/debian/rules
+++ b/debian/rules
@@ -41,7 +41,6 @@ DEB_MAKE_CLEAN_TARGET     := distclean
 DEB_INSTALL_EXAMPLES_libcamlimages-ocaml-doc := -X Makefile -X .depend
 DEB_DH_INSTALL_ARGS                          := -X LICENSE -X README -X INSTALL -X Makefile
 
-OCAML_OCAMLDOC_PACKAGES := $(PACKAGE_DEV)
 OCAML_OCAMLDOC_FLAGS := $(shell ocamlfind query -i-format lablgtk2)
 
 install/libcamlimages-ocaml-doc::
@@ -51,8 +50,3 @@ install/libcamlimages-ocaml-dev::
 	mv '$(CURDIR)/debian/tmp/usr/lib/ocaml/stublibs/dllcamlimages.so' \
 	 '$(DESTDIR)/$(OCAML_DLL_DIR)/'
 	chrpath -d $(DESTDIR)/$(OCAML_DLL_DIR)/*.so
-
-binary-install/libcamlimages-ocaml-doc:: binary-install/libcamlimages-ocaml-dev
-	$(RM) -r $(DESTDIR_DOC)/usr/share/doc/$(PACKAGE_DOC)/html
-	mv $(DESTDIR_DEV)/usr/share/doc/$(PACKAGE_DEV)/html $(DESTDIR_DOC)/usr/share/doc/$(PACKAGE_DOC)/
-	$(RM) -r $(DESTDIR_DEV)/usr/share/doc-base

-- 
camlimages packaging