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

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit 2e3f4974af57065dbfad706a5ac01e13e394f1c8
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Thu Sep 24 20:48:11 2009 +0200

    Add a variable to be able to desactivate dh_ocaml in a cdbs package when needed

diff --git a/cdbs/1/rules/ocaml.mk b/cdbs/1/rules/ocaml.mk
index 8416d9b..a597069 100644
--- a/cdbs/1/rules/ocaml.mk
+++ b/cdbs/1/rules/ocaml.mk
@@ -32,6 +32,12 @@ _cdbs_class_ocaml = 1
 include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
 include $(_ocaml_share_path)/ocamlvars.mk
 
+# Sometimes, one needs to desactivate dh_ocaml. In such cases, you should
+# define WITH_DH_OCAML and set it to 0.
+# 1: dh_ocaml is activated
+# 0: dh_ocaml is desactivated
+WITH_DH_OCAML ?= 1
+
 # space separated list of packages matching the naming convention for OCaml
 # development libraries, i.e. libXXX-ocaml-dev.
 # For debian/rules writers
@@ -71,10 +77,14 @@ OCAML_DHOCAML_FLAGS =
 
 # Invoke dh_ocaml before building the deb
 common-binary-predeb-arch::
+ifeq($(WITH_DH_OCAML), 1)
 	dh_ocaml -s $(OCAML_DHOCAML_FLAGS)
+endif
 
 common-binary-predeb-indep::
+ifeq($(WITH_DH_OCAML), 1)
 	dh_ocaml -i $(OCAML_DHOCAML_FLAGS)
+endif
 
 clean::
 	rm -f debian/*.doc-base.apiref*
diff --git a/debian/changelog b/debian/changelog
index aa35373..87b6c1b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,11 @@ dh-ocaml (0.9.1) UNRELEASED; urgency=low
 
   [ Mehdi Dogguy ]
   * Don't pass --nodefined-map to ocaml-lintian
+  * Add a variable to be able to desactivate dh_ocaml in a cdbs
+    package when needed. The variable WITH_DH_OCAML has to be set
+    to 0 to desactivate dh_ocaml.
 
- -- Mehdi Dogguy <mehdi at debian.org>  Thu, 24 Sep 2009 00:55:31 +0200
+ -- Mehdi Dogguy <mehdi at debian.org>  Thu, 24 Sep 2009 20:46:23 +0200
 
 dh-ocaml (0.9.0) unstable; urgency=low
 

-- 
dh-ocaml packaging