[Pkg-ocaml-maint-commits] [SCM] eliom packaging branch, master, updated. debian/2.1.0-1-9-g8845f0b

[Pierre Chambart]

The following commit has been merged in the master branch:
commit 8845f0b5f92e6eaa1f409a5fe745c7ff92919cf1
Author: Pierre Chambart <chambart at crans.org>
Date:   Tue Mar 27 18:00:25 2012 +0200

    drop patches included upstream

diff --git a/debian/changelog b/debian/changelog
index c959e5b..3c26128 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,8 @@
-eliom (2.1.1a-1) UNRELEASED; urgency=low
+eliom (2.1.1b-1) UNRELEASED; urgency=low
 
   * New upstream release
-    * bump build-dependencies to ocsigenserver 2.0.4 and js-of-ocaml 1.1.1
+    - bump build-dependencies to ocsigenserver 2.0.4 and js-of-ocaml 1.1.1
+    - remove patch (merged upstream)
  -- Pierre Chambart <pierre.chambart at crans.org>  Tue, 27 Mar 2012 10:53:50 +0200
 
 eliom (2.1.0-1) experimental; urgency=low
diff --git a/debian/patches/0001-Fix-escaping-of-minus-signs-in-eliomc.1.patch b/debian/patches/0001-Fix-escaping-of-minus-signs-in-eliomc.1.patch
deleted file mode 100644
index 7f5ac14..0000000
--- a/debian/patches/0001-Fix-escaping-of-minus-signs-in-eliomc.1.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From: Stephane Glondu <steph at glondu.net>
-Date: Mon, 19 Mar 2012 07:19:16 +0100
-Subject: Fix escaping of minus signs in eliomc.1
-
----
- src/files/eliomc.1 |   20 ++++++++++----------
- 1 files changed, 10 insertions(+), 10 deletions(-)
-
-diff --git a/src/files/eliomc.1 b/src/files/eliomc.1
-index a7cb78a..7d17395 100644
---- a/src/files/eliomc.1
-+++ b/src/files/eliomc.1
-@@ -116,27 +116,27 @@ Display a short usage summary and exit.
- .SH EXAMPLES
- The compilation of an Eliom projects composed of a server specific file named server.ml, a client specific file named client.ml and two common files name base.eliom and main.eliom, could be achieved with the following commands:
- 
--\ \ \ \ eliomc -a -o appl.cma server.ml base.eliom main.eliom
-+\ \ \ \ eliomc \-a \-o appl.cma server.ml base.eliom main.eliom
- .br
--\ \ \ \ js_of_eliom -o appl.js client.ml base.eliom main.eliom
-+\ \ \ \ js_of_eliom \-o appl.js client.ml base.eliom main.eliom
- 
- To avoid recompiling the whole project each times, this could be split in multiple steps:
- 
--\ \ \ \ eliomc -c server.ml
-+\ \ \ \ eliomc \-c server.ml
- .br
--\ \ \ \ eliomc -c base.eliom
-+\ \ \ \ eliomc \-c base.eliom
- .br
--\ \ \ \ eliomc -c main.eliom
-+\ \ \ \ eliomc \-c main.eliom
- .br
--\ \ \ \ eliomc -a -o appl.cma _server/server.cmo _server/base.cmo _server/main.cmo
-+\ \ \ \ eliomc \-a \-o appl.cma _server/server.cmo _server/base.cmo _server/main.cmo
- .br
--\ \ \ \ js_of_eliom -c client.ml
-+\ \ \ \ js_of_eliom \-c client.ml
- .br
--\ \ \ \ js_of_eliom -c base.eliom
-+\ \ \ \ js_of_eliom \-c base.eliom
- .br
--\ \ \ \ js_of_eliom -c main.eliom
-+\ \ \ \ js_of_eliom \-c main.eliom
- .br
--\ \ \ \ js_of_eliom -o appl.js _client/client.cmo _client/base.cmo _client/main.cmo
-+\ \ \ \ js_of_eliom \-o appl.js _client/client.cmo _client/base.cmo _client/main.cmo
- 
- 
- 
--- 
diff --git a/debian/patches/0002-build-ocamldoc-manpages-with-the-3o-section.patch b/debian/patches/0002-build-ocamldoc-manpages-with-the-3o-section.patch
deleted file mode 100644
index 8eae8dd..0000000
--- a/debian/patches/0002-build-ocamldoc-manpages-with-the-3o-section.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From: Pierre Chambart <chambart at crans.org>
-Date: Tue, 27 Mar 2012 15:28:30 +0200
-Subject: build ocamldoc manpages with the 3o section
-
----
- doc/client/Makefile |    3 ++-
- doc/server/Makefile |    3 ++-
- 2 files changed, 4 insertions(+), 2 deletions(-)
- mode change 100644 => 100755 configure
-
-diff --git a/configure b/configure
-old mode 100644
-new mode 100755
-diff --git a/doc/client/Makefile b/doc/client/Makefile
-index 39d8139..00c1166 100644
---- a/doc/client/Makefile
-+++ b/doc/client/Makefile
-@@ -17,7 +17,8 @@ api-html/index.html: indexdoc ${ODOC}
- 
- api-man/Eliom_pervasives.client.3o: ${ODOC}
- 	mkdir -p api-man
--	$(OCAMLDOC) ${LIBS} -d api-man -man-mini $(addprefix -load ,${ODOC}) -man -man-suffix client.3o
-+	$(OCAMLDOC) ${LIBS} -d api-man -man-mini $(addprefix -load ,${ODOC}) -man \
-+	  -man-section 3o -man-suffix client.3o
- 
- api-wiki/index.wiki: indexdoc ${ODOC}
- 	mkdir -p api-wiki
-diff --git a/doc/server/Makefile b/doc/server/Makefile
-index 13d1d5f..9007138 100644
---- a/doc/server/Makefile
-+++ b/doc/server/Makefile
-@@ -17,7 +17,8 @@ api-html/index.html: indexdoc ${ODOC}
- 
- api-man/Eliom_pervasives.server.3o: ${ODOC}
- 	mkdir -p api-man
--	$(OCAMLDOC) ${LIBS} -d api-man -man-mini $(addprefix -load ,${ODOC}) -man -man-suffix server.3o
-+	$(OCAMLDOC) ${LIBS} -d api-man -man-mini $(addprefix -load ,${ODOC}) -man \
-+	  -man-section 3o -man-suffix server.3o
- 
- api-wiki/index.wiki: indexdoc ${ODOC}
- 	mkdir -p api-wiki
--- 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index e8a3571..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-0001-Fix-escaping-of-minus-signs-in-eliomc.1.patch
-0002-build-ocamldoc-manpages-with-the-3o-section.patch

-- 
eliom packaging