[Pkg-ocaml-maint-commits] [ocaml-gettext] 02/09: Fix FTBFS with OCaml 4.05, which is more strict on duplicate modules

[Stéphane Glondu]

This is an automated email from the git hooks/post-receive script.

glondu pushed a commit to branch master
in repository ocaml-gettext.

commit 02a2ce1649331509cccc395055f70e92f221a813
Author: Stephane Glondu <steph at glondu.net>
Date:   Thu Jul 20 08:25:23 2017 +0200

    Fix FTBFS with OCaml 4.05, which is more strict on duplicate modules
---
 ...-with-OCaml-4.05-which-is-more-strict-on-du.patch | 20 ++++++++++++++++++++
 debian/patches/series                                |  1 +
 2 files changed, 21 insertions(+)

diff --git a/debian/patches/0003-Fix-FTBFS-with-OCaml-4.05-which-is-more-strict-on-du.patch b/debian/patches/0003-Fix-FTBFS-with-OCaml-4.05-which-is-more-strict-on-du.patch
new file mode 100644
index 0000000..f4632c4
--- /dev/null
+++ b/debian/patches/0003-Fix-FTBFS-with-OCaml-4.05-which-is-more-strict-on-du.patch
@@ -0,0 +1,20 @@
+From: Stephane Glondu <steph at glondu.net>
+Date: Thu, 20 Jul 2017 08:24:37 +0200
+Subject: Fix FTBFS with OCaml 4.05, which is more strict on duplicate modules
+
+---
+ ocaml-gettext/Makefile | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/ocaml-gettext/Makefile b/ocaml-gettext/Makefile
+index 028ce08..3858ea8 100644
+--- a/ocaml-gettext/Makefile
++++ b/ocaml-gettext/Makefile
+@@ -64,7 +64,6 @@ uninstall: ocaml-xgettext-uninstall
+ ocaml-xgettext: $(BUILDBIN)
+ 	$(OCAMLC)                                                            \
+            -I +camlp4 dynlink.cma camlp4lib.cma                              \
+-           unix.cma                                                          \
+           `$(OCAMLFIND) query -r -predicates byte gettext.extract -i-format` \
+           `$(OCAMLFIND) query -r -predicates byte gettext.extract -a-format` \
+           `$(OCAMLFIND) query -r -predicates byte gettext.extract -o-format` \
diff --git a/debian/patches/series b/debian/patches/series
index be88d60..016c5de 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0001-Do-not-mark-ml2c_lc-as-inline-due-to-changed-semanti.patch
 0002-Fix-a-spelling-error.patch
+0003-Fix-FTBFS-with-OCaml-4.05-which-is-more-strict-on-du.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocaml-gettext.git