[Pkg-ocaml-maint-commits] [eliom] 05/09: Remove obsolete 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 f8a0e737d6feac49485dcbe43426201510fc9eac
Author: Stephane Glondu <steph at glondu.net>
Date:   Tue Oct 27 10:53:19 2015 +0100

    Remove obsolete patches
---
 ...-ocamldoc-invocation-in-src-server-client.patch | 42 --------------------
 .../0002-Install-.o-files-with-.cmx-files.patch    | 22 -----------
 .../0003-Fix-build-on-bytecode-architectures.patch | 46 ----------------------
 debian/patches/series                              |  3 --
 4 files changed, 113 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
deleted file mode 100644
index f63f69c..0000000
--- a/debian/patches/0001-Fix-ocamldoc-invocation-in-src-server-client.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From: Mehdi Dogguy <mehdi at 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 39b3c37..0c38523 100644
---- a/src/client/Makefile
-+++ b/src/client/Makefile
-@@ -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
- 
- INCLUDEDOC := -I ../client2 -I ../clientserver/_client -I .
- 
-diff --git a/src/server/Makefile b/src/server/Makefile
-index 8710744..4bfd19b 100644
---- a/src/server/Makefile
-+++ b/src/server/Makefile
-@@ -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
- 
- INCLUDEDOC := -I ../server2 -I ../server2/extensions -I ../clientserver/_server -I . -I ../common -I ../common2
- 
--- 
diff --git a/debian/patches/0002-Install-.o-files-with-.cmx-files.patch b/debian/patches/0002-Install-.o-files-with-.cmx-files.patch
deleted file mode 100644
index 43a6211..0000000
--- a/debian/patches/0002-Install-.o-files-with-.cmx-files.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Stephane Glondu <steph at glondu.net>
-Date: Sun, 29 Jun 2014 14:15:44 +0200
-Subject: Install .o files with .cmx files
-
----
- src/syntax/Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/syntax/Makefile b/src/syntax/Makefile
-index 05e66a6..7cae934 100644
---- a/src/syntax/Makefile
-+++ b/src/syntax/Makefile
-@@ -16,7 +16,7 @@ FILES:= pa_eliom_seed.ml    \
- 	pa_include.ml
- 
- ifeq "${NATDYNLINK}" "YES"
--FILES_OPT:= $(FILES:.ml=.cmx) $(FILES:.ml=.cmxs)
-+FILES_OPT:= $(FILES:.ml=.cmx) $(FILES:.ml=.o) $(FILES:.ml=.cmxs)
- endif
- 
- all:
--- 
diff --git a/debian/patches/0003-Fix-build-on-bytecode-architectures.patch b/debian/patches/0003-Fix-build-on-bytecode-architectures.patch
deleted file mode 100644
index ed7123d..0000000
--- a/debian/patches/0003-Fix-build-on-bytecode-architectures.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From: Stephane Glondu <steph at glondu.net>
-Date: Tue, 1 Jul 2014 13:37:44 +0200
-Subject: Fix build on bytecode architectures
-
----
- src/Makefile        | 4 ++--
- src/syntax/Makefile | 3 +--
- 2 files changed, 3 insertions(+), 4 deletions(-)
-
-diff --git a/src/Makefile b/src/Makefile
-index 55b7291..c611d5f 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -15,7 +15,7 @@ byte: metas conf
- 	${MAKE} -C server byte
- 	${MAKE} -C client all
- 	${MAKE} -C tools all
--	${MAKE} -C clientserver all
-+	${MAKE} -C clientserver byte
- 	${MAKE} -C server2 byte
- 	${MAKE} -C client2 all
- 	${MAKE} -C ocamlbuild $@
-@@ -114,7 +114,7 @@ install.META:
- 	   files/META
- 
- install.byte: install.META install.man
--	${MAKE} -C clientserver install.byte
-+	${MAKE} -C clientserver install
- 	${MAKE} -C server install.byte
- 	${MAKE} -C client2 install
- 	${MAKE} -C server2 install.byte
-diff --git a/src/syntax/Makefile b/src/syntax/Makefile
-index 7cae934..7809ffe 100644
---- a/src/syntax/Makefile
-+++ b/src/syntax/Makefile
-@@ -20,8 +20,7 @@ FILES_OPT:= $(FILES:.ml=.cmx) $(FILES:.ml=.o) $(FILES:.ml=.cmxs)
- endif
- 
- all:
--	${MAKE} $(FILES:.ml=.cmo)
--	${MAKE} $(FILES_OPT)
-+	${MAKE} $(FILES:.ml=.cmo) $(FILES_OPT)
- 
- install:
- 	${INSTALL} -m 755 -d ${SYNTAXDIR}
--- 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 3614a14..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,3 +0,0 @@
-0001-Fix-ocamldoc-invocation-in-src-server-client.patch
-0002-Install-.o-files-with-.cmx-files.patch
-0003-Fix-build-on-bytecode-architectures.patch

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