[Pkg-ocaml-maint-commits] [SCM] janest-core packaging branch, master, updated. debian/0.6.0-1-1-g8249aaa

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit 8249aaa2766741eb4ac7db861b4c3330000b0604
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Wed Dec 16 20:15:32 2009 +0100

    Add a shell script tobe used as a PP to generate the documentation of Core

diff --git a/debian/changelog b/debian/changelog
index e0d3e5f..ee7d722 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+janest-core (0.6.0-2) UNRELEASED; urgency=low
+
+  * Fix FTBFS on non-Linux platforms: Do not blindly remove lines starting
+    with '#' but use upstream's "lib/pp.sh" and camlp4o.
+
+ -- Mehdi Dogguy <mehdi at debian.org>  Wed, 16 Dec 2009 22:06:37 +0100
+
 janest-core (0.6.0-1) unstable; urgency=low
 
   [ Stefano Zacchiroli ]
diff --git a/debian/dpp.sh b/debian/dpp.sh
new file mode 100755
index 0000000..c7eccbd
--- /dev/null
+++ b/debian/dpp.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+lib/pp.sh $@ | camlp4 '-I' '/usr/lib/ocaml/camlp4' '-I' '/usr/lib/ocaml/type-conv' '-I' '/usr/lib/ocaml' '-I' '/usr/lib/ocaml/sexplib' '-I' '/usr/lib/ocaml/fieldslib' '-I' '/usr/lib/ocaml/bin_prot' '-parser' 'o' '-parser' 'op' '-printer' 'p' 'pa_type_conv.cmo' 'unix.cma' 'bigarray.cma' 'nums.cma' 'sexplib.cma' 'pa_sexp_conv.cmo' 'fieldslib.cma' 'pa_fields_conv.cmo' 'bin_prot.cma' 'pa_bin_prot.cmo'
diff --git a/debian/libcore-ocaml-doc.ocamldoc-core.in b/debian/libcore-ocaml-doc.ocamldoc-core.in
index 37d776d..381c5f4 100644
--- a/debian/libcore-ocaml-doc.ocamldoc-core.in
+++ b/debian/libcore-ocaml-doc.ocamldoc-core.in
@@ -1,9 +1,5 @@
---include debian/libcore-ocaml-dev/@OCamlStdlibDir@/core
+--include debian/libcore-ocaml-dev at OCamlStdlibDir@/core
+ -pp "sh debian/dpp.sh"
  -d html/core-api
  -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 c77daad..3a223da 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,7 +9,6 @@ EXT_PKG = libcore-extended-ocaml-dev
 # ocamldoc on the actually installed .mli-s (and not on lib/,extended/). The
 # dep should be binary to install (instead of build to install) to ensure when
 # arch packages are installed we are under fakeroot.
-binary/$(DOC_PKG):: ocamldoc-pp-stamp
 binary/$(DOC_PKG):: install-arch common-binary-post-install-arch
 
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
@@ -17,16 +16,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/makefile.mk
 include /usr/share/cdbs/1/rules/ocaml.mk
 
-# files that need to be pre-processed to remove #if* directives before feeding
-# them into ocamldoc
-PP_FILES = \
-	lib/bigstring.mli \
-	lib/core_mutex.mli \
-	lib/unix_ext.mli \
-	lib/std.ml \
-	extended/std.ml \
-	$(NULL)
-
 ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
 DEB_MAKE_BUILD_TARGET = all
 DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(DEST_DIR) OCAMLFIND_INSTFLAGS="-destdir $(DEST_DIR) -ldconf ignore"
@@ -34,19 +23,3 @@ else
 DEB_MAKE_BUILD_TARGET = byte
 DEB_MAKE_INSTALL_TARGET = libinstall-byte-code DESTDIR=$(DEST_DIR) OCAMLFIND_INSTFLAGS="-destdir $(DEST_DIR) -ldconf ignore"
 endif
-
-# pre-process files that need so, before feeding them to ocamldoc
-build/$(DEV_PKG):: ocamldoc-pp-stamp
-ocamldoc-pp-stamp:
-	for f in $(PP_FILES) ; do \
-		cp $$f $$f.debian ; \
-		sed -i '/^#/d' $$f ; \
-	done
-	touch $@
-
-clean::
-	for f in $(PP_FILES) ; do \
-		[ ! -f $$f.debian ] || mv $$f.debian $$f ; \
-	done
-	rm -f ocamldoc-pp-stamp
-

-- 
janest-core packaging