[Pkg-ocaml-maint-commits] [SCM] ocaml-batteries packaging branch, master, updated. upstream/0.20090401-107-g9e8e3a8

[Stefano Zacchiroli]

The following commit has been merged in the master branch:
commit 68d9c01c50916f85d3a245b3b3f578c69d83b266
Author: Stefano Zacchiroli <zack at upsilon.cc>
Date:   Wed Oct 7 10:47:57 2009 +0200

    stop using ocamldoc-api-ref-config (gone now)
    
    rather ship a hand-written doc-base entry
    Closes: #549795

diff --git a/debian/changelog b/debian/changelog
index 0f398b1..28de63a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ ocaml-batteries (0.20090405+beta1-3) UNRELEASED; urgency=low
     - bump Standards-Version to 3.8.3 (no changes needed)
   * debian/rules
     - switch {debhelper,patchsys-quilt}.mk: fix debian/*.log cleanup
+    - stop using ocamldoc-api-ref-config (gone now), rather ship a
+      hand-written doc-base entry (Closes: #549795)
 
  -- Stefano Zacchiroli <zack at debian.org>  Tue, 06 Oct 2009 20:55:03 +0200
 
diff --git a/debian/libbatteries-ocaml-doc.doc-base b/debian/libbatteries-ocaml-doc.doc-base
new file mode 100644
index 0000000..b63eb2e
--- /dev/null
+++ b/debian/libbatteries-ocaml-doc.doc-base
@@ -0,0 +1,8 @@
+Document: libbatteries-ocaml-dev-ocamldoc-api-reference
+Title: libbatteries-ocaml-dev OCamldoc API Reference
+Abstract: API reference manual for libbatteries-ocaml-dev (generated via OCamldoc)
+Section: Programming/OCaml
+
+Format: HTML
+Index: /usr/share/doc/libbatteries-ocaml-dev/html/api/index.html
+Files: /usr/share/doc/libbatteries-ocaml-dev/html/api/*
diff --git a/debian/rules b/debian/rules
index b3afd64..c77bf95 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,10 +32,6 @@ export OCAMLFIND_COMMANDS="ocamldoc=ocamldoc"
 install/$(DOC_PKG_NAME):: ocamldoc-stamp
 ocamldoc-stamp:
 	OCAMLRUNPARAM=l=16M make doc OBFLAGS="-classic-display -no-hygiene"
-	/usr/share/ocaml/ocamldoc-api-ref-config \
-		--doc-base-generate $(DEV_PKG_NAME)
-	mv debian/$(DEV_PKG_NAME).doc-base.ocamldoc-apiref \
-		debian/$(DOC_PKG_NAME).doc-base.ocamldoc-apiref
 	touch $@
 clean::
 	rm -f ocamldoc-stamp

-- 
ocaml-batteries packaging