[Pkg-ocaml-maint-commits] [SCM] eliom packaging branch, master, updated. 7af931dfaf054a3e23d8d1696029ad40e61c2e61
The following commit has been merged in the master branch: commit 7af931dfaf054a3e23d8d1696029ad40e61c2e61 Author: Stephane Glondu Date: Mon Mar 19 07:14:08 2012 +0100 Prepare upload to experimental diff --git a/debian/changelog b/debian/changelog index 2281a14..0b81902 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ -eliom (2.1.0-1.1) UNRELEASED; urgency=low +eliom (2.1.0-1) experimental; urgency=low + [ Pierre Chambart, Stéphane Glondu ] * Initial packaging. (Closes: #660091) - -- Pierre Chambart Mon, 27 Feb 2012 10:47:33 +0100 + -- Stéphane Glondu Mon, 19 Mar 2012 07:20:32 +0100 -- 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. 7af931dfaf054a3e23d8d1696029ad40e61c2e61
The following commit has been merged in the master branch: commit 74ba6c3a0033903f767335767b0a326b2ac036b8 Author: Stephane Glondu Date: Mon Mar 19 07:31:09 2012 +0100 Use copyright format 1.0 diff --git a/debian/copyright b/debian/copyright index abba696..f4591f4 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,4 +1,4 @@ -Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=202 +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: Eliom Upstream-Contact: The Ocsigen Team Source: http://ocsigen.org/eliom/install @@ -41,4 +41,5 @@ License: LGPL-2.1+ and other Files: debian/* Copyright: 2011-2012, Pierre Chambart + 2012, Stéphane Gondu License: LGPL-2.1+ and other -- 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. 7af931dfaf054a3e23d8d1696029ad40e61c2e61
The following commit has been merged in the master branch: commit 7ee270603bf5d1ca0487137bcd2d3bffed7bd588 Author: Stephane Glondu Date: Mon Mar 19 07:24:51 2012 +0100 Call dh_install with --fail-missing diff --git a/debian/rules b/debian/rules index e9b2108..4d37b14 100755 --- a/debian/rules +++ b/debian/rules @@ -52,4 +52,4 @@ override_dh_auto_install: .PHONY: override_dh_install override_dh_install: - dh_install --list-missing \ No newline at end of file + dh_install --fail-missing -- 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. 7af931dfaf054a3e23d8d1696029ad40e61c2e61
The following commit has been merged in the master branch: commit 6cd94cadfba4f63dd85086d77d1f6a774f92e68d Author: Stephane Glondu Date: Mon Mar 19 07:24:13 2012 +0100 Bump debhelcomp compat level to 8 diff --git a/debian/compat b/debian/compat index 7f8f011..45a4fb7 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -7 +8 diff --git a/debian/control b/debian/control index cf87158..a20b9c9 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,7 @@ Build-Depends: ocamlduce, ocaml-findlib, dh-ocaml (>= 0.9~), - debhelper (>= 7.0.50~), + debhelper (>= 8), ocsigenserver (>= 2.0.2), libocsigenserver-ocaml-dev (>= 2.0.2), libderiving-ocsigen-ocaml-dev (>= 0.3), -- 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. 7af931dfaf054a3e23d8d1696029ad40e61c2e61
The following commit has been merged in the master branch: commit e6142bdd1f810db660921b0d83e3201999dc65ff Author: Stephane Glondu Date: Mon Mar 19 07:19:31 2012 +0100 Fix escaping of minus signs in eliomc.1 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 new file mode 100644 index 000..7f5ac14 --- /dev/null +++ b/debian/patches/0001-Fix-escaping-of-minus-signs-in-eliomc.1.patch @@ -0,0 +1,51 @@ +From: Stephane Glondu +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/series b/debian/patches/series new file mode 100644 index 000..8f6e208 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +0001-Fix-escaping-of-minus-signs-in-eliomc.1.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. 7af931dfaf054a3e23d8d1696029ad40e61c2e61
The following commit has been merged in the master branch: commit 93580d256b01f53b044b2135f4e19843adaabaca Merge: 0026a9c223ca20e7e0f9402f4ad24cb0b6414026 d6774c57cc6399c54f439b8f1e98680b5bb1e044 Author: Stephane Glondu Date: Mon Mar 19 07:06:40 2012 +0100 Merge tag 'upstream/2.1.0' Upstream version 2.1.0 -- 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
