[Pkg-ocaml-maint-commits] [SCM] galax packaging branch, master, updated. debian/1.1-5-5-g2fb4ae1

[Stefano Zacchiroli]

The following commit has been merged in the master branch:
commit 4a780cdda2b43ffae349ff6ed87368a2a72f71a7
Author: Stefano Zacchiroli <zack at upsilon.cc>
Date:   Tue Oct 6 20:11:26 2009 +0200

    switch to dh_ocamldoc for API reference generation
    
    stop relying on ocamldoc-api-ref-config, which is gone
    Closes: #549850

diff --git a/debian/changelog b/debian/changelog
index c9b687d..d24af96 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ galax (1.1-6) UNRELEASED; urgency=low
   * rm debian/svn-deblayout: obsolete, we are now using Git
   * debian/control
     - bump Standards-Version to 3.8.3 (no changes needed)
+  * debian/rules
+    - switch to dh_ocamldoc for API reference generation, stop relying on
+      ocamldoc-api-ref-config, which is gone (Closes: #549850)
 
  -- Stefano Zacchiroli <zack at debian.org>  Tue, 06 Oct 2009 19:48:16 +0200
 
diff --git a/debian/galax-doc.ocamldoc.in b/debian/galax-doc.ocamldoc.in
new file mode 100644
index 0000000..f70d901
--- /dev/null
+++ b/debian/galax-doc.ocamldoc.in
@@ -0,0 +1,2 @@
+-package pcre,netstring,equeue,netclient,netsys,pxp-engine,pxp-lex-iso88591,pxp-lex-utf8,camomile
+--include debian/libgalax-ocaml-dev at OCamlStdlibDir@/galax
diff --git a/debian/rules b/debian/rules
index e04f1ae..9691422 100755
--- a/debian/rules
+++ b/debian/rules
@@ -50,27 +50,10 @@ binary-post-install/galaxd::
 	mv debian/$(cdbs_curpkg)/usr/bin/webgui \
 		debian/$(cdbs_curpkg)/usr/bin/galax-webgui
 
-# by hand ocamldoc invocation, since we want to install the API reference in
-# galax-doc, see #466277
-OCAML_OCAMLDOC_PACKAGES =
-OCAML_OCAMLDOC_OCAMLFIND_FLAGS = -package pcre,netstring,equeue,netclient,netsys,pxp-engine,pxp-lex-iso88591,pxp-lex-utf8,camomile
-OCAML_OCAMLDOC_DESTDIR_HTML = $(shell /usr/share/ocaml/ocamldoc-api-ref-config --html-directory libgalax-ocaml-dev)
-# generate ocamldoc API reference and install it in galax-doc
-binary-install/galax-doc:: binary-install/libgalax-ocaml-dev
-binary-install/galax-doc::
-	mkdir -p debian/$(cdbs_curpkg)/$(OCAML_OCAMLDOC_DESTDIR_HTML)
-	find debian/libgalax-ocaml-dev$(OCAML_STDLIB_DIR)/ \
-		-type f -name '*.mli' -or -name '*.ml' \
-	| xargs ocamlfind ocamldoc $(OCAML_OCAMLDOC_OCAMLFIND_FLAGS) \
-		$(OCAML_OCAMLDOC_FLAGS) $(OCAML_OCAMLDOC_FLAGS_HTML) \
-		-I debian/libgalax-ocaml-dev$(OCAML_STDLIB_DIR)/galax/ \
-		-html -d debian/$(cdbs_curpkg)/$(OCAML_OCAMLDOC_DESTDIR_HTML) \
-		|| true
 build/galax-doc:: debian/galax-doc-stamp
-	tmp=`/usr/share/ocaml/ocamldoc-api-ref-config --doc-base-generate libgalax-ocaml-dev` \
-	&& mv $$tmp `echo $$tmp | sed s/libgalax-ocaml-dev/galax-doc/`
 debian/galax-doc-stamp:
 	$(MAKE) -C doc/ manual.pdf manual.html
+	touch $@
 clean::
 	rm -f debian/galax-doc-stamp
 

-- 
galax packaging