[Pkg-ocaml-maint-commits] [SCM] dh-ocaml packaging branch, master, updated. debian/0.9.1-12-g61e8c18

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 61e8c18a9aac56d55402baca3adff18e82c19d79
Author: Stephane Glondu <steph at glondu.net>
Date:   Mon Nov 2 09:06:56 2009 +0100

    ocaml.mk: don't overwrite DEB_DH_GENCONTROL_ARGS and use -u

diff --git a/cdbs/1/rules/ocaml.mk b/cdbs/1/rules/ocaml.mk
index 458b4cd..43806dd 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 += -- -VF:OCamlABI="$(OCAML_ABI)"
-DEB_DH_GENCONTROL_ARGS +=    -VF:OCamlNativeArchs="$(OCAML_NATIVE_ARCHS)"
+DEB_DH_GENCONTROL_ARGS += -u-VF:OCamlABI="$(OCAML_ABI)"
+DEB_DH_GENCONTROL_ARGS += -u-VF:OCamlNativeArchs="$(OCAML_NATIVE_ARCHS)"
 
 endif
 
diff --git a/debian/changelog b/debian/changelog
index 2037beb..ef3f840 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,9 @@ dh-ocaml (0.9.2) UNRELEASED; urgency=low
     given "--notifications"
   * dh_ocaml: also take into account OCaml objects in non-lib packages;
     don't assume all objects are in /usr/lib
+  * ocaml.mk: don't overwrite DEB_DH_GENCONTROL_ARGS and use -u instead of
+    -- to pass args to dpkg-gencontrol in a safer manner (thanks to Loïc
+    Minier) (Closes: #500869)
 
   [ Mehdi Dogguy ]
   * Use my debian address instead of the old ones, everywhere.

-- 
dh-ocaml packaging