[Pkg-ocaml-maint-commits] [eliom] 05/10: Refresh patches

[Stéphane Glondu]

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

glondu pushed a commit to branch master
in repository eliom.

commit 7e7bee2d71f08ca63e5b7bf8767d7b9a3e767d74
Author: Stephane Glondu <steph at glondu.net>
Date:   Mon Jun 23 17:33:16 2014 +0200

    Refresh patches
---
 ...-Fix-ocamldoc-invocation-in-src-server-client.patch | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

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
index e7d0a67..f63f69c 100644
--- a/debian/patches/0001-Fix-ocamldoc-invocation-in-src-server-client.patch
+++ b/debian/patches/0001-Fix-ocamldoc-invocation-in-src-server-client.patch
@@ -8,35 +8,35 @@ 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 +--
+ 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
+index 39b3c37..0c38523 100644
 --- a/src/client/Makefile
 +++ b/src/client/Makefile
-@@ -7,7 +7,7 @@ OCAMLC   := $(OCAMLFIND) ocamlc${BYTEDBG}
+@@ -10,7 +10,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
+ INCLUDEDOC := -I ../client2 -I ../clientserver/_client -I .
  
 diff --git a/src/server/Makefile b/src/server/Makefile
-index 43846a5..6290bff 100644
+index 8710744..4bfd19b 100644
 --- a/src/server/Makefile
 +++ b/src/server/Makefile
-@@ -6,8 +6,7 @@ OCAMLC   := $(OCAMLFIND) ocamlc${BYTEDBG} ${THREAD}
- OCAMLOPT := $(OCAMLFIND) ocamlopt ${OPTDBG}  ${THREAD}
+@@ -9,8 +9,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
+ INCLUDEDOC := -I ../server2 -I ../server2/extensions -I ../clientserver/_server -I . -I ../common -I ../common2
  
 -- 

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