[Pkg-ocaml-maint-commits] [SCM] eliom packaging branch, master, updated. debian/2.1.1b-3-10-g2a7a633

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 4b758a93c8acceecc2ac84884b103878c7ce254e
Author: Stephane Glondu <steph at glondu.net>
Date:   Sat Jun 9 18:05:35 2012 +0200

    All patches have been applied upstream

diff --git a/debian/patches/0001-Fix-manpages-installation-when-installing-only-bytec.patch b/debian/patches/0001-Fix-manpages-installation-when-installing-only-bytec.patch
deleted file mode 100644
index a9045f4..0000000
--- a/debian/patches/0001-Fix-manpages-installation-when-installing-only-bytec.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: Pierre Chambart <chambart at crans.org>
-Date: Fri, 30 Mar 2012 15:20:56 +0200
-Subject: Fix manpages installation when installing only bytecode
-
----
- src/Makefile |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/Makefile b/src/Makefile
-index b1eafdf..48e7e4c 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -74,13 +74,13 @@ install.META:
- 	   -patch-version ${VERSION} \
- 	   files/META
- 
--install.byte: install.META
-+install.byte: install.META install.man
- 	${MAKE} -C server install.byte
- 	${MAKE} -C client install
- 	${MAKE} -C syntax install
- 	${MAKE} -C tools install
- 
--install.opt: install.META
-+install.opt: install.META install.man
- 	${MAKE} -C server install.opt
- 	${MAKE} -C client install
- 	${MAKE} -C syntax install
--- 
diff --git a/debian/patches/0002-Fix-installation-on-bytecode-architectures.patch b/debian/patches/0002-Fix-installation-on-bytecode-architectures.patch
deleted file mode 100644
index d27b6cb..0000000
--- a/debian/patches/0002-Fix-installation-on-bytecode-architectures.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Stephane Glondu <steph at glondu.net>
-Date: Wed, 11 Apr 2012 13:58:02 +0200
-Subject: Fix installation on bytecode architectures
-
----
- src/Makefile |    1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/src/Makefile b/src/Makefile
-index 48e7e4c..0572578 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -66,7 +66,6 @@ install.man: install.META
- 	ln -sf eliomc.1 $(TEMPROOT)$(MANDIR)/man1/eliomopt.1
- 	ln -sf eliomc.1 $(TEMPROOT)$(MANDIR)/man1/eliomcp.1
- 	ln -sf eliomc.1 $(TEMPROOT)$(MANDIR)/man1/eliomdep.1
--	${MAKE} -C server install
- 
- install.META:
- 	${OCAMLFIND} install ${PROJECTNAME} \
--- 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index c6d3cac..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-0001-Fix-manpages-installation-when-installing-only-bytec.patch
-0002-Fix-installation-on-bytecode-architectures.patch

-- 
eliom packaging