[Pkg-ocaml-maint-commits] [SCM] eliom packaging branch, master, updated. debian/2.1.0-1-9-g8845f0b
The following commit has been merged in the master branch: commit 7e18ce9f9188a163ba4418c1f9af036eae3b10bd Merge: 7af931dfaf054a3e23d8d1696029ad40e61c2e61 4c71a795326f1f67c98be979179717d26ccc25f8 Author: Pierre Chambart chamb...@crans.org Date: Tue Mar 27 10:37:36 2012 +0200 Merge tag 'upstream/2.1.1a' Upstream version 2.1.1a -- eliom packaging ___ 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
[Pkg-ocaml-maint-commits] [SCM] eliom packaging branch, master, updated. debian/2.1.0-1-9-g8845f0b
The following commit has been merged in the master branch: commit 379162ffaf9922c6acc7e04958f6886bfbea45e5 Author: Pierre Chambart chamb...@crans.org Date: Tue Mar 27 14:52:54 2012 +0200 Update control and changelog for the new upstream version diff --git a/debian/changelog b/debian/changelog index 0b81902..c959e5b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +eliom (2.1.1a-1) UNRELEASED; urgency=low + + * New upstream release +* bump build-dependencies to ocsigenserver 2.0.4 and js-of-ocaml 1.1.1 + -- Pierre Chambart pierre.chamb...@crans.org Tue, 27 Mar 2012 10:53:50 +0200 + eliom (2.1.0-1) experimental; urgency=low [ Pierre Chambart, Stéphane Glondu ] diff --git a/debian/control b/debian/control index a20b9c9..39fbc3e 100644 --- a/debian/control +++ b/debian/control @@ -11,14 +11,14 @@ Build-Depends: ocaml-findlib, dh-ocaml (= 0.9~), debhelper (= 8), - ocsigenserver (= 2.0.2), - libocsigenserver-ocaml-dev (= 2.0.2), + ocsigenserver (= 2.0.4), + libocsigenserver-ocaml-dev (= 2.0.4), libderiving-ocsigen-ocaml-dev (= 0.3), - libjs-of-ocaml-dev (= 1.1), + libjs-of-ocaml-dev (= 1.1.1), libcalendar-ocaml-dev (= 2.03), liblwt-ssl-ocaml-dev (= 2.3.2), libreact-ocaml-dev (= 0.9.2), - js-of-ocaml (= 1.1), + js-of-ocaml (= 1.1.1), libtyxml-ocaml-dev (= 2.0.2) Standards-Version: 3.9.3 Homepage: http://ocsigen.org/eliom -- eliom packaging ___ 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
[Pkg-ocaml-maint-commits] [SCM] eliom packaging branch, master, updated. debian/2.1.0-1-9-g8845f0b
The following commit has been merged in the master branch: commit 53a0b723ec708d1019a5d4e56fdb445b167380b0 Author: Pierre Chambart chamb...@crans.org Date: Tue Mar 27 15:12:30 2012 +0200 change my email address in debian/control to the one of my gpg key diff --git a/debian/control b/debian/control index 39fbc3e..dfb7f6a 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Debian OCaml Maintainers debian-ocaml-ma...@lists.debian.org Uploaders: Stéphane Glondu glo...@debian.org, - Pierre Chambart chamb...@crans.org + Pierre Chambart pierre.chamb...@crans.org Build-Depends: ocaml-nox (= 3.12.1-2~), ocamlduce, -- eliom packaging ___ 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
[Pkg-ocaml-maint-commits] [SCM] eliom packaging branch, master, updated. debian/2.1.0-1-9-g8845f0b
The following commit has been merged in the master branch: commit 8a52b24c25147b62634a218f1ebc6b42feb60005 Author: Pierre Chambart chamb...@crans.org Date: Tue Mar 27 15:16:21 2012 +0200 install ocamldoc generated manpages diff --git a/debian/libeliom-doc.install b/debian/libeliom-doc.install index b9c2a80..9a706c4 100644 --- a/debian/libeliom-doc.install +++ b/debian/libeliom-doc.install @@ -1,3 +1,4 @@ usr/share/doc/eliom/client usr/share/doc/eliom/server doc/manual-wiki usr/share/doc/eliom +usr/share/man/man3 \ No newline at end of file -- eliom packaging ___ 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
[Pkg-ocaml-maint-commits] [SCM] eliom packaging branch, master, updated. debian/2.1.0-1-9-g8845f0b
The following commit has been merged in the master branch:
commit 0e2af70486a3317ac5c0b697847081311d097d93
Author: Pierre Chambart chamb...@crans.org
Date: Tue Mar 27 15:29:07 2012 +0200
build ocamldoc manpages with the 3o section
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
new file mode 100644
index 000..8eae8dd
--- /dev/null
+++ b/debian/patches/0002-build-ocamldoc-manpages-with-the-3o-section.patch
@@ -0,0 +1,42 @@
+From: Pierre Chambart chamb...@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
index 8f6e208..e8a3571 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
0001-Fix-escaping-of-minus-signs-in-eliomc.1.patch
+0002-build-ocamldoc-manpages-with-the-3o-section.patch
--
eliom packaging
___
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
[Pkg-ocaml-maint-commits] [SCM] eliom packaging branch, master, updated. debian/2.1.0-1-9-g8845f0b
The following commit has been merged in the master branch:
commit 40f2ac123704e74ecfe23ffc7fa9b4057330a94b
Author: Pierre Chambart chamb...@crans.org
Date: Tue Mar 27 17:59:58 2012 +0200
Imported Upstream version 2.1.1b
diff --git a/CHANGES b/CHANGES
index 7031f5d..3543f17 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,25 +1,23 @@
= 2.1.1 (2012-03-20) =
- * Server: Add Eliom references of scope site
- * Server: Add an non-Lwt interface to volatile Eliom references
- * Client: Add an option to restrict usage of XHR.
+ * Add Eliom references of scope site
+ * Add an non-Lwt interface to volatile Eliom references
* Bugfixes:
- ** Client: More robust and portable history handling
- ** Client: More robust CSS preloading (change_page)
- ** Client: Better compatibility with Opera
+ ** More robust and portable history handling
+ ** More robust CSS preloading (change_page)
= 2.1.0 (2012-02-24) =
* Page loading rewriten.
** We do not traverse the HTML tree anymore for retrieving links
and putting events handlers, it use querySelectorAll instead.
- (with a fallback for older browsers)
+ ( with a fallback for older browsers )
*** We do not send a sparse tree along the page anymore.
*** It is faster and more resilient to ugly browser plugins
** Add css loading optimisations: It fetch the css included
using @include with XHR before changing page and construct only
one concatenated css. It avoids page blinking when the css change
-and is faster (browsers tend to render the page once per css).
+and is faster ( browsers tend to render the page once per css ).
** Unwrapping hand rewritten in js.
** And a lot of other optimisations.
@@ -41,7 +39,7 @@
* Server API Changes:
** Add Eliom_state.get_*_session_group_size to know the number of
session in a session group
- ** Parameters of type any can't be suffixes (semantic problem)
+ ** Parameters of type any can't be suffixes ( semantic problem )
** Add Eliom_comet.wait_timeout to notify when a client isn't active
** allow to setup Cache-policy: max-age with Text, CssText and
Files modules.
@@ -49,14 +47,14 @@
* Client API Changes:
** add an Eliom_dom module provinding imperative function on unique HTML5.elt.
-(for instance {{{appendChild: ?before:'a elt - 'b elt - 'c elt -
unit}}}).
+( for instance {{{appendChild: ?before:'a elt - 'b elt - 'c elt -
unit}}} ).
** HTML5.M.a_on{click,...} functions directly expect a
function as parameter (XML.event_handler_of_function isn't
required anymore).
** Eliom_comet: configuration option for time until timeout after the focus
is lost
** Handling wrapping of int32 type.
** Onload event handlers on HTML elements are executed when they are
converted to
-DOM (using Eliom_client.of_ functions). This allows to add them to nodes
not
+DOM ( using Eliom_client.of_ functions ). This allows to add them to nodes
not
sent in the page.
** Calls to {{{Eliom_services.onload}}} are taken into account for services
sending
caml values. The handlers are executed when the call to
@@ -118,11 +116,11 @@
* Feature:
** api history: when the api history is available, application URLs are more
-readable (no more {{{#!}}})
+readable ( no more #! )
* Bugfixes:
- ** fix browser compatibility: it should work with Firefox (= 3.0), Chrome
-(all recent version we tested), Safari 5, Opera (tested 11.51), Internet
-explorer (9, ie 8 almost work)
+ ** fix browser compatibility: it should work with Firefox ( = 3.0 ), Chrome
+( all recent version we tested ), Safari 5, Opera ( tested 11.51 ),
Internet
+explorer ( 9, ie 8 almost work )
** in forms declared outside of the sp's scope, hrefs were incorrect:
url calculation is now done for each request
** the function {{{Eliom_client.caml_call_service}}} was broken with some kind
@@ -130,16 +128,16 @@
** application cookies are now always sent
** fix incorrect sharing of type variables in the syntax extension (thanks to
William Le Ferrand)
- ** 404 and 403 errors are not dropped by applications anymore (This fix is
+ ** 404 and 403 errors are not dropped by applications anymore ( This fix is
partial: when the page content is application content, this still does not
-work when an exception handler returns something else)
+work when an exception handler returns something else )
** Fix problems with url generation for non-attached coservices inside an
application
** tail recursive marshalling and demarshalling: no more limit on the depth of
data sent along the page
** Fix problems with redirection and action with `NoReload exiting the
application
- ** Handle correctly 204 code in application (do nothing with change page, fail
-with caml_call_service)
+ ** Handle correctly 204 code in application ( do nothing with change page,
fail
+with caml_call_service )
** Fix escape character '': problem with
[Pkg-ocaml-maint-commits] [SCM] eliom packaging branch, master, updated. debian/2.1.0-1-9-g8845f0b
The following commit has been merged in the master branch: commit dc449a0c152f35d3e0831fdac079e998c6d752d7 Merge: 0e2af70486a3317ac5c0b697847081311d097d93 40f2ac123704e74ecfe23ffc7fa9b4057330a94b Author: Pierre Chambart chamb...@crans.org Date: Tue Mar 27 17:59:59 2012 +0200 Merge tag 'upstream/2.1.1b' Upstream version 2.1.1b -- eliom packaging ___ 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
[Pkg-ocaml-maint-commits] [SCM] eliom packaging branch, master, updated. debian/2.1.0-1-9-g8845f0b
The following commit has been merged in the master branch:
commit 8845f0b5f92e6eaa1f409a5fe745c7ff92919cf1
Author: Pierre Chambart chamb...@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.chamb...@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..000
--- a/debian/patches/0001-Fix-escaping-of-minus-signs-in-eliomc.1.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From: Stephane Glondu st...@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..000
--- a/debian/patches/0002-build-ocamldoc-manpages-with-the-3o-section.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From: Pierre Chambart chamb...@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..000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
