[Pkg-ocaml-maint-commits] [SCM] dh-ocaml packaging branch, master, updated. debian/0.9.2-2-g95b6103

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 8d5c8c14b1ca90edafac1913b161cc640dd5668c
Author: Stephane Glondu <steph at glondu.net>
Date:   Thu Nov 5 08:54:30 2009 +0100

    Revert "ocaml.mk: don't overwrite DEB_DH_GENCONTROL_ARGS and use -u"
    
    Usage of -u is deprecated; see #554509. This (partially) reverts
    commit 61e8c18a9aac56d55402baca3adff18e82c19d79.

diff --git a/cdbs/1/rules/ocaml.mk b/cdbs/1/rules/ocaml.mk
index 43806dd..458b4cd 100644
--- a/cdbs/1/rules/ocaml.mk
+++ b/cdbs/1/rules/ocaml.mk
@@ -53,8 +53,8 @@ CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), ocaml-nox
 ifdef _cdbs_rules_debhelper
 
 # ensure dpkg-gencontrol will fill F:OCamlABI fields with the proper value
-DEB_DH_GENCONTROL_ARGS += -u-VF:OCamlABI="$(OCAML_ABI)"
-DEB_DH_GENCONTROL_ARGS += -u-VF:OCamlNativeArchs="$(OCAML_NATIVE_ARCHS)"
+DEB_DH_GENCONTROL_ARGS += -- -VF:OCamlABI="$(OCAML_ABI)"
+DEB_DH_GENCONTROL_ARGS +=    -VF:OCamlNativeArchs="$(OCAML_NATIVE_ARCHS)"
 
 endif
 

-- 
dh-ocaml packaging