[Pkg-ocaml-maint-commits] [SCM] omake packaging branch, master, updated. debian/0.9.8.5-3-7-7-g2ce5369

[Stephane Glondu]

The following commit has been merged in the master branch:
commit f50239bc8fa9c85e99fcbd77a0ee4d8955916190
Author: Stephane Glondu <steph at glondu.net>
Date:   Mon May 3 22:06:56 2010 +0200

    Add 0004-Disable-warnings-introduced-in-OCaml-3.12.patch

diff --git a/debian/patches/0004-Disable-warnings-introduced-in-OCaml-3.12.patch b/debian/patches/0004-Disable-warnings-introduced-in-OCaml-3.12.patch
new file mode 100644
index 0000000..288e69f
--- /dev/null
+++ b/debian/patches/0004-Disable-warnings-introduced-in-OCaml-3.12.patch
@@ -0,0 +1,23 @@
+From: Stephane Glondu <steph at glondu.net>
+Date: Mon, 3 May 2010 22:05:09 +0200
+Subject: [PATCH] Disable warnings introduced in OCaml 3.12
+
+For compatibility with OCaml 3.12. Closes: #580091.
+---
+ OMakefile |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/OMakefile b/OMakefile
+index 9b77a25..366f2e5 100644
+--- a/OMakefile
++++ b/OMakefile
+@@ -57,7 +57,7 @@ if $(not $(defined CAMLLIB))
+ #
+ # OCaml options
+ #
+-OCAMLFLAGS[] += -w Ae$(if $(OCAML_ACCEPTS_Z_WARNING), z)
++OCAMLFLAGS[] += -w Aer-29$(if $(OCAML_ACCEPTS_Z_WARNING), z)
+ if $(THREADS_ENABLED)
+     OCAMLFLAGS += -thread
+     export
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index c105b74..b35da3a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 0001-stdin-stdout-fix-upstream-r12115.patch
 0002-Remove-useless-sync-external-declaration.patch
 0003-Fix-attempt-to-free-a-non-heap-object.patch
+0004-Disable-warnings-introduced-in-OCaml-3.12.patch

-- 
omake packaging