This is an automated email from the git hooks/post-receive script.
mehdi pushed a commit to branch master
in repository eliom.
commit 09ea19736cb431adf4cd919ca67be03dbe462136
Author: Mehdi Dogguy <me...@debian.org>
Date: Sat May 10 17:12:24 2014 +0200
Fix ocamldoc invocation in src/{server,client}
---
debian/changelog | 8 +++++
...-ocamldoc-invocation-in-src-server-client.patch | 42 ++++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 51 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index f1467dc..07325d7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+eliom (3.0.3-5) UNRELEASED; urgency=medium
+
+ * Team upload.
+ * Fix ocamldoc invocation for doc/{server,client} (Closes: #746094).
+ - Add 0001-Fix-ocamldoc-invocation-in-src-server-client.patch
+
+ -- Mehdi Dogguy <me...@debian.org> Sat, 10 May 2014 16:38:00 +0200
+
eliom (3.0.3-4) unstable; urgency=low
* Upload to unstable
diff --git
a/debian/patches/0001-Fix-ocamldoc-invocation-in-src-server-client.patch
b/debian/patches/0001-Fix-ocamldoc-invocation-in-src-server-client.patch
new file mode 100644
index 0000000..e7d0a67
--- /dev/null
+++ b/debian/patches/0001-Fix-ocamldoc-invocation-in-src-server-client.patch
@@ -0,0 +1,42 @@
+From: Mehdi Dogguy <me...@debian.org>
+Date: Sat, 10 May 2014 16:37:55 +0200
+Subject: Fix ocamldoc invocation in src/{server,client}
+
+This is a consequence of the change introduced in findlib 1.4.1.
+Upstream changelog says:
+
+ 1.4.1:ocamldoc: The order of -ppopt arguments was changed by ocamlfind,
+ which is not correct.
+---
+ src/client/Makefile | 2 +-
+ src/server/Makefile | 3 +--
+ 2 files changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/src/client/Makefile b/src/client/Makefile
+index 7c6757e..2314f4b 100644
+--- a/src/client/Makefile
++++ b/src/client/Makefile
+@@ -7,7 +7,7 @@ OCAMLC := $(OCAMLFIND) ocamlc${BYTEDBG}
+ OCAMLOPT := $(OCAMLFIND) ocamlopt ${OPTDBG}
+ OCAMLDOC := $(OCAMLFIND) ocamldoc
+ OCAMLDEP := $(OCAMLFIND) ocamldep
+-OCAMLDOC := ${OCAMLFIND} ocamldoc -ppopt o -ppopt -printer
++OCAMLDOC := ${OCAMLFIND} ocamldoc -ppopt -printer -ppopt o
+
+ all: eliom_client.cma eliom_client_main.cmo
+
+diff --git a/src/server/Makefile b/src/server/Makefile
+index 43846a5..6290bff 100644
+--- a/src/server/Makefile
++++ b/src/server/Makefile
+@@ -6,8 +6,7 @@ OCAMLC := $(OCAMLFIND) ocamlc${BYTEDBG} ${THREAD}
+ OCAMLOPT := $(OCAMLFIND) ocamlopt ${OPTDBG} ${THREAD}
+ OCAMLDEP := $(OCAMLFIND) ocamldep
+
+-OCAMLDOC := ${OCAMLFIND} ocamldoc ${THREAD} -ppopt o -ppopt -printer
+-## WTF -ppopt options must be given in reverse order...
++OCAMLDOC := ${OCAMLFIND} ocamldoc ${THREAD} -ppopt -printer -ppopt o
+
+ all: byte opt
+
+--
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..505e163
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Fix-ocamldoc-invocation-in-src-server-client.patch
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-ocaml-maint/packages/eliom.git
_______________________________________________
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
