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

[Stefano Zacchiroli]

The following commit has been merged in the master branch:
commit f242e7c9005983ae618ed9a1a7199652e9a8d16e
Author: Stefano Zacchiroli <zack at upsilon.cc>
Date:   Thu Nov 12 16:35:41 2009 +0100

    various dh_ocamldoc invocation fixes
    
    - add leading spaces until fixed dh_ocamldoc hits the archive
    - pre-process files just after build to avoid (potentially) wrong #ifdef
      resolution

diff --git a/debian/changelog b/debian/changelog
index 7902412..1faebbf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,12 +23,9 @@ janest-core (0.6.0-1) unstable; urgency=low
 
   [ 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.
-  * Add myself to uploaders
+    - pre-processed some files just after build to avoid markup errors
+    - set up appropriates falgs in debian/*.ocamldoc files
+  * add myself to uploaders
 
  -- Mehdi Dogguy <mehdi at debian.org>  Thu, 12 Nov 2009 15:02:01 +0100
 
diff --git a/debian/libcore-extended-ocaml-dev.ocamldoc b/debian/libcore-extended-ocaml-dev.ocamldoc
index 9d3516f..b177bee 100644
--- a/debian/libcore-extended-ocaml-dev.ocamldoc
+++ b/debian/libcore-extended-ocaml-dev.ocamldoc
@@ -1,7 +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
+ -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
index 0533507..72dc823 100644
--- a/debian/libcore-ocaml-dev.ocamldoc
+++ b/debian/libcore-ocaml-dev.ocamldoc
@@ -1,6 +1,6 @@
--I lib -I +threads
--syntax camlp4o
--package bin_prot.syntax
--package fieldslib.syntax
--package sexplib.syntax
--package type-conv.syntax
+ -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 f128842..8b8d242 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,6 +6,12 @@ include /usr/share/cdbs/1/rules/ocaml.mk
 
 DEST_DIR = $(CURDIR)/debian/tmp
 
+PP_FILES = \
+	lib/bigstring.mli \
+	lib/core_mutex.mli \
+	lib/unix_ext.mli \
+	$(NULL)
+
 ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
 DEB_MAKE_BUILD_TARGET = all
 DEB_MAKE_INSTALL_TARGET = install OCAMLFIND_INSTFLAGS="-destdir $(DEST_DIR) -ldconf ignore"
@@ -14,15 +20,15 @@ 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; \
+build/libcore-ocaml-dev::
+	for file in $(PP_FILES) ; 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; \
+	for file in $(PP_FILES) ; do \
+		[ ! -f $$file.debian ] || mv $$file.debian $$file ; \
 	done
 
 build/libcore-ocaml-dev::

-- 
janest-core packaging