[Pkg-ocaml-maint-commits] [SCM] dh-ocaml packaging branch, master, updated. debian/0.1-3-g75aabd7

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 75aabd771e0032ba0e48a54f3d2bb0b290ab0fea
Author: Stephane Glondu <steph at glondu.net>
Date:   Tue Sep 9 13:13:07 2008 +0200

    CDBS: handle lines starting with "OPT: " in *.in files
    
    These lines will be deleted on bytecode-only architectures, and kept
    (with the prefix removed) on native ones.

diff --git a/cdbs/ocaml.mk b/cdbs/ocaml.mk
index 20673b8..9bd0ea2 100644
--- a/cdbs/ocaml.mk
+++ b/cdbs/ocaml.mk
@@ -42,6 +42,13 @@ DEB_DH_GENCONTROL_ARGS +=    -VF:OCamlNativeArchs="$(OCAML_NATIVE_ARCHS)"
 
 endif
 
+# filter out lines starting with "OPT: "
+ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
+SEDOPTFILTER := -e 's/^OPT: //'
+else
+SEDOPTFILTER := -e '/^OPT: /d'
+endif
+
 # post-install hook to invoke ocamldoc on OCAML_OCAMLDOC_PACKAGES packages
 $(patsubst %,binary-install/%,$(DEB_PACKAGES))::
 	@OCAMLDOC="ocamldoc $(OCAML_OCAMLDOC_FLAGS)"; \
@@ -87,6 +94,7 @@ ocamlinit-stamp:
 			-e 's, at OCamlABI@,$(OCAML_ABI),g' \
 			-e 's, at OCamlStdlibDir@,$(OCAML_STDLIB_DIR),g' \
 			-e 's, at OCamlDllDir@,$(OCAML_DLL_DIR),g' \
+			$(SEDOPTFILTER) \
 			$$f.in > $$f ; \
 	done
 	touch $@
diff --git a/debian/changelog b/debian/changelog
index 797cfa7..e16436a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 dh-ocaml (0.2) UNRELEASED; urgency=low
 
-  * Remove XS- prefix in XS-Vcs-* in policy
+  * Policy: remove XS- prefix in XS-Vcs-*
+  * CDBS: handle lines starting with "OPT: " in *.in files
 
- -- Stephane Glondu <steph at glondu.net>  Tue, 12 Aug 2008 18:32:17 +0200
+ -- Stephane Glondu <steph at glondu.net>  Tue, 09 Sep 2008 13:10:52 +0200
 
 dh-ocaml (0.1) experimental; urgency=low
 

-- 
dh-ocaml packaging