[Pkg-ocaml-maint-commits] [SCM] janest-core packaging branch, master, updated. debian/0.5.3-1-32-gd147cb4

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit a49153cc808e8224347ffec0f52cb994d470ab11
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Thu Nov 12 13:34:59 2009 +0100

    Fix generation of the api doc ref

diff --git a/debian/changelog b/debian/changelog
index a8f8c18..776ca74 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 janest-core (0.6.0-1) unstable; urgency=low
 
+  [ Stefano Zacchiroli ]
   * New upstream release
   * refresh patches from debian/patches/:
     - 0002-extra-targets-to-enable-compilation-of-byte-code-onl
@@ -20,7 +21,15 @@ janest-core (0.6.0-1) unstable; urgency=low
     - document how to use thread support with Core (for newbies)
     - add a pointer to the online ocamldoc API reference
 
- -- Stefano Zacchiroli <zack at debian.org>  Thu, 12 Nov 2009 11:00:38 +0100
+  [ Mehdi Dogguy ]
+  * enable generation of ocamldoc documentation (using dh_ocamldoc)
+    - Some files need to be pre-processed to get the documentation
+      generated.
+    - Pass "-I lib -I +threads" to ocamldoc for core lib.
+    - Pass "-I extended -I +threads -package res" to ocamldoc for core
+      extended.
+
+ -- Mehdi Dogguy <mehdi at debian.org>  Thu, 12 Nov 2009 14:38:09 +0100
 
 janest-core (0.5.3-1) unstable; urgency=low
 
@@ -101,4 +110,3 @@ janest-core (0.5.0-1) experimental; urgency=low
   * Initial release (Closes: #479152)
 
  -- Stefano Zacchiroli <zack at debian.org>  Sat, 03 May 2008 10:55:27 +0200
-
diff --git a/debian/libcore-extended-ocaml-dev.ocamldoc b/debian/libcore-extended-ocaml-dev.ocamldoc
new file mode 100644
index 0000000..9d3516f
--- /dev/null
+++ b/debian/libcore-extended-ocaml-dev.ocamldoc
@@ -0,0 +1,7 @@
+-I extended -I lib -I +threads
+-syntax camlp4o
+-package res
+-package bin_prot.syntax
+-package fieldslib.syntax
+-package sexplib.syntax
+-package type-conv.syntax
diff --git a/debian/libcore-ocaml-dev.ocamldoc b/debian/libcore-ocaml-dev.ocamldoc
new file mode 100644
index 0000000..0533507
--- /dev/null
+++ b/debian/libcore-ocaml-dev.ocamldoc
@@ -0,0 +1,6 @@
+-I lib -I +threads
+-syntax camlp4o
+-package bin_prot.syntax
+-package fieldslib.syntax
+-package sexplib.syntax
+-package type-conv.syntax
diff --git a/debian/rules b/debian/rules
index 79bcde3..f128842 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,5 +14,16 @@ DEB_MAKE_BUILD_TARGET = byte
 DEB_MAKE_INSTALL_TARGET = libinstall-byte-code OCAMLFIND_INSTFLAGS="-destdir $(DEST_DIR) -ldconf ignore"
 endif
 
+pre-build::
+	for file in lib/bigstring.mli lib/core_mutex.mli lib/unix_ext.mli; do \
+		cp $$file $$file.debian; \
+		sed -i '/^#/d' $$file; \
+	done
+
+clean::
+	for file in lib/bigstring.mli lib/core_mutex.mli lib/unix_ext.mli; do \
+		[ ! -f $$file.debian ] || mv $$file.debian $$file; \
+	done
+
 build/libcore-ocaml-dev::
 	mkdir -p $(DEST_DIR)

-- 
janest-core packaging