[Pkg-ocaml-maint-commits] [SCM] OCaml packaging branch, master, updated. debian/3.12.0-7-18-g9b63366
The following commit has been merged in the master branch:
commit 6a5b68c94a1788a628d8b59a44e2977bbaa58908
Author: Stephane Glondu
Date: Tue Nov 1 13:51:52 2011 +0100
Add support for ENOTSUP (Closes: #646372)
diff --git a/debian/patches/0014-Add-support-for-ENOTSUP.patch
b/debian/patches/0014-Add-support-for-ENOTSUP.patch
new file mode 100644
index 000..e2f031f
--- /dev/null
+++ b/debian/patches/0014-Add-support-for-ENOTSUP.patch
@@ -0,0 +1,49 @@
+From: Samuel Thibault
+Date: Tue, 1 Nov 2011 13:48:38 +0100
+Subject: Add support for ENOTSUP
+
+On some systems such as Solaris or GNU/Hurd, ENOTSUP and EOPNOSUPP do
+not have the same value, but ocaml code only deals with EOPNOSUPP, and
+thus ocaml applications only handle the EOPNOSUPP case. The attached
+patch fixes it by making ocaml convert ENOTSUP errors into EOPNOSUPP
+errors.
+
+This patch fixes omake build on hurd-i386.
+
+Bug: http://caml.inria.fr/mantis/view.php?id=5382
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=646372
+Signed-off-by: Stephane Glondu
+---
+ otherlibs/unix/unixsupport.c | 11 ++-
+ 1 files changed, 10 insertions(+), 1 deletions(-)
+
+diff --git a/otherlibs/unix/unixsupport.c b/otherlibs/unix/unixsupport.c
+index a471f9e..db5912e 100644
+--- a/otherlibs/unix/unixsupport.c
b/otherlibs/unix/unixsupport.c
+@@ -165,7 +165,11 @@
+ #define ESOCKTNOSUPPORT (-1)
+ #endif
+ #ifndef EOPNOTSUPP
+-#define EOPNOTSUPP (-1)
++# ifdef ENOTSUP
++#define EOPNOTSUPP ENOTSUP
++# else
++#define EOPNOTSUPP (-1)
++# endif
+ #endif
+ #ifndef EPFNOSUPPORT
+ #define EPFNOSUPPORT (-1)
+@@ -252,6 +256,11 @@ value unix_error_of_code (int errcode)
+ int errconstr;
+ value err;
+
++#if defined(ENOTSUP) && (EOPNOTSUPP != ENOTSUP)
++ if (errcode == ENOTSUP)
++errcode = EOPNOTSUPP;
++#endif
++
+ errconstr =
+ cst_to_constr(errcode, error_table, sizeof(error_table)/sizeof(int),
-1);
+ if (errconstr == Val_int(-1)) {
+--
diff --git a/debian/patches/series b/debian/patches/series
index 8b210e3..92b52ed 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,3 +11,4 @@
0011-Embed-bytecode-in-C-object-when-using-custom.patch
0012-Make-objinfo-show-force_link-and-ccobjs-ccopts-when-.patch
0013-ocamlopt-arm-add-.type-directive-for-code-symbols.patch
+0014-Add-support-for-ENOTSUP.patch
--
OCaml 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] OCaml packaging branch, master, updated. debian/3.12.0-7-18-g9b63366
The following commit has been merged in the master branch:
commit 9b633660d649fab266d7b81e4fa328ff7560265f
Author: Stephane Glondu
Date: Tue Nov 1 13:31:52 2011 +0100
Update changelog and prepare upload to unstable
diff --git a/debian/changelog b/debian/changelog
index 2d125c5..4de9fd2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ocaml (3.12.1-1) UNRELEASED; urgency=low
+ocaml (3.12.1-1) unstable; urgency=low
[ Stéphane Glondu ]
* New upstream release (Closes: #634621)
@@ -10,11 +10,14 @@ ocaml (3.12.1-1) UNRELEASED; urgency=low
[ Jonathan Nieder ]
* debian/control: add Breaks against versions of dh-ocaml that relied on
the ocaml{dumpapprox,plugininfo,byteinfo} tools (Closes: #642935)
-
+
[ Stefano Zacchiroli ]
* remove myself from Uploaders
- -- Stéphane Glondu Wed, 15 Jun 2011 18:19:01 +0200
+ [ Samuel Thibault ]
+ * Add support for ENOTSUP (Closes: #646372)
+
+ -- Stéphane Glondu Tue, 01 Nov 2011 13:53:49 +0100
ocaml (3.12.0-7) unstable; urgency=low
--
OCaml 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] OCaml packaging annotated tag, debian/3.12.1-1, created. debian/3.12.1-1
The annotated tag, debian/3.12.1-1 has been created at 989f3d11ab2666d27b45c6373e9b3659e3d0cb5c (tag) tagging 9b633660d649fab266d7b81e4fa328ff7560265f (commit) replaces debian/3.12.0-7 tagged by Stephane Glondu on Tue Nov 1 14:14:49 2011 +0100 - Shortlog Debian release 3.12.1-1 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAABCgAGBQJOr/DJAAoJEHhT2k1JiBrTtucQALS65zFz5RDl+X5Tf3rXQDO/ W0FGeh0uTiiJbqfDFUtuDRHLR7cwvQp3mHG/nG8aQfFYKhfFIv2//eCxbP8lxodH +MQvkIfN9bVwnx+CvNDoGYKZyfFXqbfzuUpHOgDE2FrEKa2hXkwfUU9E/Px4gZ8D r0dJG7aVN7XRbqbktz9pmzt2srbfPuSprIJdOcNlHWZy/ybO5RL6Em6uSkmFbCbx wpeTL2Z9NWa6z5XUApm365etJ0IxjB3iy2Q1bfLtSDgDuofZTaHgefo+eioEdI53 iMBeoflrGmz6UxjqaIy47JRThfsePaWzM2dfROkkIb61qoZCnou6xQ18r5315BoB NDuF5RT9yXeX6yR6oVAEndNb+AiSzBHqGPhxFlIn8ThZyGsy+hXCvkXPWYWhOEKp icI0efHAZkwZOXbQaY3vadh76GOGWoLpgM9O3KIv+9wYUmuEBTngkXGzr98OYJZB cDRs+2MEh4qvyu4KNOjre9Gu2dFx0HFX1zUoDtx7Lh/ZMCj4JY15h2kEQzGBE/k9 yUTy2dh/MhWQevcQBLEDSW0fW8DBod2w1AaQuQDFaEwpLSFR3cM/C03qmlLnm0BM F1XQIlQwA1LAfa8auICeK2Hnw5MDXCXQV60P74d1RnEjF+QC5FACozbF4UIxvUmk SJ8BWsPKFCa6Oym8cU0Z =Yi3x -END PGP SIGNATURE- Jonathan Nieder (1): Add Breaks against old versions of dh-ocaml (Closes: #642935) Mehdi Dogguy (2): Make objinfo show force_link and ccobjs/ccopts when needed Oups Stefano Zacchiroli (1): remove myself from Uploaders Stephane Glondu (14): Imported Upstream version 3.12.1~rc1 Merge commit 'upstream/3.12.1_rc1' New upstream release candidate Refresh patches Imported Upstream version 3.12.1 Merge commit 'upstream/3.12.1' New upstream release Closes: #634621 Refresh patches ocamlopt/arm: add .type directive for code symbols (LP: #810402) Update changelog ocamlopt/arm patch forwarded upstream Add support for ENOTSUP (Closes: #646372) Update changelog and prepare upload to unstable --- -- OCaml 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] OCaml packaging branch, master, updated. debian/3.12.1-1-1-g6948597
The following commit has been merged in the master branch: commit 694859734cf64515214d063c786d8921eeb46941 Author: Stephane Glondu Date: Tue Nov 1 15:30:03 2011 +0100 Do not add -R$dir in X11 link options on GNU/kFreeBSD diff --git a/debian/patches/0015-Do-not-add-R-dir-in-X11-link-options-on-GNU-kFreeBSD.patch b/debian/patches/0015-Do-not-add-R-dir-in-X11-link-options-on-GNU-kFreeBSD.patch new file mode 100644 index 000..9e64f26 --- /dev/null +++ b/debian/patches/0015-Do-not-add-R-dir-in-X11-link-options-on-GNU-kFreeBSD.patch @@ -0,0 +1,22 @@ +From: Stephane Glondu +Date: Tue, 1 Nov 2011 15:28:15 +0100 +Subject: Do not add -R$dir in X11 link options on GNU/kFreeBSD + +Signed-off-by: Stephane Glondu +--- + configure |1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/configure b/configure +index d6ba2e3..20b4b17 100755 +--- a/configure b/configure +@@ -1373,6 +1373,7 @@ do + else + x11_libs="-L$dir" + case "$host" in ++*-kfreebsd*-gnu) x11_link="-L$dir -lX11";; + *-*-*bsd*) x11_link="-R$dir -L$dir -lX11";; + *) x11_link="-L$dir -lX11";; + esac +-- diff --git a/debian/patches/series b/debian/patches/series index 92b52ed..c5cc038 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -12,3 +12,4 @@ 0012-Make-objinfo-show-force_link-and-ccobjs-ccopts-when-.patch 0013-ocamlopt-arm-add-.type-directive-for-code-symbols.patch 0014-Add-support-for-ENOTSUP.patch +0015-Do-not-add-R-dir-in-X11-link-options-on-GNU-kFreeBSD.patch -- OCaml 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] OCaml packaging branch, master, updated. debian/3.12.1-1-2-g11c28ae
The following commit has been merged in the master branch: commit 11c28aeda7936aad610412e87c8fc19bfe1bd8ef Author: Stephane Glondu Date: Tue Nov 1 16:04:19 2011 +0100 Add reference to upstream bugreport diff --git a/debian/patches/0015-Do-not-add-R-dir-in-X11-link-options-on-GNU-kFreeBSD.patch b/debian/patches/0015-Do-not-add-R-dir-in-X11-link-options-on-GNU-kFreeBSD.patch index 9e64f26..4c29883 100644 --- a/debian/patches/0015-Do-not-add-R-dir-in-X11-link-options-on-GNU-kFreeBSD.patch +++ b/debian/patches/0015-Do-not-add-R-dir-in-X11-link-options-on-GNU-kFreeBSD.patch @@ -3,6 +3,7 @@ Date: Tue, 1 Nov 2011 15:28:15 +0100 Subject: Do not add -R$dir in X11 link options on GNU/kFreeBSD Signed-off-by: Stephane Glondu +Bug: http://caml.inria.fr/mantis/view.php?id=5393 --- configure |1 + 1 files changed, 1 insertions(+), 0 deletions(-) -- OCaml 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] OCaml packaging branch, master, updated. debian/3.12.1-1-3-g0fcb3e8
The following commit has been merged in the master branch: commit 0fcb3e84013b0176b5e3475cba9847b728736af9 Author: Stephane Glondu Date: Tue Nov 1 16:12:25 2011 +0100 Update changelog and prepare upload to unstable diff --git a/debian/changelog b/debian/changelog index 4de9fd2..adde36f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ocaml (3.12.1-2) unstable; urgency=low + + * Fix compilation on kfreebsd-any: do not add -R$dir in X11 link options + + -- Stéphane Glondu Tue, 01 Nov 2011 16:11:01 +0100 + ocaml (3.12.1-1) unstable; urgency=low [ Stéphane Glondu ] -- OCaml 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] OCaml packaging annotated tag, debian/3.12.1-2, created. debian/3.12.1-2
The annotated tag, debian/3.12.1-2 has been created at 9135bf32c923d6f79da30ceca3d46bc30ce3ce67 (tag) tagging 0fcb3e84013b0176b5e3475cba9847b728736af9 (commit) replaces debian/3.12.1-1 tagged by Stephane Glondu on Tue Nov 1 17:02:43 2011 +0100 - Shortlog Debian release 3.12.1-2 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAABCgAGBQJOsBgjAAoJEHhT2k1JiBrT9owP/jk9R/OVgWmYSO/vSyEjfV1I KBip5dVwjM+EZHtwMkUy3hzWi2U6idnf13WmayH4AXcdW6PGeUkhoCysQMcGRBe4 ErsnR0hxgRvFI1tH3kgDC2yz5ExpQ7UF9XmQ8xzmk1QkNuP11cqizdAmDO9kBHjw 4LRPzbo+KyfEQciF7zRYisEymSzpLWuNXvsaQUhkl0+RtKMn+ubZDEI2K/aDJDmg Nqrtlwp7J7Q3YQE0NRXHWGVG9muriL18hMeDnzZa4eQdaoQ0z3JpDe0BgKu1XU+s qLule2MmV0uf8cWoMxKqX64jVF8gLj1gZvYYTPKOyVw0HHMtwgAErekt/C3PSbA3 UkwNKCz4l0wgokKPPuULOuZOquNUei1PxI70kScuUCjr5Q++BrUXCJeprGfKQ45b +tbO/we3FwOrkLOIjj435sl4YNYVRRGKx/3RYW9Kp01y0oGyFxe32gT+8mgjxnQO NjmuuVB9UlY6FHfeJle/zpsn7XCaQ/VPdRYkDDGm4s0KLKmtGmZLT/gUw29fcFBO 6V8DxGNNnK8OL1MXbHPoJQyRnWewuKnp/v0Cm3hmFAzNVXpsF/nJn09O/JxQ0RMq 9xPYT9o6pD/RD+qWd/cpu1DBdonJZ0dgLdxqhJy3+PLS7OXVG+GGAykuzUeGxLiQ ycia3sjXjaMIZ85GHcBC =7knI -END PGP SIGNATURE- Stephane Glondu (3): Do not add -R$dir in X11 link options on GNU/kFreeBSD Add reference to upstream bugreport Update changelog and prepare upload to unstable --- -- OCaml 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] headache packaging branch, master, updated. debian/1.03-19-2-ga98dea5
The following commit has been merged in the master branch: commit a98dea50b7a993a2cc8ed06304faf385f251f4b4 Author: Stephane Glondu Date: Tue Nov 1 20:27:58 2011 +0100 Update changelog and prepare upload to unstable diff --git a/debian/changelog b/debian/changelog index faa6e66..1abae90 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,13 @@ -headache (1.03-20) UNRELEASED; urgency=low +headache (1.03-20) unstable; urgency=low + + [ Stéphane Glondu ] + * Team upload + * Rebuild with ocaml 3.12.1 (no source changes) [ Stefano Zacchiroli ] * remove myself from Uploaders - -- Stefano Zacchiroli Sat, 08 Oct 2011 17:25:06 +0200 + -- Stéphane Glondu Tue, 01 Nov 2011 20:27:54 +0100 headache (1.03-19) unstable; urgency=low -- headache 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] hevea packaging branch, master, updated. debian/1.10-13-1-g2d94415
The following commit has been merged in the master branch: commit 2d944151380b25fbf3dec9baf141d83e8e5ee360 Author: Stephane Glondu Date: Tue Nov 1 20:30:32 2011 +0100 Update changelog and prepare upload to unstable diff --git a/debian/changelog b/debian/changelog index bedae49..941324b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +hevea (1.10-14) unstable; urgency=low + + * Rebuild with ocaml 3.12.1 (no source changes) + + -- Stéphane Glondu Tue, 01 Nov 2011 20:30:23 +0100 + hevea (1.10-13) unstable; urgency=low * Convert to dh, drop dependency on cdbs, install gif.hva via dh_install. -- hevea 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] headache packaging annotated tag, debian/1.03-20, created. debian/1.03-20
The annotated tag, debian/1.03-20 has been created at a12f01b34682fd5034793b0b410795254899553c (tag) tagging a98dea50b7a993a2cc8ed06304faf385f251f4b4 (commit) replaces debian/1.03-19 tagged by Stephane Glondu on Tue Nov 1 20:33:24 2011 +0100 - Shortlog Debian release 1.03-20 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAABCgAGBQJOsEmEAAoJEHhT2k1JiBrTNkAQALCu/+cisq8dvUQhGommBaqC phphKQ/eZSlqxO9WJQMretwk+IMYzhrkiGVXJ7I7uVFzeTdjjYIxY/P5eZMaWmZO FttkSF1Hyi5e/unr8qCDac+1om5pzbAmteCG1ogOF5/ogfu5o/Cqz/E5ITsOen+Q XRaLXHNSmDsV94XMfwKc4dACgaLvVN7g052wwTot0QeJ5C+CrWgdfNqKQprwmG8U vZVmQ0EsGn3198zr4zvPiUwE85YQjsTcLhmutjfpQGzNBUI0uSpm+aPmcNUqUAVf lAvpFwre+5iIl47S5Hjx1cbMA+oa7zIPF1pzq1Hi6S2OoyMfAp23/km5oeoxPHo7 4/SVKn6s0zqdfkWGn+mLGo4c7RVWg6ts00OQvLpZH1IJ7vd2ivoViZmP2diw23wn TP0fX4q69oamC7/0kxOq72ktqJ8jnbAkTTfVxwq7Yi4MKLXBLyHowaxDfuNe9tv8 tNp6yZjomxYvRc9CPkZCff1vUYKS18rDmuu9EQcLCxOdyzZz7Xj/70LbfmNXLvvb Q0aWZ+ZFtProL6QRIGiOENKe8afOddLnA3gwLeb21dpfa4hNXVewT6Gs4pDAbQ6V WEHXD5cBltbxjmB6x54OwUtQTAUl1ZvZxqd5gtuIQo8rzHzmXifofDhl9LuUMK6w NLIlq+Em51tt64ydcb1w =fMEr -END PGP SIGNATURE- Stefano Zacchiroli (1): remove myself from Uploaders Stephane Glondu (1): Update changelog and prepare upload to unstable --- -- headache 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] hevea packaging annotated tag, debian/1.10-14, created. debian/1.10-14
The annotated tag, debian/1.10-14 has been created at 5dd4f43a6e50fd41ba425f1eac92606d9118c194 (tag) tagging 2d944151380b25fbf3dec9baf141d83e8e5ee360 (commit) replaces debian/1.10-13 tagged by Stephane Glondu on Tue Nov 1 20:33:26 2011 +0100 - Shortlog Debian release 1.10-14 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAABCgAGBQJOsEmGAAoJEHhT2k1JiBrTc3oP/i3Y2swEGR/9cPQp/JMQOAef s97jdHK6ApoMdsquUB+Azfzf6nqI02zmH+txrbLrbLA0DK4MEWz7aAaUloaWTje7 JWUT+ibxc37EWEOCHO132ra5vmtzOmrTznjHWnUYbSYI647lheICAXLniII4LmyD NjG8BFuKp+XIRSeiylT2AJEzP9NUDGG+BhjY5JRg4luYcez9Pc9LRJEK/Bhmes/9 BGvcrIGMDhz1Su9ht8NIQxpgQxYMjo1I8i4vHBeu5137LYGu0zRhhT+sSX2UAZEw +QycJejkZ+zV8nEnrUaNS4RVRjQMgFM7MYzxo1iodd+QpKoUKAOoA/EVSGE/kYUN yUYgmficwL6vPlMUBfGZZuhPAzGfs4kBEF4XcPMRPeruWhW3pzHupk/BwFVemL/2 zFRuMluaQLrptsth0nrq/Y9CsyTNQ6ohq0XnwlA/idBZU3FsI+YhrxOVtS5m368p zROLFQ5kNA4YkBf5Kx4odK2NKctr3w2jyEMRtw+BOKstRhtcoXTpLrc0Aap/GOjx f8b//x+VQA5lfNOrvdGHOToVRBNb+sxzixYIYR88IZhmT4cYMkh1GteUXSQkYVaz lGqonmwYW5zB8b3OoplfWSO9fLy/Biz0Gx5jrEKJA1GLfZMaru5KO77nIG03bl9b m/cXOIuTzJTU4ES7/7SL =gVRG -END PGP SIGNATURE- Stephane Glondu (1): Update changelog and prepare upload to unstable --- -- hevea 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] hlins packaging branch, master, updated. debian/0.39-17-2-gcc8ac1c
The following commit has been merged in the master branch: commit cc8ac1c4a6c95a34ea42667b8ef6df5eb7990426 Author: Stephane Glondu Date: Tue Nov 1 20:36:00 2011 +0100 Update changelog and prepare upload to unstable diff --git a/debian/changelog b/debian/changelog index bc657b8..a46cb06 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,13 @@ -hlins (0.39-18) UNRELEASED; urgency=low +hlins (0.39-19) unstable; urgency=low + + [ Stéphane Glondu ] + * Team upload + * Rebuild with ocaml 3.12.1 (no source changes) [ Stefano Zacchiroli ] * remove myself from Uploaders - -- Stefano Zacchiroli Sat, 08 Oct 2011 17:25:53 +0200 + -- Stéphane Glondu Tue, 01 Nov 2011 20:35:54 +0100 hlins (0.39-17) unstable; urgency=low -- hlins 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] hlins packaging annotated tag, debian/0.39-19, created. debian/0.39-19
The annotated tag, debian/0.39-19 has been created at e74ac776481d220949c0e8215edf99b2e5ee20f8 (tag) tagging cc8ac1c4a6c95a34ea42667b8ef6df5eb7990426 (commit) replaces debian/0.39-17 tagged by Stephane Glondu on Tue Nov 1 20:37:10 2011 +0100 - Shortlog Debian release 0.39-19 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAABCgAGBQJOsEpmAAoJEHhT2k1JiBrTAiUQAI6GS7Nn3Z/e460K72aq0YP1 Rk0yvke6gsR/veiQ5+mVj35tBLBATyYYFAkgAr4uRFs8gUSY/fDxTLhhAb1YnbjV Nb6Shi29ZGDhDsAszQVD8fnUcAMDY37KX4PVYirsc2aJ7jJHp2J7+sVvTNmsKbS2 g0394ZrAVYFZRY7dEjVdlt78HMCfxCbn2RDWJTm7UGq7h2VW96ZB775Oum+vQmgO h6kExLHHLjw8ykWKJ1ZIQZ5XdiYPffC3s9JkC8M97G3TClvK2UWZf0ibTJ9CMMgh ekmxP8tRfpbV0lOEDURjfqu1uGWGjQdANE4LAYZ6nl424QUJ6qpSaCHZySMERS4g NeQCPxFhuff9Pn3pJ8D9ZHh7SKrF/Na2Vl7M8/zqwmPkjCZ4oYcLXXOnPIjdlA+Q mC6lamwGwVLvWBXC/yeC0C6W6lb1EdH++YlT0NXfsHdr3vyo4fL3LCHg9YIFWPyY 7KPCfgu1jg9dQX2e8kVX7aw9PEmOp7qp7RIX+8I+wDF6NE0xvEXXnvSVTdi4UvaA 7fNHpRUZ55sbbjHuIvu+aB/YF2EixfWpy5qaQ8JbI4HyIZbKAk4Rc1ygIfy71v7+ I0xtJrL9SGCPUpnc535xIZGGgPqgj3V3e2v+6mBjuE1kH4dBgiXDNMiODqS1LKnt xSJyW+dV1J9l5YKN1JSw =jllQ -END PGP SIGNATURE- Stefano Zacchiroli (1): remove myself from Uploaders Stephane Glondu (1): Update changelog and prepare upload to unstable --- -- hlins 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] ocamlduce packaging branch, master, updated. debian/3.12.0.0-1-3-gf471cf2
The following commit has been merged in the master branch: commit bab439a68f1116ed434b151775c34870023ed42a Merge: e87b40c21d7e26b36ced01b470e65d521237f7e8 22b54f3b7d1a04c6e3636b4e2cc26549e4d01c12 Author: Stephane Glondu Date: Wed Jul 6 18:22:44 2011 +0200 Merge commit 'upstream/3.12.1.0' -- ocamlduce 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] ocamlduce packaging branch, master, updated. debian/3.12.0.0-1-3-gf471cf2
The following commit has been merged in the master branch: commit f471cf20ede22f70f88addcd347df5b791a20168 Author: Stephane Glondu Date: Wed Jul 6 18:11:32 2011 +0200 New upstream release diff --git a/debian/changelog b/debian/changelog index c898913..58927de 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ocamlduce (3.12.1.0-1) UNRELEASED; urgency=low + + * New upstream release + + -- Stéphane Glondu Wed, 06 Jul 2011 18:11:27 +0200 + ocamlduce (3.12.0.0-1) unstable; urgency=low * New upstream release: -- ocamlduce 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] ocamlduce packaging branch, pristine-tar, updated. ef1c1f3c9235e16e2e2f2182376931aba0c6c58d
The following commit has been merged in the pristine-tar branch: commit ef1c1f3c9235e16e2e2f2182376931aba0c6c58d Author: Stephane Glondu Date: Wed Jul 6 18:22:44 2011 +0200 pristine-tar data for ocamlduce_3.12.1.0.orig.tar.gz diff --git a/ocamlduce_3.12.1.0.orig.tar.gz.delta b/ocamlduce_3.12.1.0.orig.tar.gz.delta new file mode 100644 index 000..c21dff5 Binary files /dev/null and b/ocamlduce_3.12.1.0.orig.tar.gz.delta differ diff --git a/ocamlduce_3.12.1.0.orig.tar.gz.id b/ocamlduce_3.12.1.0.orig.tar.gz.id new file mode 100644 index 000..40435d8 --- /dev/null +++ b/ocamlduce_3.12.1.0.orig.tar.gz.id @@ -0,0 +1 @@ +22b54f3b7d1a04c6e3636b4e2cc26549e4d01c12 -- ocamlduce 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] ocamlduce packaging annotated tag, upstream/3.12.1.0, created. upstream/3.12.1.0
The annotated tag, upstream/3.12.1.0 has been created at 2f7ca9019aae3dbba6a2212e331a69e45e9f0e33 (tag) tagging 22b54f3b7d1a04c6e3636b4e2cc26549e4d01c12 (commit) replaces upstream/3.12.0.0 tagged by Stephane Glondu on Wed Jul 6 18:22:44 2011 +0200 - Shortlog Upstream version 3.12.1.0 Stephane Glondu (1): Imported Upstream version 3.12.1.0 --- -- ocamlduce 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] ocamlduce packaging branch, master, updated. debian/3.12.0.0-1-5-g4891da7
The following commit has been merged in the master branch: commit 87795e84e6af91da07fb49c5503a4d7bb16d03dd Author: Stephane Glondu Date: Tue Nov 1 20:50:32 2011 +0100 Bump versioned build-dependency to ocaml diff --git a/debian/control b/debian/control index 078cf1b..56e35c1 100644 --- a/debian/control +++ b/debian/control @@ -8,8 +8,8 @@ Build-Depends: dh-ocaml (>= 1.0.0~), autotools-dev, patch, - ocaml-source (>= 3.12.0), - ocaml-nox (>= 3.12.0) + ocaml-source (>= 3.12.1), + ocaml-nox (>= 3.12.1) Standards-Version: 3.9.2 Homepage: http://ocamlduce.forge.ocamlcore.org/ Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocamlduce.git -- ocamlduce 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] ocamlduce packaging branch, master, updated. debian/3.12.0.0-1-5-g4891da7
The following commit has been merged in the master branch: commit 4891da77f9dacba72c52e42b60fe4b658fed7796 Author: Stephane Glondu Date: Tue Nov 1 20:49:46 2011 +0100 Prepare upload to unstable diff --git a/debian/changelog b/debian/changelog index 58927de..fb30c74 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -ocamlduce (3.12.1.0-1) UNRELEASED; urgency=low +ocamlduce (3.12.1.0-1) unstable; urgency=low - * New upstream release + * New upstream release, compatible with OCaml 3.12.1 - -- Stéphane Glondu Wed, 06 Jul 2011 18:11:27 +0200 + -- Stéphane Glondu Tue, 01 Nov 2011 20:49:37 +0100 ocamlduce (3.12.0.0-1) unstable; urgency=low -- ocamlduce 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] ocamlduce packaging annotated tag, debian/3.12.1.0-1, created. debian/3.12.1.0-1
The annotated tag, debian/3.12.1.0-1 has been created at 3b2842c619c04a2856238a68cdf8f90d17018672 (tag) tagging 4891da77f9dacba72c52e42b60fe4b658fed7796 (commit) replaces debian/3.12.0.0-1 tagged by Stephane Glondu on Tue Nov 1 20:59:53 2011 +0100 - Shortlog Debian release 3.12.1.0-1 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAABCgAGBQJOsE+5AAoJEHhT2k1JiBrTu4QQAKwDJ6iPDv7tg+ZlK8JvNHtK mOeCgtHXLNtY3ZoFJzS6HmjyyQ9livVooZHUJjO2t1OJ0qgCvBWWmiABue22Wglh 4ukWmgu1goYGtAXQegArcE0g+exb+9GQ4+CiNcp9B+BKfWYC9sMKgNnRZ9B5QmI7 ALZ0eRCv4jrdezLFu8hOamOpmBEYzgIztVL36JcLWoFWMo7J9Tepvkh+09q+Yv5q uYYNpqDGoyg/ph/ILKQaLDt8ygPiiHJBTpBL63KYLbDPauEit8uS5QdMTqYX3yrX k6wXWGxdjD2Sd8N0FLTb/PQTMBKUeV1h9kDgKBoE9H8riSNRcu1rh+iV+CJav4Wh jvbmXmQu5CjbEtGl1STiRxuPRls8aFzuK8k8lxtUB+IBch/+Hs9C7N8CUdNBwd4Y oECIt4IXe8/yEln86FDW2fcvYEFmbX9cmpiv0db2ZmYI3nkdrhYwRxg8TNcGqIm5 MYYMlIdy9S9ETpreteCQjllO6loRVkFgo0QPSPKXrRORPDzf88G8PlKryfm1zt43 BA1PC8k8tHf1rzv9/2jN6DLaXfI5Enkwmw+xwPA01jndlG6h74zHd0sdJqp0YqFX A8mZTLDpieEdJ77k2cBViwcERQWCIts8Hkw52SVrwbDVMZAH8oiEoGGsM2RgBsQ1 2eikHhVCYogujxBIELyM =sIhY -END PGP SIGNATURE- Stephane Glondu (5): Imported Upstream version 3.12.1.0 Merge commit 'upstream/3.12.1.0' New upstream release Bump versioned build-dependency to ocaml Prepare upload to unstable --- -- ocamlduce 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] ocamlweb packaging branch, master, updated. debian/1.37-14-2-gbe48c2b
The following commit has been merged in the master branch: commit be48c2b9e4bb2d97bcd7897671ee3b254c64dc76 Author: Stephane Glondu Date: Tue Nov 1 21:08:13 2011 +0100 Prepare upload to unstable diff --git a/debian/changelog b/debian/changelog index 0e1066a..606e848 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,13 @@ -ocamlweb (1.37-15) UNRELEASED; urgency=low +ocamlweb (1.37-15) unstable; urgency=low + [ Stéphane Glondu ] + * Team upload + * Recompile with ocaml 3.12.1 + + [ Ralf Treinen ] * Removed cruft file debian/rules.debhelper - -- Ralf Treinen Fri, 21 Oct 2011 15:25:30 +0200 + -- Stéphane Glondu Tue, 01 Nov 2011 21:08:06 +0100 ocamlweb (1.37-14) unstable; urgency=low -- ocamlweb 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] ocamlweb packaging annotated tag, debian/1.37-15, created. debian/1.37-15
The annotated tag, debian/1.37-15 has been created at 2f19b5c54e82f52f851019c30cdca62e69348192 (tag) tagging be48c2b9e4bb2d97bcd7897671ee3b254c64dc76 (commit) replaces debian/1.37-14 tagged by Stephane Glondu on Tue Nov 1 21:11:15 2011 +0100 - Shortlog Debian release 1.37-15 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAABCgAGBQJOsFJjAAoJEHhT2k1JiBrT2MoP/RmhmzAmZZC+sIJa6d1+CYWk M6FG1JGmgXlAstH2P99Qf1niQ5E974o9cM/1YVf7uAz2fbWn+1YRzH5kzaOlR5+j NOwd6FUqKs4/8+uWCMmdZVDC+hnTgq/I5xytoXoW3BayxXz/aXnIsan83oi2pMUd iQdJ3OtjlfL9op9AE//KDZ6d88p4O/AkJJrASIAW147zuXmZNu/KG+dCyCgfUFG3 i6XZW68hZfFLpFKzlqkvHpIxzcl5mjOIMrWmVvwZfL9ORkW8zvo8vuiBeltka5Ir JjvHI0M/UcUjtR89nOoRp/eGJOnnFd91Tcxx0ogsBosgpUsn60q/6eWuejnApbls cf7oaJs/heO00vdfgWvkSDOxIJ8zm5HRUMlL3terfutMmPc8L6AYKNHMW35tgpsl jTi2m15HyXLny1W0fKppJ6/RApEhz/pNaUfo1t5KkC60eBWefpD2WBYFgTL5BwC1 Xx8Z5if9W5zP99w6s/5goJ4Dov6QwUEv+5jmZkdEpw1ey4EWAVcDLDv5UF+b4Wfh mixOaM/EskxOSMBIEaS0IrEANqGVWnZIH/YZjsf4jkh1vSbz+JNnW+7V1zBK9wuj WSKpVZ3i+tAiCF7A9dI3eBCV7LN5FVhIFjnXkp3ObJxHHBskByKF0KlZNsaatiUe Pra/e6Q4vJUWJGj3YXhG =ReDJ -END PGP SIGNATURE- Ralf Treinen (1): remove cruft file Stephane Glondu (1): Prepare upload to unstable --- -- ocamlweb 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] ocamlwc packaging branch, master, updated. debian/0.3-9-1-g44349c8
The following commit has been merged in the master branch: commit 44349c89b8deeb3b7c8259936eb85db3a436ca18 Author: Stephane Glondu Date: Tue Nov 1 21:10:20 2011 +0100 Prepare upload to unstable diff --git a/debian/changelog b/debian/changelog index 9a72401..96b6f04 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ocamlwc (0.3-10) unstable; urgency=low + + * Recompile with ocaml 3.12.1 (no source changes) + + -- Stéphane Glondu Tue, 01 Nov 2011 21:09:49 +0100 + ocamlwc (0.3-9) unstable; urgency=low * Update Stéphane's email address -- ocamlwc 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] ocamlwc packaging annotated tag, debian/0.3-10, created. debian/0.3-10
The annotated tag, debian/0.3-10 has been created at 3610998e611e9a8c29e2974ab73242716406f33f (tag) tagging 44349c89b8deeb3b7c8259936eb85db3a436ca18 (commit) replaces debian/0.3-9 tagged by Stephane Glondu on Tue Nov 1 21:12:01 2011 +0100 - Shortlog Debian release 0.3-10 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAABCgAGBQJOsFKRAAoJEHhT2k1JiBrTbJUP/iiu+X3nviYQiv6uRySG5+l3 QAQuT+zfz0PYa9IA0KzHrrEtgbjoBLrmbcWAtXr3RSOPINelydPopQdQkj4SRTJA NvZyzBIsElRCwRVJFEHeuFiXnOdXB+WToiGFLiet6GEQbXeMamK+CyQd/DaJRgth hSi7obIu6f3ewhHog5dLYU8Y+tApFdUWxul8/GvhlKs9fma7QUqHwaQcfnweUYqr yfOtG+wLr7RjNhBnNp4C6qgf4SXp7CHDVyZi1DqjeRNkAawqmXAWyL9lQt5q+QUw LedXI4cyHxp0FW8i2Qi8PgL9UAl6/76tdrhPdKLoEq+olrwNZOUzBX55TLMqE97n E1iVYgxD9YVljEtsZlolt1rkWtLnBjHaS5VvokVf5MhVyexAv/6TLv3FPo4CqkkF S43MR3SvcvJy/bffJJipB6GyIZ3enQjxMt38mWYx4tvxqn9nyZR3XIvRFZDHAL6R 2lTnllrQl/J2klYLhT6ir5X72EEcYOq4r2xzkq/oXNpvUafEcF26ied2quU/S/4H cxMQIHDvLggrsY4/Iky6GxOUU5POFFCGuogUaOkboQI5TjKvP+Mn0YqvHm5z5wI+ OVI8uIVuoX7ipDStLYde8hdbTvz0nPcqXucTSyV0RmQ0lUx2fHDKU39iRLD7OflO NT1TVjcA8EdZ3plGH6vo =ppdZ -END PGP SIGNATURE- Stephane Glondu (1): Prepare upload to unstable --- -- ocamlwc 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] planets packaging branch, master, updated. debian/0.1.13-12-1-g7890959
The following commit has been merged in the master branch: commit 78909591649c16066e3dd6590d9a18967f654309 Author: Stephane Glondu Date: Tue Nov 1 21:26:55 2011 +0100 Prepare upload to unstable diff --git a/debian/changelog b/debian/changelog index 4481210..9b7e101 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +planets (0.1.13-13) unstable; urgency=low + + * Team upload + * Recompile with ocaml 3.12.1 (no source changes) + + -- Stéphane Glondu Tue, 01 Nov 2011 21:26:53 +0100 + planets (0.1.13-12) unstable; urgency=low [ Ralf Treinen ] -- planets 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] planets packaging annotated tag, debian/0.1.13-13, created. debian/0.1.13-13
The annotated tag, debian/0.1.13-13 has been created at f7a86e8584ec94041552a58e9c654184a7dfc777 (tag) tagging 78909591649c16066e3dd6590d9a18967f654309 (commit) replaces debian/0.1.13-12 tagged by Stephane Glondu on Tue Nov 1 21:38:30 2011 +0100 - Shortlog Debian release 0.1.13-13 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAABCgAGBQJOsFjGAAoJEHhT2k1JiBrT3uEP/jYk9bZVxLFwnofFbuEOLHNB HxgwPRzL6AwOnfkqqYPcqpFpCErYrGeGN3sLqwYCOTW33RfBXw9kw1p5b06YSJU4 heLUZkIzxFv29Uj66Br61PgptTO3lGsGErjJeqo6OjLcL4lZ0siSH3Q/kKQql45r MmRKrK2NYUWmMmYKhXfQMlXqyzUgRl1JW+MJ048Lm4VFZ5Gd9i/x25/Fr9t/cujy mg3MStv6XlotQmX53ipATa3VS0HplEFFthu/2dw1RNExLt5ZcxphTnaUdzY1F3Z0 zNCPnsPi0OVBxVrs0qmpM9Y4by9mELtS7iWZqgy3DuP0qqyFpoKhQvyKYtz4gqqz u2hyjymN0FpfJyT4TOsbYkXMTKszPDJ+njIIh+PT+cdmHpJVny4nDyCXzNTOpNTr y493Omilajh98XWdkIRwxvT0ZCBmiSkpqTirMeRwtdlSvSmSzUE534vcvSWAhsMf 9XkEDc15ItYIF40jWJ6gjhkVVqGIRSKrOj9hGHuptOClhGOYeU9rqZIlY7vpDWRk cgBS6OW04KNnyf/GK7GPRgzJJd/32eeOsWC5PVDGrf+nlmE6dJAvsI1yXxb14ph2 6T2qrojcTO1kcTSUsus2JhZ6Tg64Sgk4/S0f6ijsR0MKsaLVotB8o2PJ6iTe19ov KlHch1usdYQ3l8z8Uqvj =/zpb -END PGP SIGNATURE- Stephane Glondu (1): Prepare upload to unstable --- -- planets 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] polygen packaging branch, master, updated. debian/1.0.6.ds2-11-1-g53f9dde
The following commit has been merged in the master branch:
commit 53f9ddea2bf59d8fae5c069425eefcc490d1fcf3
Author: Stephane Glondu
Date: Tue Nov 1 21:26:48 2011 +0100
Prepare upload to unstable
diff --git a/debian/changelog b/debian/changelog
index c554124..28cc384 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+polygen (1.0.6.ds2-12) unstable; urgency=low
+
+ * Team upload
+ * Recompile with ocaml 3.12.1 (no source changes)
+
+ -- Stéphane Glondu Tue, 01 Nov 2011 21:26:40 +0100
+
polygen (1.0.6.ds2-11) unstable; urgency=low
* added debian/gbp.conf: enforce pristine-tar
@@ -19,7 +26,7 @@ polygen (1.0.6.ds2-10) unstable; urgency=low
* add debian/source/format, value is 1.0
* debian/make_polygen_data-manpage: escape some hyphens, and fix a
typo in the generated manpage.
-
+
-- Ralf Treinen Tue, 22 Jun 2010 21:52:33 +0200
polygen (1.0.6.ds2-9) unstable; urgency=low
@@ -48,7 +55,7 @@ polygen (1.0.6.ds2-7) unstable; urgency=low
* debian/control: add missing ${misc:Depends} substvars
* debian/copyright: refer to version-ful common license file
* debian/*postinst: do not ignore script exit code
-
+
[ Stephane Glondu ]
* Switching packaging to git
--
polygen 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] polygen packaging annotated tag, debian/1.0.6.ds2-12, created. debian/1.0.6.ds2-12
The annotated tag, debian/1.0.6.ds2-12 has been created at 7fc0fd4dac0ed507211e99cff78d3b68c1d873fc (tag) tagging 53f9ddea2bf59d8fae5c069425eefcc490d1fcf3 (commit) replaces debian/1.0.6.ds2-11 tagged by Stephane Glondu on Tue Nov 1 21:44:53 2011 +0100 - Shortlog Debian release 1.0.6.ds2-12 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAABCgAGBQJOsFpFAAoJEHhT2k1JiBrT+8sQAIpoQlBKRiU6WoqOjpAhqzjA /d7uwnV4R2TBbky2xGOmDf5oAOOb7+T4+2VmGKvvqAX3EsSxjKCKF9gJGOhlW5wc auLtFTKa7JVR1XaSfNKsEXudnbsmZfUl5meBo3vpJpQa06GZck5OK24Hm/1Fkior pVGCTS+FYvy4UvgxM5YJxHjQJp7SsmvJm26NsaYK4o0DwnZMAulGr7oqgJh1hHeo 8atQ6mhiXfYe8oekdSMZOUqBkOtXM28jZY/lqEuUPxarP4oItfQaTtTpVpEFKQxQ FjXXMa00iz7G+zoQ1GD0Fv3y7Atyl7j2xH6+De5/z1AiOYgrkjbeXCZ90Xs04N7z 6d3ij8sMKuYshh3rOsOaJiyJ7DAYPCEk+Vs9sw9bewf/RiH+5EmV1ILBKQg3ZSoN ejKIIBxibGkX1HTaBOAgSfU9sHb3ZxlKaxb1LCx66kb6coEQ67mY7hWImklzTwZV ZzFVetRAe0GDB2fy2h2WtKAbfj9Y7pDkXxzFXHU5TrVrksdqDY3JKtODLakxIC8D HpmMKt3cDkZm9Jsd0OWH+kmGHyzxl9dpaiApxpVKPDRSji/NI2h8wYUkx3tajLGf Nz1KmbAE8xnWKAtzoWxVLACqznO2ZsILiIoWj/4ply7dW1Om42gbCEnHG+yIUC+Z sfM02lWoV3zQmHt31Hwr =fy1b -END PGP SIGNATURE- Stephane Glondu (1): Prepare upload to unstable --- -- polygen 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] camlp5 packaging branch, master, updated. debian/6.02.2-1-7-g186ad48
The following commit has been merged in the master branch: commit 186ad48756d7c1dac8c59c8aebaf7255a537968d Author: Stephane Glondu Date: Tue Nov 1 22:17:26 2011 +0100 Update changelog and prepare upload to unstable diff --git a/debian/changelog b/debian/changelog index d76696b..1189a5c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,10 @@ -camlp5 (6.02.3-1) UNRELEASED; urgency=low +camlp5 (6.02.3-1) unstable; urgency=low * New upstream release +- apply upstream patch patch-6.02.3-1 + * Bump Standards-Version to 3.9.2 (no changes) - -- Stéphane Glondu Mon, 04 Jul 2011 11:04:38 +0200 + -- Stéphane Glondu Tue, 01 Nov 2011 22:17:21 +0100 camlp5 (6.02.2-1) unstable; urgency=low -- camlp5 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] camlp5 packaging branch, master, updated. debian/6.02.2-1-7-g186ad48
The following commit has been merged in the master branch: commit 6691cb8d1cde6fcca4513682b2191c34ffb62f06 Author: Stephane Glondu Date: Tue Nov 1 22:22:40 2011 +0100 Import upstream patch 6.02.3-1 diff --git a/debian/patches/0001-Upstream-patch-6.02.3-1.patch b/debian/patches/0001-Upstream-patch-6.02.3-1.patch new file mode 100644 index 000..0b3a4bc --- /dev/null +++ b/debian/patches/0001-Upstream-patch-6.02.3-1.patch @@ -0,0 +1,808 @@ +From: Stephane Glondu +Date: Tue, 1 Nov 2011 22:14:37 +0100 +Subject: Upstream patch 6.02.3-1 + +Origin: upstream, http://pauillac.inria.fr/~ddr/camlp5/distrib/src/patch-6.02.3-1 +--- + CHANGES |2 ++ + etc/pa_o.ml |8 ++-- + etc/pr_o.ml | 13 +++-- + lib/versdep.ml |7 --- + main/ast2pt.ml | 12 ++-- + meta/pa_r.ml |5 +++-- + meta/q_MLast.ml |5 +++-- + ocaml_src/lib/versdep/1.06.ml|2 +- + ocaml_src/lib/versdep/1.07.ml|2 +- + ocaml_src/lib/versdep/2.00.ml|2 +- + ocaml_src/lib/versdep/2.01.ml|2 +- + ocaml_src/lib/versdep/2.02.ml|2 +- + ocaml_src/lib/versdep/2.03.ml|2 +- + ocaml_src/lib/versdep/2.04.ml|2 +- + ocaml_src/lib/versdep/2.99.ml|2 +- + ocaml_src/lib/versdep/3.00.ml|2 +- + ocaml_src/lib/versdep/3.01.ml|2 +- + ocaml_src/lib/versdep/3.02.ml|2 +- + ocaml_src/lib/versdep/3.03.ml|2 +- + ocaml_src/lib/versdep/3.04.ml|2 +- + ocaml_src/lib/versdep/3.05.ml|2 +- + ocaml_src/lib/versdep/3.06.ml|2 +- + ocaml_src/lib/versdep/3.07.ml|2 +- + ocaml_src/lib/versdep/3.08.0.ml |2 +- + ocaml_src/lib/versdep/3.08.1.ml |2 +- + ocaml_src/lib/versdep/3.08.2.ml |2 +- + ocaml_src/lib/versdep/3.08.3.ml |2 +- + ocaml_src/lib/versdep/3.08.4.ml |2 +- + ocaml_src/lib/versdep/3.09.0.ml |2 +- + ocaml_src/lib/versdep/3.09.1.ml |2 +- + ocaml_src/lib/versdep/3.09.2.ml |2 +- + ocaml_src/lib/versdep/3.09.3.ml |2 +- + ocaml_src/lib/versdep/3.09.4.ml |2 +- + ocaml_src/lib/versdep/3.10.0.ml |2 +- + ocaml_src/lib/versdep/3.10.1.ml |2 +- + ocaml_src/lib/versdep/3.10.2.ml |2 +- + ocaml_src/lib/versdep/3.10.3.ml |2 +- + ocaml_src/lib/versdep/3.10.ml|2 +- + ocaml_src/lib/versdep/3.11.0.ml |2 +- + ocaml_src/lib/versdep/3.11.1.ml |2 +- + ocaml_src/lib/versdep/3.11.2.ml |2 +- + ocaml_src/lib/versdep/3.11.3.ml |2 +- + ocaml_src/lib/versdep/3.11.ml|2 +- + ocaml_src/lib/versdep/3.12.0.ml |4 +++- + ocaml_src/lib/versdep/3.12.1.ml |4 +++- + ocaml_src/lib/versdep/3.13.0-gadt.ml |4 +++- + ocaml_src/lib/versdep/3.13.0.ml |4 +++- + ocaml_src/main/ast2pt.ml | 10 +- + ocaml_src/meta/pa_r.ml |5 - + ocaml_src/meta/q_MLast.ml|6 +- + 50 files changed, 105 insertions(+), 56 deletions(-) + +diff --git a/CHANGES b/CHANGES +index 839305d..74900c5 100644 +--- a/CHANGES b/CHANGES +@@ -1,6 +1,8 @@ + Camlp5 Version 6.02.3: + -- + ++* [20 Sep 11] Added missing syntax "_" in ending patt records (rev: "_ = _"). ++* [20 Sep 11] Fixed bug pattern -1L was refused in normal syntax. + * [21 May 11] Fixed bug impacting files using q_ast.cmo extension (bad ast). + * [03 May 11] Fixed bug: lexeme errors in revised syntax + utf8. + * [24 Mar 11] Fixed bug: M.(a+b) was refused in normal syntax. +diff --git a/etc/pa_o.ml b/etc/pa_o.ml +index e79a0a2..8f5e319 100644 +--- a/etc/pa_o.ml b/etc/pa_o.ml +@@ -1,5 +1,5 @@ + (* camlp5r *) +-(* $Id: pa_o.ml,v 6.35 2011-03-24 15:31:50 deraugla Exp $ *) ++(* $Id: pa_o.ml,v 6.37 2011-09-20 10:10:25 deraugla Exp $ *) + (* Copyright (c) INRIA 2007-2011 *) + + #load "pa_extend.cmo"; +@@ -771,6 +771,9 @@ EXTEND + | s = V INT_L -> <:patt< $_int64:s$ >> + | s = V INT_n -> <:patt< $_nativeint:s$ >> + | "-"; s = INT -> <:patt< $int:"-" ^ s$ >> ++ | "-"; s = INT_l -> <:patt< $int32:"-" ^ s$ >> ++ | "-"; s = INT_L -> <:patt< $int64:"-" ^ s$ >> ++ | "-"; s = INT_n -> <:patt< $nativeint:"-" ^ s$ >> + | "-"; s = FLOAT -> <:patt< $flo:"-" ^ s$ >> + | s = V FLOAT -> <:patt< $_flo:s$ >> + | s = V STRING -> <:patt< $_str:s$ >> +@@ -812,7 +815,8 @@ EXTEND + | le = lbl_patt -> [le] ] ] + ; + lbl_patt: +-[ [ i = patt_label_ident; "="; p = patt -> (i, p) ] ] ++[ [ i = patt_label_ident; "="; p = patt -> (i, p) ++ | "_" -> (<:patt< _ >>, <:patt< _ >>) ] ] + ; + patt_label_ident: + [ LEFTA +diff --git a/etc/pr_o.ml b/etc/pr_o.ml +index f43eb3f..beb3fb9 100644 +--- a/etc/pr_o.ml b/etc/pr_o.ml +@@ -1,5 +1,5 @@ + (* camlp5r *) +-(* $Id:
[Pkg-ocaml-maint-commits] [SCM] camlp5 packaging annotated tag, debian/6.02.3-1, created. debian/6.02.3-1
The annotated tag, debian/6.02.3-1 has been created at 0a85b4f48dcc73d3237176dde5245ebc57bcdddf (tag) tagging 186ad48756d7c1dac8c59c8aebaf7255a537968d (commit) replaces debian/6.02.2-1 tagged by Stephane Glondu on Tue Nov 1 22:28:30 2011 +0100 - Shortlog Debian release 6.02.3-1 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAABCgAGBQJOsGR+AAoJEHhT2k1JiBrTCn0QAKoA2mh5hFNcuvofrw+lR7Kb n0EwMGPbOHWjvlSnOCmfXsSXV8EgavFieUmANJitKiysXQXgAewKuiDnYntynyl3 lvmY8VQnqIoLWyaiHgUb1vPOxoRspy7Jh1Jgvpt4M9yYhb57e8P1zowCxZdKN+HR Fhd3CfkyOMWkOtyFKvmD2/v7zM9jQqWWFiuCTE7rjZcFAsF7lbxyG+tPPDgIgLbW E1JhncGYlzMRMj4IUqQSZchT7Lu1sLejV1zdbx3VOyp6PNfmVMhz0SjvmBGlYl/C TVwUoybM5prFW8SjdL1ewees3HqSSPW+JpggPTG/lP9+1Ace73p+lTb6Q+bWg9+l xryhKkgASj5I05Mlz7R6yg0mNqILOd9IoFR/uvJCeziRmvwatsyADkvVQzxywu9R 9M3UxOKYZxfJRAZwyLnTutJxMWgw36fEwQk1ytNKQrciGUaLgJQQTRdhdWwO1arG XE2ZnjYbwcQ3Hjdi3w7tduByzpq0/AIr4LlX9PRwNS7XDIxPO1hTrYQPIj/W+ndA m2pCFzdSg29gGV31ttGq4FBy/1ZewMd19tRU3qN9gcuepiopYkAkAV25up0PVkCA JIFOgKLNxu1v90cFKHHuYjVXW5/5ShZ+oO2pfSkTsLv3e3MkgsQuPBQPYhYoFkxk qv1KlqfJ1ia5ct3ARoRA =7ToO -END PGP SIGNATURE- Stephane Glondu (7): Imported Upstream version 6.02.3 Merge commit 'upstream/6.02.3' New upstream release Remove obsolete patches Bump Standards-Version to 3.9.2 (no changes) Import upstream patch 6.02.3-1 Update changelog and prepare upload to unstable --- -- camlp5 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] jocaml packaging branch, master, updated. debian/3.12.0-1-8-g3217567
The following commit has been merged in the master branch: commit 842fdf6ca0e9f52d7744737ac5eb8ca706201700 Merge: 15093e0a736bc103456bcbae659d7a328f2e1fa8 e12f18cc8276cf8fa1000c202e119bbea924cd8c Author: Mehdi Dogguy Date: Tue Nov 1 22:13:41 2011 +0100 Merge commit 'upstream/3.12.1' -- jocaml 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] jocaml packaging branch, master, updated. debian/3.12.0-1-8-g3217567
The following commit has been merged in the master branch: commit 46cc1a07c931593c693f3c3f1f00fffdd2abcde4 Author: Mehdi Dogguy Date: Tue Nov 1 22:14:14 2011 +0100 New upstream release diff --git a/debian/changelog b/debian/changelog index b6e2ee4..4d062ce 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +jocaml (3.12.1-1) UNRELEASED; urgency=low + + * New upstream release + + -- Mehdi Dogguy Tue, 01 Nov 2011 22:13:51 +0100 + jocaml (3.12.0-1) unstable; urgency=low * New upstream release (Closes: #580103). -- jocaml 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] jocaml packaging branch, master, updated. debian/3.12.0-1-8-g3217567
The following commit has been merged in the master branch:
commit ada7ceae43ac9b237f4d4e8f9f3102e57d75b330
Author: Mehdi Dogguy
Date: Tue Nov 1 22:15:23 2011 +0100
Refresh patches
diff --git a/debian/changelog b/debian/changelog
index 4d062ce..1225bbe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,11 @@
jocaml (3.12.1-1) UNRELEASED; urgency=low
* New upstream release
+ * Refresh patches
+- Remvove 0003-Fix-ocamlopt-w.r.t.-binutils-2.21.patch which was
+ integrated into this latest release.
- -- Mehdi Dogguy Tue, 01 Nov 2011 22:13:51 +0100
+ -- Mehdi Dogguy Tue, 01 Nov 2011 22:19:55 +0100
jocaml (3.12.0-1) unstable; urgency=low
diff --git
a/debian/patches/0001-Replace-Otyp_proc-with-Otyp_stuff-to-make-outcometre.patch
b/debian/patches/0001-Replace-Otyp_proc-with-Otyp_stuff-to-make-outcometre.patch
index ce23311..3a42b83 100644
---
a/debian/patches/0001-Replace-Otyp_proc-with-Otyp_stuff-to-make-outcometre.patch
+++
b/debian/patches/0001-Replace-Otyp_proc-with-Otyp_stuff-to-make-outcometre.patch
@@ -9,7 +9,7 @@ Subject: [PATCH] Replace Otyp_proc with Otyp_stuff "" to make
outcometree.mli co
3 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/typing/oprint.ml b/typing/oprint.ml
-index 45bca05..2a36e7a 100644
+index cd4cfa5..4ad2e3e 100644
--- a/typing/oprint.ml
+++ b/typing/oprint.ml
@@ -213,7 +213,6 @@ and print_simple_out_type ppf =
@@ -33,7 +33,7 @@ index b68f0a7..7c41091 100644
and out_variant =
| Ovar_fields of (string * bool * out_type list) list
diff --git a/typing/printtyp.ml b/typing/printtyp.ml
-index fc6311f..1006b92 100644
+index 6178561..acccb3a 100644
--- a/typing/printtyp.ml
+++ b/typing/printtyp.ml
@@ -399,7 +399,7 @@ let rec tree_of_typexp sch ty =
diff --git a/debian/patches/0003-Fix-ocamlopt-w.r.t.-binutils-2.21.patch
b/debian/patches/0003-Fix-ocamlopt-w.r.t.-binutils-2.21.patch
deleted file mode 100644
index 81ffe20..000
--- a/debian/patches/0003-Fix-ocamlopt-w.r.t.-binutils-2.21.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From: Stephane Glondu
-Date: Tue, 8 Mar 2011 21:17:40 +0100
-Subject: [PATCH] Fix ocamlopt w.r.t. binutils 2.21
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Bug: http://caml.inria.fr/mantis/view.php?id=5237
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=617404
-Authors: Eric Cooper, spiralvoice
-Reviewed-by: Stéphane Glondu
- asmcomp/amd64/emit.mlp | 13 +++--
- asmcomp/i386/emit.mlp |6 +++---
- 2 files changed, 10 insertions(+), 9 deletions(-)
-
-diff --git a/asmcomp/amd64/emit.mlp b/asmcomp/amd64/emit.mlp
-index 0a210f0..5022fe9 100644
a/asmcomp/amd64/emit.mlp
-+++ b/asmcomp/amd64/emit.mlp
-@@ -688,17 +688,18 @@ let fundecl fundecl =
- emit_all true fundecl.fun_body;
- List.iter emit_call_gc !call_gc_sites;
- emit_call_bound_errors ();
-+ begin match Config.system with
-+"linux" | "gnu" ->
-+ ` .type {emit_symbol fundecl.fun_name},@function\n`;
-+ ` .size {emit_symbol fundecl.fun_name},.-{emit_symbol
fundecl.fun_name}\n`
-+| _ -> ()
-+ end;
- if !float_constants <> [] then begin
- if macosx
- then `.literal8\n`
- else `.section.rodata.cst8,\"a\",@progbits\n`;
- List.iter emit_float_constant !float_constants
-- end;
-- match Config.system with
--"linux" | "gnu" ->
-- ` .type {emit_symbol fundecl.fun_name},@function\n`;
-- ` .size {emit_symbol fundecl.fun_name},.-{emit_symbol
fundecl.fun_name}\n`
-- | _ -> ()
-+ end
-
- (* Emission of data *)
-
-diff --git a/asmcomp/i386/emit.mlp b/asmcomp/i386/emit.mlp
-index 16ee67e..cf162c5 100644
a/asmcomp/i386/emit.mlp
-+++ b/asmcomp/i386/emit.mlp
-@@ -905,12 +905,12 @@ let fundecl fundecl =
- emit_all true fundecl.fun_body;
- List.iter emit_call_gc !call_gc_sites;
- emit_call_bound_errors ();
-- List.iter emit_float_constant !float_constants;
-- match Config.system with
-+ begin match Config.system with
- "linux_elf" | "bsd_elf" | "gnu" ->
- ` .type {emit_symbol fundecl.fun_name},@function\n`;
- ` .size {emit_symbol fundecl.fun_name},.-{emit_symbol
fundecl.fun_name}\n`
-- | _ -> ()
-+ | _ -> () end;
-+ List.iter emit_float_constant !float_constants
-
-
- (* Emission of data *)
---
diff --git a/debian/patches/0004-Natdynlink-works-on-powerpc.patch
b/debian/patches/0003-Natdynlink-works-on-powerpc.patch
similarity index 90%
rename from debian/patches/0004-Natdynlink-works-on-powerpc.patch
rename to debian/patches/0003-Natdynlink-works-on-powerpc.patch
index 79653a2..b17a5be 100644
--- a/debian/patches/0004-Natdynlink-works-on-powerpc.patch
+++ b/debian/patches/0003-Natdynlink-works-on-powerpc.patch
@@ -12,10 +12,10 @@ Signed-off-by: Stephane Glondu
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/configure b/configure
-index 3f99f6f..00b0cb9 100755
+index 1cdf960..2eef8d4 1007
[Pkg-ocaml-maint-commits] [SCM] jocaml packaging branch, master, updated. debian/3.12.0-1-8-g3217567
The following commit has been merged in the master branch:
commit 9b318d785931dc6b32f088af69b48d3ef66dba6d
Author: Mehdi Dogguy
Date: Tue Nov 1 22:23:06 2011 +0100
Add new patches from src:ocaml
diff --git a/debian/changelog b/debian/changelog
index 1225bbe..920cf5c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,14 @@ jocaml (3.12.1-1) UNRELEASED; urgency=low
* New upstream release
* Refresh patches
-- Remvove 0003-Fix-ocamlopt-w.r.t.-binutils-2.21.patch which was
- integrated into this latest release.
+- Remove patches integrated into this latest release:
+ + 0003-Fix-ocamlopt-w.r.t.-binutils-2.21.patch
+- New patches (from OCaml package):
+ + 0004-ocamlopt-arm-add-.type-directive-for-code-symbols.patch
+ + 0005-Add-support-for-ENOTSUP.patch
+ + 0006-Do-not-add-R-dir-in-X11-link-options-on-GNU-kFreeBSD.patch
+- Replace 0003-Natdynlink-works-on-powerpc.patch with a more complete
+ patch 0003-Natdynlink-works-on-powerpc-and-hurd-i386.patch
-- Mehdi Dogguy Tue, 01 Nov 2011 22:19:55 +0100
diff --git
a/debian/patches/0003-Natdynlink-works-on-powerpc-and-hurd-i386.patch
b/debian/patches/0003-Natdynlink-works-on-powerpc-and-hurd-i386.patch
new file mode 100644
index 000..2034c6c
--- /dev/null
+++ b/debian/patches/0003-Natdynlink-works-on-powerpc-and-hurd-i386.patch
@@ -0,0 +1,36 @@
+From: Stephane Glondu
+Date: Sat, 16 Apr 2011 23:41:23 +0200
+Subject: [PATCH] Natdynlink works on powerpc and hurd-i386
+
+Rationale: ssreflect used to work with natdynlink on powerpc and hurd
+with ocaml 3.11.2 / coq 8.2...
+
+Note: there is no native compiler for powerpc64! This must be a
+typo...
+
+Signed-off-by: Stephane Glondu
+---
+ configure |3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/configure b/configure
+index 1cdf960..eb32dc0 100755
+--- a/configure
b/configure
+@@ -651,13 +651,14 @@ if test $withsharedlibs = "yes"; then
+ case "$host" in
+ *-*-cygwin*) natdynlink=true;;
+ i[3456]86-*-linux*) natdynlink=true;;
++i[3456]86-*-gnu*) natdynlink=true;;
+ x86_64-*-linux*) natdynlink=true;;
+ i[3456]86-*-darwin10.*)
+ if test $arch64 == true; then
+ natdynlink=true
+ fi;;
+ i[3456]86-*-darwin[89]*) natdynlink=true;;
+-powerpc64-*-linux*) natdynlink=true;;
++powerpc-*-linux*) natdynlink=true;;
+ sparc-*-linux*) natdynlink=true;;
+ i686-*-kfreebsd*) natdynlink=true;;
+ x86_64-*-kfreebsd*) natdynlink=true;;
+--
diff --git a/debian/patches/0003-Natdynlink-works-on-powerpc.patch
b/debian/patches/0003-Natdynlink-works-on-powerpc.patch
deleted file mode 100644
index b17a5be..000
--- a/debian/patches/0003-Natdynlink-works-on-powerpc.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From: Stephane Glondu
-Date: Sat, 16 Apr 2011 23:41:23 +0200
-Subject: [PATCH] Natdynlink works on powerpc
-
-Rationale: ssreflect used to work with natdynlink on powerpc with
-ocaml 3.11.2 / coq 8.2... and there is no native compiler for
-powerpc64! This must be a typo...
-
-Signed-off-by: Stephane Glondu
- configure |2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/configure b/configure
-index 1cdf960..2eef8d4 100755
a/configure
-+++ b/configure
-@@ -657,7 +657,7 @@ if test $withsharedlibs = "yes"; then
- natdynlink=true
- fi;;
- i[3456]86-*-darwin[89]*) natdynlink=true;;
--powerpc64-*-linux*) natdynlink=true;;
-+powerpc-*-linux*) natdynlink=true;;
- sparc-*-linux*) natdynlink=true;;
- i686-*-kfreebsd*) natdynlink=true;;
- x86_64-*-kfreebsd*) natdynlink=true;;
---
diff --git
a/debian/patches/0004-ocamlopt-arm-add-.type-directive-for-code-symbols.patch
b/debian/patches/0004-ocamlopt-arm-add-.type-directive-for-code-symbols.patch
new file mode 100644
index 000..fab7e9c
--- /dev/null
+++
b/debian/patches/0004-ocamlopt-arm-add-.type-directive-for-code-symbols.patch
@@ -0,0 +1,125 @@
+From: Stephane Glondu
+Date: Fri, 12 Aug 2011 21:13:17 +0200
+Subject: [PATCH] ocamlopt/arm: add .type directive for code symbols
+
+Bug: http://caml.inria.fr/mantis/view.php?id=5336
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/810402
+Signed-off-by: Stephane Glondu
+---
+ asmcomp/arm/emit.mlp |1 +
+ asmrun/arm.S | 12
+ 2 files changed, 13 insertions(+), 0 deletions(-)
+
+diff --git a/asmcomp/arm/emit.mlp b/asmcomp/arm/emit.mlp
+index 256ffae..672a9b0 100644
+--- a/asmcomp/arm/emit.mlp
b/asmcomp/arm/emit.mlp
+@@ -556,6 +556,7 @@ let fundecl fundecl =
+ ` .text\n`;
+ ` .align 2\n`;
+ ` .global {emit_symbol fundecl.fun_name}\n`;
++ ` .type {emit_symbol fundecl.fun_name}, %function\n`;
+ `{emit_symbol fundecl.fun_name}:\n`;
+ let n = frame_size() in
+ ignore(emit_stack_adjustment
[Pkg-ocaml-maint-commits] [SCM] jocaml packaging branch, master, updated. debian/3.12.0-1-8-g3217567
The following commit has been merged in the master branch: commit 9a04cb522f034ed775c53646f1843f65217be78a Author: Mehdi Dogguy Date: Tue Nov 1 22:44:18 2011 +0100 Bump least version needed for OCaml in Build-Depends diff --git a/debian/changelog b/debian/changelog index 920cf5c..2271fd0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,8 +10,9 @@ jocaml (3.12.1-1) UNRELEASED; urgency=low + 0006-Do-not-add-R-dir-in-X11-link-options-on-GNU-kFreeBSD.patch - Replace 0003-Natdynlink-works-on-powerpc.patch with a more complete patch 0003-Natdynlink-works-on-powerpc-and-hurd-i386.patch + * Bump least version needed for OCaml in Build-Depends - -- Mehdi Dogguy Tue, 01 Nov 2011 22:19:55 +0100 + -- Mehdi Dogguy Tue, 01 Nov 2011 22:43:34 +0100 jocaml (3.12.0-1) unstable; urgency=low diff --git a/debian/control b/debian/control index 1a33920..047ead9 100644 --- a/debian/control +++ b/debian/control @@ -13,7 +13,7 @@ Build-Depends: libncurses5-dev, libgdbm-dev, dh-ocaml (>= 1.0~), - ocaml-nox (>= 3.12~) + ocaml-nox (>= 3.12.1~) Homepage: http://jocaml.inria.fr/ Standards-Version: 3.8.3 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/jocaml.git -- jocaml 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] jocaml packaging branch, master, updated. debian/3.12.0-1-8-g3217567
The following commit has been merged in the master branch: commit 7bb6ab298ed7a35c01a4223d450498f831b2e8fa Author: Mehdi Dogguy Date: Tue Nov 1 22:44:58 2011 +0100 Bump Standards-Version to 3.9.2, no changes required. diff --git a/debian/changelog b/debian/changelog index 2271fd0..f7dd720 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,8 +11,9 @@ jocaml (3.12.1-1) UNRELEASED; urgency=low - Replace 0003-Natdynlink-works-on-powerpc.patch with a more complete patch 0003-Natdynlink-works-on-powerpc-and-hurd-i386.patch * Bump least version needed for OCaml in Build-Depends + * Bump Standards-Version to 3.9.2, no changes required. - -- Mehdi Dogguy Tue, 01 Nov 2011 22:43:34 +0100 + -- Mehdi Dogguy Tue, 01 Nov 2011 22:44:33 +0100 jocaml (3.12.0-1) unstable; urgency=low diff --git a/debian/control b/debian/control index 047ead9..95e7223 100644 --- a/debian/control +++ b/debian/control @@ -15,7 +15,7 @@ Build-Depends: dh-ocaml (>= 1.0~), ocaml-nox (>= 3.12.1~) Homepage: http://jocaml.inria.fr/ -Standards-Version: 3.8.3 +Standards-Version: 3.9.2 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/jocaml.git Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/jocaml.git -- jocaml 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] jocaml packaging branch, master, updated. debian/3.12.0-1-8-g3217567
The following commit has been merged in the master branch: commit 32175676700b5d514c28d1683cbc3201b60491f4 Author: Mehdi Dogguy Date: Tue Nov 1 22:52:18 2011 +0100 Release to unstable diff --git a/debian/changelog b/debian/changelog index f7dd720..15d02fe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -jocaml (3.12.1-1) UNRELEASED; urgency=low +jocaml (3.12.1-1) unstable; urgency=low * New upstream release * Refresh patches @@ -13,7 +13,7 @@ jocaml (3.12.1-1) UNRELEASED; urgency=low * Bump least version needed for OCaml in Build-Depends * Bump Standards-Version to 3.9.2, no changes required. - -- Mehdi Dogguy Tue, 01 Nov 2011 22:44:33 +0100 + -- Mehdi Dogguy Tue, 01 Nov 2011 22:52:10 +0100 jocaml (3.12.0-1) unstable; urgency=low -- jocaml 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] jocaml packaging branch, pristine-tar, updated. 5107f570cfb99c3b867aab553e0ffdfd0376e8d3
The following commit has been merged in the pristine-tar branch: commit 5107f570cfb99c3b867aab553e0ffdfd0376e8d3 Author: Mehdi Dogguy Date: Tue Nov 1 22:13:41 2011 +0100 pristine-tar data for jocaml_3.12.1.orig.tar.gz diff --git a/jocaml_3.12.1.orig.tar.gz.delta b/jocaml_3.12.1.orig.tar.gz.delta new file mode 100644 index 000..647ad90 Binary files /dev/null and b/jocaml_3.12.1.orig.tar.gz.delta differ diff --git a/jocaml_3.12.1.orig.tar.gz.id b/jocaml_3.12.1.orig.tar.gz.id new file mode 100644 index 000..f861ff5 --- /dev/null +++ b/jocaml_3.12.1.orig.tar.gz.id @@ -0,0 +1 @@ +e12f18cc8276cf8fa1000c202e119bbea924cd8c -- jocaml 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] jocaml packaging annotated tag, debian/3.12.1-1, created. debian/3.12.1-1
The annotated tag, debian/3.12.1-1 has been created at d8c76ef368897bf02df83d48315b4524acbb9f74 (tag) tagging 32175676700b5d514c28d1683cbc3201b60491f4 (commit) replaces debian/3.12.0-1 tagged by Mehdi Dogguy on Tue Nov 1 23:02:37 2011 +0100 - Shortlog Debian release 3.12.1-1 Mehdi Dogguy (8): Imported Upstream version 3.12.1 Merge commit 'upstream/3.12.1' New upstream release Refresh patches Add new patches from src:ocaml Bump least version needed for OCaml in Build-Depends Bump Standards-Version to 3.9.2, no changes required. Release to unstable --- -- jocaml 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] jocaml packaging annotated tag, upstream/3.12.1, created. upstream/3.12.1
The annotated tag, upstream/3.12.1 has been created at 7700b7a619e08343b884fb53df7349e6ccbbdf7e (tag) tagging e12f18cc8276cf8fa1000c202e119bbea924cd8c (commit) replaces upstream/3.12.0 tagged by Mehdi Dogguy on Tue Nov 1 22:13:41 2011 +0100 - Shortlog Upstream version 3.12.1 Mehdi Dogguy (1): Imported Upstream version 3.12.1 --- -- jocaml 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] bibtex2html packaging branch, master, updated. debian/1.96-3-2-ge63027e
The following commit has been merged in the master branch: commit e63027e3ce021a2ceb0926ef89fae1fa507d2369 Author: Stephane Glondu Date: Wed Nov 2 07:06:21 2011 +0100 Prepare upload to unstable diff --git a/debian/changelog b/debian/changelog index ec6b908..ac525f9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,13 @@ -bibtex2html (1.96-4) UNRELEASED; urgency=low +bibtex2html (1.96-5) unstable; urgency=low + + [ Stéphane Glondu ] + * Team upload + * Recompile with ocaml 3.12.1 (no source changes) [ Stefano Zacchiroli ] * Remove myself from Uploaders - -- Stefano Zacchiroli Sat, 08 Oct 2011 17:09:39 +0200 + -- Stéphane Glondu Wed, 02 Nov 2011 07:06:15 +0100 bibtex2html (1.96-3) unstable; urgency=low -- bibtex2html 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] bibtex2html packaging annotated tag, debian/1.94-2, created. debian/1.94-2
The annotated tag, debian/1.94-2 has been created at 5d02512eb85655b68c7cd35eda0b29ee3f9a1a8b (tag) tagging 83236e60dcbd05f065fcba7b26f80696edfc6c9c (commit) replaces debian/1.94-1 tagged by Stephane Glondu on Tue Sep 22 23:03:00 2009 +0200 - Shortlog Debian release 1.94-2 Ralf Treinen (1): Imported Debian patch 1.94-2 Stephane Glondu (1): Switch packaging to git --- -- bibtex2html 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] bibtex2html packaging annotated tag, debian/1.96-5, created. debian/1.96-5
The annotated tag, debian/1.96-5 has been created at 08bd2a482262a7bd6e4d379db8e54ba5beb4006f (tag) tagging e63027e3ce021a2ceb0926ef89fae1fa507d2369 (commit) replaces debian/1.96-3 tagged by Stephane Glondu on Wed Nov 2 07:12:23 2011 +0100 - Shortlog Debian release 1.96-5 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAABCgAGBQJOsN9HAAoJEHhT2k1JiBrTKgsP+gK4gJrV+Mixj61m2H0sutJy ST8/I1z5CPOnOYa6YAk3Danq4hxc04H8oSM0xFNSfKarttjE37XNwrXvnz43UaMR 65KTisvxEZoE4sp0qFMrrxj6Idcpn28/uqmyn8FF2ICdsunjBUxbgvRC/0nwbGya Box0r7aZ9M6ts//kFFeXKqLT1T/5bJKsrbFSsD1Ym5L2w/40V+ouymBoqdTiwah5 wfKarvpC5nfybvXmLGV8pDtddd2BBDe/C7P5yVKV3rl/7LOVmMVZi1U6Nv695dyf UrbbGfIepabdYUAZt4mKx2YoV9LnoQ5IkC89XVh7ZbcvnvUcrQ8Hm/JWQSYbSa4o l/27LD6xhhxY5FUW0Qd+n5m6q0UEDUZT9UxbIYqz3hp9Tx9Fqk0SzkbQY2CdbP/5 mvCUvyT7ciH7CZotS79bwQpwpzSO5RrohSoqaPx77fvNGHQFA6v5y0Gm6xkXse5I HjPsH9gMALR0jurx3dMWvNCGrmkGt4MIM+tm7/7eDrBh8LAkHyp+at14yo6LVgHZ ZXhM9MxYrFaf1ArVA7MPb4DoIQ9ffkP79ywGWEIEPMYrKuKPS0u1aSYJOH9nH16O WzjAm5IuNr3d0DIrbj5GgSxAaJv+7vbmWHEcXywcNwW8Z1S+4gmARrf9RKO2k9Dl 4fU4y8vbaVOZv2zBl6hZ =Q7DA -END PGP SIGNATURE- Stefano Zacchiroli (1): Remove myself from Uploaders Stephane Glondu (1): Prepare upload to unstable --- -- bibtex2html 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] cppo packaging branch, master, updated. upstream/0.9.2-12-gdb560b8
The following commit has been merged in the master branch: commit db560b89f4018c7d7b7413a9db8e6b7a882c3d02 Author: Stephane Glondu Date: Wed Nov 2 07:10:04 2011 +0100 Prepare upload to unstable diff --git a/debian/changelog b/debian/changelog index d936628..73be557 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ -cppo (0.9.2-1) UNRELEASED; urgency=low +cppo (0.9.2-1) unstable; urgency=low + * Team upload * New upstream release - -- Stéphane Glondu Fri, 12 Aug 2011 12:49:47 +0200 + -- Stéphane Glondu Wed, 02 Nov 2011 07:09:56 +0100 cppo (0.9.0-2) unstable; urgency=low -- cppo 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] cppo packaging annotated tag, debian/0.9.2-1, created. debian/0.9.2-1
The annotated tag, debian/0.9.2-1 has been created at e3d34871943bc5b95f05614bc9a727a7a2ac0a73 (tag) tagging db560b89f4018c7d7b7413a9db8e6b7a882c3d02 (commit) replaces upstream/0.9.2 tagged by Stephane Glondu on Wed Nov 2 07:17:19 2011 +0100 - Shortlog Debian release 0.9.2-1 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAABCgAGBQJOsOBvAAoJEHhT2k1JiBrT7OsP/iVkApHPQ/W3aH84DJOgvYm1 DPC//tg7Gm1gBJa4RIOY5dpqmobZQaMNtiYEQ/zT7EK2GaVgU/ioukZjIlDxM/KG pgB+BuopnG1eQ54w0tTVOXpsrRofroUJ2bpANv/POkM9PG+w2bSmLnpCEaia7tNB fNyl5zQWLQizaUglXZ7Q5NeZZKIEVACt5gK5Vih2WSjNEoMeZeZTkZsdxNFoetr7 R9LKuA0pjgAcLnwSTER3Uy+r9usv435RMdYf2s4WiWA6PubkziILf7Mt7OizfnLL /bFoDk1d1sGj5lZaxJC3i+gEBlwR5RaQx/Dd/8Vaoq8jXvu+vWs7fPRDo3/VwP3t d7FaIYs1dMq7LnqkiFMpNEaoNXM6GPqtdByoavTduzlP2vehc1ojRBnL4Jcsbr+t TNGqHvnHNBnzjsRVL1/2ayBVJEq9iKv9xdcEuZ5N5w2dYBpCacSqvAyGRniOtaGL UHezRqUEeCL9ajiiKXz4iI2kwicTXpFbvPD+AwPsJoUHIiuhvYuUNk6PUOS5c8RE ftKRicIXy1Iz+kuWWsKTYqL4ISBb3tjvIfFevIoe27H8W072cJYz9346oFFtuuLl Fkq8DRcU35Z6BH3LFj6LlPlvQfHpu8ZY7Gt/U34jKRi4bYXSZ7ql/m5ry6DIWBRA n0IkjGPCqR7JAgh40Aoq =AW/P -END PGP SIGNATURE- Stephane Glondu (11): Rebuild with OCaml 3.12.0 (no changes) Merge commit 'upstream/0.9.1' New upstream release More cleaning Bump Standards-Version to 3.9.2 (no changes) Bump debhelper compat level to 8 Delete trailing whitespaces from files in debian/ Merge commit 'upstream/0.9.2' New upstream release Update copyright dates Prepare upload to unstable Sylvain Le Gall (1): Initial packaging --- -- cppo 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] camlmix packaging branch, master, updated. debian/1.3.0-2-4-gc7442db
The following commit has been merged in the master branch: commit 878f525a9399d847e770f74239eb854a636e6405 Author: Stephane Glondu Date: Wed Nov 2 07:14:59 2011 +0100 Remove trailing whitespaces diff --git a/debian/camlmix.mkd b/debian/camlmix.mkd index af7111c..684f1e2 100644 --- a/debian/camlmix.mkd +++ b/debian/camlmix.mkd @@ -1,5 +1,5 @@ % CAMLMIX(1) camlmix User Manual -% Sylvain Le Gall +% Sylvain Le Gall % December 2, 2010 # NAME @@ -31,7 +31,7 @@ of type string that will printed like the rest of the text: The document blocks are printed by default on stdout using the "print" -function. +function. For ## to be printed, ### should be used. White space introduced by OCaml can be controlled @@ -44,21 +44,21 @@ by ##. and .## symbols: ## Directives -Blocks of code that start with the @ character (possibly preceded +Blocks of code that start with the @ character (possibly preceded by spaces) are directives for Camlmix. The following directives are available: include "somefile.mlx"; (* inserts a camlmix file *) skip; (* ignores the next block of text *) -e.g.: +e.g.: Hello ## @include "world.mlx"; skip .## ## let x = 123 ##! ## Conversion into a "render" function for dynamic rendering -The -fun option, used in combination with -c and often -co produces +The -fun option, used in combination with -c and often -co produces an OCaml source file which provides a function with the following signature: val render : ?print:(string -> unit) -> ANYTYPE -> unit @@ -76,22 +76,22 @@ into some other container than stdout. It's default value is: ## Advanced usage The OCaml program that is generated from the Camlmix files first defines -a module called Camlmix. This module contains several variables that are +a module called Camlmix. This module contains several variables that are updated automatically and may be used explicitely by the user. module Camlmix : sig val source : string ref val line : int ref -val char : int ref -(* source, line and char refer to the location of the +val char : int ref +(* source, line and char refer to the location of the first character of the current block in its source file (source file, line number starting from 1, position in the line starting from 1). They are updated automatically at the beginning of each (code or text) block. *) -val printer : (string -> unit) ref +val printer : (string -> unit) ref (* the function that prints text blocks. It is initialized with the "print" function *) @@ -102,7 +102,7 @@ updated automatically and may be used explicitely by the user. OCaml block. *) val print_if : bool -> unit -(* print_if cond prints the next block of text only +(* print_if cond prints the next block of text only if cond is true. It uses print_with. *) end @@ -131,12 +131,12 @@ updated automatically and may be used explicitely by the user. -insert *ocaml code* : insert this code first --remix +-remix : try a conversion to the camlremix syntax -version : prints the version of Camlmix and exits --help|\--help +-help|\--help : Display this list of options -- camlmix 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] camlmix packaging branch, master, updated. debian/1.3.0-2-4-gc7442db
The following commit has been merged in the master branch: commit 6256043910bd103cdbf4e54303115d60746ac088 Author: Stephane Glondu Date: Wed Nov 2 07:18:24 2011 +0100 Fix typo spotted by Lintian diff --git a/debian/camlmix.mkd b/debian/camlmix.mkd index 684f1e2..f6b217c 100644 --- a/debian/camlmix.mkd +++ b/debian/camlmix.mkd @@ -77,7 +77,7 @@ into some other container than stdout. It's default value is: The OCaml program that is generated from the Camlmix files first defines a module called Camlmix. This module contains several variables that are -updated automatically and may be used explicitely by the user. +updated automatically and may be used explicitly by the user. module Camlmix : sig -- camlmix 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] camlmix packaging branch, master, updated. debian/1.3.0-2-4-gc7442db
The following commit has been merged in the master branch: commit 5504448cde21d04ef4796c73c3f8fa3ca03ddfce Author: Stephane Glondu Date: Wed Nov 2 07:18:43 2011 +0100 Regenerate manpage diff --git a/debian/camlmix.1 b/debian/camlmix.1 index 8e9f9c0..32869eb 100644 --- a/debian/camlmix.1 +++ b/debian/camlmix.1 @@ -6,8 +6,8 @@ camlmix - preprocessor which converts text with embedded OCaml. .PP camlmix [options] file1 file2 \&... fileN .PP -A temporary file \[lq]fileN.ml\[rq] is created and then executed -with ocaml. +A temporary file \[lq]fileN.ml\[rq] is created and then executed with +ocaml. .SH DESCRIPTION .SS General rules .PP @@ -15,13 +15,15 @@ Text between ## and ## is considered as a block of code. A block of code is normally some OCaml code. It can be any kind of toplevel expressions such as definitions or application of printing functions: -.PP -\f[CR] - This\ is\ ocaml\ version\ ##\ print\ Sys.ocaml\\_version\ ## +.IP +.nf +\f[C] +This\ is\ ocaml\ version\ ##\ print\ Sys.ocaml\\_version\ ## \f[] +.fi .PP -If it starts with = the OCaml code is interpreted as an expression -of type string that will printed like the rest of the text: +If it starts with = the OCaml code is interpreted as an expression of +type string that will printed like the rest of the text: .PP This is ocaml version ##= Sys.ocaml_version ## .PP @@ -30,113 +32,121 @@ The document blocks are printed by default on stdout using the For ## to be printed, ### should be used. .PP White space introduced by OCaml can be controlled by ##. -and \&.## symbols: -.PP -\f[CR] - \ \ ##.\ causes\ any\ white\ space\ to\ the\ left\ of\ the\ symbol - \ \ \ \ \ \ to\ be\ omitted\ from\ the\ output.\ Similarly - \ \ .##\ causes\ any\ white\ space\ followed\ by\ one\ newline - \ \ \ \ \ \ to\ be\ omitted\ from\ the\ output. +and .## symbols: +.IP +.nf +\f[C] +\ \ ##.\ causes\ any\ white\ space\ to\ the\ left\ of\ the\ symbol +\ \ \ \ \ \ to\ be\ omitted\ from\ the\ output.\ Similarly +\ \ .##\ causes\ any\ white\ space\ followed\ by\ one\ newline +\ \ \ \ \ \ to\ be\ omitted\ from\ the\ output. \f[] +.fi .SS \ Directives .PP -Blocks of code that start with the \@ character (possibly preceded -by spaces) are directives for Camlmix. +Blocks of code that start with the \@ character (possibly preceded by +spaces) are directives for Camlmix. The following directives are available: -.PP -\f[CR] - include\ "somefile.mlx";\ (*\ inserts\ a\ camlmix\ file\ *) - skip;\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ (*\ ignores\ the\ next\ block\ of\ text\ *) +.IP +.nf +\f[C] +include\ "somefile.mlx";\ (*\ inserts\ a\ camlmix\ file\ *) +skip;\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ (*\ ignores\ the\ next\ block\ of\ text\ *) \f[] +.fi .PP e.g.: -.PP -\f[CR] - Hello\ ##\ \@include\ "world.mlx";\ skip\ .##\ ##\ let\ x\ =\ 123\ ##! +.IP +.nf +\f[C] +Hello\ ##\ \@include\ "world.mlx";\ skip\ .##\ ##\ let\ x\ =\ 123\ ##! \f[] +.fi .SS Conversion into a \[lq]render\[rq] function for dynamic rendering .PP -The -fun option, used in combination with -c and often -co produces -an OCaml source file which provides a function with the following +The -fun option, used in combination with -c and often -co produces an +OCaml source file which provides a function with the following signature: .PP val render : ?print:(string -> unit) -> ANYTYPE -> unit .PP -where ANYTYPE is the type the \[lq]param\[rq] object which is -available in the template. +where ANYTYPE is the type the \[lq]param\[rq] object which is available +in the template. \[lq]param\[rq] can be used to pass runtime arguments, such as CGI parameters if you are serving dynamic web pages. The \[lq]print\[rq] function is used to set the initial value of -Camlmix.printer (see below) and should be used if you want to be -able to put the output into some other container than stdout. +Camlmix.printer (see below) and should be used if you want to be able to +put the output into some other container than stdout. It's default value is: .PP fun s -> print_string s; flush stdout .SS Advanced usage .PP -The OCaml program that is generated from the Camlmix files first -defines a module called Camlmix. -This module contains several variables that are updated -automatically and may be used explicitely by the user. -.PP -\f[CR] - module\ Camlmix\ : - \ \ sig - \ \ \ \ val\ source\ :\ string\ ref - \ \ \ \ val\ line\ \ \ :\ int\ ref - \ \ \ \ val\ char\ \ \ :\ int\ ref\ \ \ \ \ \ \ \ - \ \ \ \ \ \ \ \ (*\ source,\ line\ and\ char\ refer\ to\ the\ location\ of\ the\ - \ \ \ \ \ \ \ \ \ \ \ first\ character\ of\ the\ current\ block\ in\ its\ source\ file - \ \ \ \ \ \ \ \ \ \ \ (source\ file,\ line\ number\ starting\ from\ 1,\ position\ in - \ \ \ \ \ \ \ \ \ \ \ the\ line\ starting\ from\ 1).\ They\ are\ updated - \ \ \ \ \ \ \ \ \ \ \ automatically\ at\ the\ beginning\ of\ each\ (code\ or\ text) - \ \ \
[Pkg-ocaml-maint-commits] [SCM] camlmix packaging branch, master, updated. debian/1.3.0-2-4-gc7442db
The following commit has been merged in the master branch: commit c7442db30b9a42f28e1425109fdfbd0fe68665ff Author: Stephane Glondu Date: Wed Nov 2 07:08:59 2011 +0100 Prepare upload to unstable diff --git a/debian/changelog b/debian/changelog index 24ff31a..041939a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +camlmix (1.3.0-3) unstable; urgency=low + + * Team upload + * Rebuild with OCaml 3.12.1 + * Fix typo in manpage + + -- Stéphane Glondu Wed, 02 Nov 2011 07:08:49 +0100 + camlmix (1.3.0-2) unstable; urgency=low * Team upload -- camlmix 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] camlmix packaging annotated tag, debian/1.3.0-3, created. debian/1.3.0-3
The annotated tag, debian/1.3.0-3 has been created at d7689cdaefaf7f1715e445aa17ad6cbf85905e78 (tag) tagging c7442db30b9a42f28e1425109fdfbd0fe68665ff (commit) replaces debian/1.3.0-2 tagged by Stephane Glondu on Wed Nov 2 07:21:06 2011 +0100 - Shortlog Debian release 1.3.0-3 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAABCgAGBQJOsOFSAAoJEHhT2k1JiBrTQlYP/ioCXZ4j7XHl44bEr//hkHQ1 oqkK6RXWbp6pprcM32eG/1kotQwNr/YTffJQ8wxyAhG2K4eqejeZGiVfZ+M0guMI fKs6ZKd4UnDJh9NK9FDh1hHVauUQ9E6LRiqQaIUto8PNskW91km3mYmQWA7Jclz/ sAt3TSPSRFroqhxc/mQbeYmNk1NU32BEAVQkq9LuOJPdgC3X6rIXurYYz7zlQOoF ZEuAbWRbQor2xAJX+kV3vxtd4IdpmyCCRV+pGiea+NdyRHNmFohr22NLgPT+7q8F AgtCqSn2mTNz1Tn2Hryk4zUNQGWqj3Yi9yIRWbB6AQZFqN668kbzm6qBof7qyuAA 6W6ZhlmzRdZ+jfmpepxEKPzKsEvRrBtpXand1iYE1mLkDvSSGZU/GySAonfh4Y6j hdIEFed+z3FwxZ2PD8Jak5bn+GWXAApNQlrpI/mpeTE5JY6pqprRLmYFAofABsTO /VdPrP7XYcDKuX+cHEwLPP6TME462yUiWEIi8lW5NYGUZCuILVQS+zzat0O6H2Tw LSbNjCL1X2GmZXqV2mXhFiwAlDuu05Zgc935RJDIlBBR+etCAkd174KSxD2AqYz7 GxKbkjxPbUPEf1DDsrvUctkMMW/2tCm97QbAQxhl0P4bSGEuYOb6O3/HFtiw1304 UUp9oUQ8FeEEs4W9gevS =BEWM -END PGP SIGNATURE- Stephane Glondu (4): Remove trailing whitespaces Fix typo spotted by Lintian Regenerate manpage Prepare upload to unstable --- -- camlmix 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] ocamlify packaging branch, master, updated. debian/0.0.1-2-1-gb1df528
The following commit has been merged in the master branch: commit b1df528cf9d6ab3e29035ba4398a642296de3f27 Author: Stephane Glondu Date: Wed Nov 2 07:23:27 2011 +0100 Prepare upload to unstable diff --git a/debian/changelog b/debian/changelog index af590bc..8685c62 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +ocamlify (0.0.1-3) unstable; urgency=low + + * Team upload + * Recompile with OCaml 3.12.1 (no changes) + + -- Stéphane Glondu Wed, 02 Nov 2011 07:23:22 +0100 + ocamlify (0.0.1-2) unstable; urgency=low * Team upload -- ocamlify 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] ocamlify packaging annotated tag, debian/0.0.1-3, created. debian/0.0.1-3
The annotated tag, debian/0.0.1-3 has been created at 10f9eda0f16fc970f2aa4ba8f034f224da3e9a6c (tag) tagging b1df528cf9d6ab3e29035ba4398a642296de3f27 (commit) replaces debian/0.0.1-2 tagged by Stephane Glondu on Wed Nov 2 07:25:42 2011 +0100 - Shortlog Debian release 0.0.1-3 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAABCgAGBQJOsOJmAAoJEHhT2k1JiBrTDcQP/jx2VBjCZFA6DiHUs1tncYPe qdEOKz/82Op3Xbdm3bqdOjMf7BYWVS38zujAD0kJDGywKMsv4NbA5ySLHjIEsDuD dfl0j9U311FjqdErq0yZBMVfn7iLFK8hjtCLWKEz0EQQIb6MzmX29fHEebqc9rhv thSxnf6uKAHqn1Ob6A10oXDAJTDCFdOJM8CsKCcAbZd2udRe/5IMECSeYFZCwUpg 9PxtGHv5kgX8Uwsn1ts9depXsGouGr7uWCY5lSnjGPGW84+XTyWo7p01uFRorjgF f1ldTB0ECyqNmp+k7qb5xP4esKrKcls/X6ZvcKAj39PQgmhYAITJ9ST/0k+VJZHr fBqVfzXgxxeugtwLfy3gW1QRJf93cWHjdKRY+Gd4hqMeOFGqQxi6ujoqgzNnv3TX H2D+JUqt6V0oddfIv8dnIlrgivVuvR+acFCPTyxMajwKAP1szWsVSmPxfVkTqm+F lTBXiWGheReod0uWTr44xBQFYDi55d6969smtY3VH6TKEXl5121cW3PAyfL8A5Ps Q4NeN63wlFPR8PWtqRbLth0VydY3Ug7Wn1XXlQJFzr6xyOxfEDQXDpVg++or2sB2 8pK6HXZOuCyl0cxTu8BMCCSCnFDPkvdIURp5yycoulpkg0XazqADjopKgXGN6G5G 7cV8Gda/ONCWLJuCcGkB =U5bF -END PGP SIGNATURE- Stephane Glondu (1): Prepare upload to unstable --- -- ocamlify 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] tophide packaging branch, master, updated. debian/1.0.0-2-1-g5559b14
The following commit has been merged in the master branch: commit 5559b14495375a12a7e7a5b4b061a8b35f41b291 Author: Stephane Glondu Date: Wed Nov 2 07:23:53 2011 +0100 Prepare upload to unstable diff --git a/debian/changelog b/debian/changelog index f585d70..e55994b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +tophide (1.0.0-3) unstable; urgency=low + + * Team upload + * Recompile with OCaml 3.12.1 (no changes) + + -- Stéphane Glondu Wed, 02 Nov 2011 07:23:51 +0100 + tophide (1.0.0-2) unstable; urgency=low * Team upload -- tophide 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] tophide packaging annotated tag, debian/1.0.0-3, created. debian/1.0.0-3
The annotated tag, debian/1.0.0-3 has been created at 90f92a0360d19dc77bfaebdbf1cc779cea81000a (tag) tagging 5559b14495375a12a7e7a5b4b061a8b35f41b291 (commit) replaces debian/1.0.0-2 tagged by Stephane Glondu on Wed Nov 2 07:26:30 2011 +0100 - Shortlog Debian release 1.0.0-3 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAABCgAGBQJOsOKWAAoJEHhT2k1JiBrTt34QAJZLr1NxfLm9m28FJv/gJ6iX klmssePxE44AT0w5FHL1HM2Jc67+dKMEH/86b3MaVPJEjNwavL5UkAygcBgqp0B/ CqOxx7bH7TyY3n5aNWwyVholcrhIeoaQIHhR/wB+4sKkgbpYrwFWvffD3rVTTlki y3629X/BNLB6Ue4jukhMa40fi3eugbqWfGc9+OB2MTklaFq13m2AuoHBsjQCkQ+L lYBP7zvrQXORzNVhBdzD4EELaI4usdk1cqqYTrd6XWRcR8bQ2ZKKX32N/42rnsvr r/6Xpp4TljcDFAwtpItF5FNAVLZqWRhnsw2URbJpfDjUD7ByaqkC1jrU/YTaYeV1 dHtYjxHN4he8C3f+Qu3WbWdVEvZEwURNVtOXzUlgr+MiX+XlaNz/ZscYfUVXpmCF tNs6bd7xohFAuE/rcgKfi71GILXYbk+3Xe1UCfhzHi3+TegnBP8wL1ASKc2vC97W 4/eMtFvUCsxgMhbtcvnhatm3ZbZapcFtC7tyXkLfBelXLRrhyZUakGFZTOgQwb+/ c0C3snXfyIw5kedw+1BdBebk0zSI7ikQXqX6QtF+KGUAW6LgUaCc5MXac6Qv58tw RJX8VSqw7TL0IOe1Btm7q/ncSxLmof0cvKza2FjSj+DdtdVboEP+YuzNncpp2FXB amQm3NfZOyKn/7CwXwjr =QOkJ -END PGP SIGNATURE- Stephane Glondu (1): Prepare upload to unstable --- -- tophide 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] xstrp4 packaging branch, master, updated. debian/1.8-2-1-gd017309
The following commit has been merged in the master branch: commit d0173097158c244b73987707c2764ce25f1105c4 Author: Stephane Glondu Date: Wed Nov 2 07:24:22 2011 +0100 Prepare upload to unstable diff --git a/debian/changelog b/debian/changelog index b36ec76..33951f8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +xstrp4 (1.8-3) unstable; urgency=low + + * Team upload + * Recompile with OCaml 3.12.1 (no changes) + + -- Stéphane Glondu Wed, 02 Nov 2011 07:24:12 +0100 + xstrp4 (1.8-2) unstable; urgency=low * Team upload -- xstrp4 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] xstrp4 packaging annotated tag, debian/1.8-3, created. debian/1.8-3
The annotated tag, debian/1.8-3 has been created at 313bef70e9298e3471cc21f6b12f6dcbc0503310 (tag) tagging d0173097158c244b73987707c2764ce25f1105c4 (commit) replaces debian/1.8-2 tagged by Stephane Glondu on Wed Nov 2 07:27:12 2011 +0100 - Shortlog Debian release 1.8-3 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAABCgAGBQJOsOLAAAoJEHhT2k1JiBrT8dAQAIIzJFmR2IUbJ0x2RY3KGOWS 6MQ3V5Jqk/Q3UAJ855XnqCo84/RxGAcPC0eAiOKj6xxHGTYyS2c2MGNkjFunaiBu zDDjSe6Y9vwy5Y6ZmA4/5OQTsiTsOIK3nBW8ORasyqQ7zDrY+NVhqYzThvtXUXdw GWVAT1F3lgDMK+BGG6s5AJbCg8UdBKHE0wIFhIQjNwra7ONP0fEgZhy+3wYFibrs hU3Bp+UERF6SXWSmGwEHV3A9xlhDsK3qkITkxxduW0nHQAxnli72s1CKPBAL8cxt ltNo7VEBhq70di6c1vhPF7LLmBfSosQXYYflwoAjJEKxv8NSbL1vnuPUMKG0iVLs VZNtjWR4bouyI8Yzs9yqA1c0ZcbsgJi9qh2bHBehoXGgE/Cszk+C+0SjqV73ODDz tsaW9oThbqLgWhB9a9SGPZdlt0ux+7QIrlaUX/pwCn9ifPS5in5tWyHeQW86zCCH WYOtpx8UeKksZrVnhCrJ7nOSoASGI/dHIsxERZ/4XC498GLUhQg7BNexLPA56vZN PZRMPsG3kqdhKnQteroMg1BwhOh0p3e8icVHjhpKRq7TxmvNGZuvJ5tBW4xVaQJq cr4GMEzGZuAsjtFmwSiDyVPJGd4hsUdQJh/IrHN2grAtbGtsyxz3pqJLaFQjPTcj 3I9PFAH02g42TN3yUqTB =u4gz -END PGP SIGNATURE- Stephane Glondu (1): Prepare upload to unstable --- -- xstrp4 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
