[Pkg-ocaml-maint-commits] [SCM] ocsigenserver packaging annotated tag, upstream/2.1, created. upstream/2.1
The annotated tag, upstream/2.1 has been created at dd6ab39bcda7014fe5b52776d143aa0356bb4267 (tag) tagging 3a77106bb17d4b9a570ebc9a10be7f987dcd1114 (commit) replaces upstream/2.0.4 tagged by Stephane Glondu on Fri Jun 8 07:38:42 2012 +0200 - Shortlog Upstream version 2.1 Stephane Glondu (1): Imported Upstream version 2.1 --- -- ocsigenserver 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] ocsigenserver packaging annotated tag, debian/2.1-1, created. debian/2.1-1
The annotated tag, debian/2.1-1 has been created at 0c6551175dfcf053323816d3574a9b79027f5c6f (tag) tagging 3522a601612be36e405ca213b2fc6e61b50c15f7 (commit) replaces debian/2.0.4-1 tagged by Stephane Glondu on Sat Jun 9 10:59:57 2012 +0200 - Shortlog Debian release 2.1-1 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.12 (GNU/Linux) iQIcBAABCgAGBQJP0xCNAAoJEHhT2k1JiBrTnHoQAKBUGqk15szH2nqG0Y8h4235 abQa2yTeTodR3e5stV6KnAIWzU1HJekz/dcaPCAc7JQ5QKOym/rScraYaUkl5GSW iI56mRSySwEm4zS84KpwWPNgnSu1KvWp0ywXG+uP+V5GJr9wNik5kvOT+uIq12NU qR6IewOoHd15reGBh63ypGxUR+iGnx5Dogzg+dNWZcxC0hiz3eKsAEs8q/o4fsf4 qnsjUDTJm9LVblGl+FOvgyOWZd/0st4fTMNhraySAwl8NVPemRNwNwLi5xNAUCzi wLX2pvirFSvJqv7unHRoejao8p/CQAuvh1KqvCsy+N9iTAlD2LkOiGBI+v/j5KIF PjacnTDxocsykr2LgwDcaZ6aWweJsuQHKUfgJV+MgSxECx01bt/TbvgtpLd76BRt dHovkHB2GI5fjN+B0Ku7iN3RZqdyZiri/k74/UWCrjQ+fpE72k7t9xt5r7bCGlvK D7XbmxEohDdOvt7/ludwjhB0h6SWkYq2dWa6deBI85ojcPTvYBudMsWofNeW4dNy Qf+uCF34eA0bQNQKthiNfFbudQFXRFE6GoqmENInR3NIuA/UJzJozVP5acvLxRRs eSnQi9viMSyf/wn127sC2/th0UQhrnXl09twFwj2uZ+LirhYlrPt961/qG0CVG0O cNHKwomJDSMH8T6jW0VA =fzTZ -END PGP SIGNATURE- Stephane Glondu (6): Imported Upstream version 2.1 Merge tag 'upstream/2.1' New upstream release Refresh patches Misc updates Prepare upload to unstable --- -- ocsigenserver 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] ocsigenserver packaging branch, pristine-tar, updated. d3d4ffae36235a8c44fac2679769ba8e9a3b6c00
The following commit has been merged in the pristine-tar branch: commit d3d4ffae36235a8c44fac2679769ba8e9a3b6c00 Author: Stephane Glondu Date: Fri Jun 8 07:38:42 2012 +0200 pristine-tar data for ocsigenserver_2.1.orig.tar.gz diff --git a/ocsigenserver_2.1.orig.tar.gz.delta b/ocsigenserver_2.1.orig.tar.gz.delta new file mode 100644 index 000..633eb66 Binary files /dev/null and b/ocsigenserver_2.1.orig.tar.gz.delta differ diff --git a/ocsigenserver_2.1.orig.tar.gz.id b/ocsigenserver_2.1.orig.tar.gz.id new file mode 100644 index 000..d2e7026 --- /dev/null +++ b/ocsigenserver_2.1.orig.tar.gz.id @@ -0,0 +1 @@ +0e0d904b950b94dbff1a7c835aa78899f2bfeb2a -- ocsigenserver 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] ocsigenserver packaging branch, master, updated. debian/2.0.4-1-6-g3522a60
The following commit has been merged in the master branch: commit 3522a601612be36e405ca213b2fc6e61b50c15f7 Author: Stephane Glondu Date: Sat Jun 9 10:54:49 2012 +0200 Prepare upload to unstable diff --git a/debian/changelog b/debian/changelog index bc204f0..3bcd9de 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,10 @@ -ocsigenserver (2.1-1) UNRELEASED; urgency=low +ocsigenserver (2.1-1) unstable; urgency=low - * New upstream release + * New upstream release (Closes: #676750) + * Use format 1.0 in debian/copyright + * Bump Standards-Version to 3.9.3 - -- Stéphane Glondu Fri, 08 Jun 2012 07:38:49 +0200 + -- Stéphane Glondu Sat, 09 Jun 2012 10:54:47 +0200 ocsigenserver (2.0.4-1) unstable; urgency=low -- ocsigenserver 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] ocsigenserver packaging branch, master, updated. debian/2.0.4-1-6-g3522a60
The following commit has been merged in the master branch: commit 2d596313592ed9394271c7cbb9c5b1a89c08b1bd Author: Stephane Glondu Date: Sat Jun 9 10:44:45 2012 +0200 Misc updates diff --git a/debian/control b/debian/control index 6d93ae7..92e5f50 100644 --- a/debian/control +++ b/debian/control @@ -19,9 +19,9 @@ Build-Depends: libsqlite3-ocaml-dev (>= 1.5.6-3~), libzip-ocaml-dev (>= 1.04-6~), libcryptokit-ocaml-dev (>= 1.3-14~), - libtyxml-ocaml-dev, + libtyxml-ocaml-dev (>= 2.1), dh-ocaml (>= 0.9.5~) -Standards-Version: 3.9.2 +Standards-Version: 3.9.3 Homepage: http://ocsigen.org/ocsigenserver/ Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocsigenserver.git Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocsigenserver.git diff --git a/debian/copyright b/debian/copyright index a434733..57f0d26 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: Ocsigen Server Upstream-Contact: The Ocsigen Team Source: http://ocsigen.org/ocsigenserver/install diff --git a/debian/libocsigenserver-ocaml-dev.install.in b/debian/libocsigenserver-ocaml-dev.install.in index 943c11a..a5c7377 100644 --- a/debian/libocsigenserver-ocaml-dev.install.in +++ b/debian/libocsigenserver-ocaml-dev.install.in @@ -5,6 +5,7 @@ @OCamlStdlibDir@/ocsigenserver/baselib.cma @OCamlStdlibDir@/ocsigenserver/http.cma @OCamlStdlibDir@/ocsigenserver/ocsigen_cookies.cmo +@OCamlStdlibDir@/ocsigenserver/ocsigen_lib_base.cmo @OCamlStdlibDir@/ocsigenserver/ocsigenserver.cma @OCamlStdlibDir@/ocsigenserver/server_main.cmo DYN: @OCamlStdlibDir@/ocsigenserver/*.o -- ocsigenserver 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] ocsigenserver packaging branch, master, updated. debian/2.0.4-1-6-g3522a60
The following commit has been merged in the master branch: commit 7314a81a05befbc33c2344d52dac37215a288034 Author: Stephane Glondu Date: Fri Jun 8 07:38:54 2012 +0200 New upstream release diff --git a/debian/changelog b/debian/changelog index 4cce2a3..bc204f0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ocsigenserver (2.1-1) UNRELEASED; urgency=low + + * New upstream release + + -- Stéphane Glondu Fri, 08 Jun 2012 07:38:49 +0200 + ocsigenserver (2.0.4-1) unstable; urgency=low * New upstream release -- ocsigenserver 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] ocsigenserver packaging branch, master, updated. debian/2.0.4-1-6-g3522a60
The following commit has been merged in the master branch: commit 002b07b43d4ae070e1ce94c87d9fe2b075317bef Author: Stephane Glondu Date: Sat Jun 9 10:40:47 2012 +0200 Refresh patches diff --git a/debian/patches/0001-Fix-typo-in-Makefile.patch b/debian/patches/0001-Fix-typo-in-Makefile.patch index bf0ccdb..38b1123 100644 --- a/debian/patches/0001-Fix-typo-in-Makefile.patch +++ b/debian/patches/0001-Fix-typo-in-Makefile.patch @@ -1,20 +1,21 @@ From: Stephane Glondu Date: Sat, 17 Mar 2012 11:56:53 +0100 -Subject: Fix typo in Makefile (caused FTBFS with /bin/sh -> bash) +Subject: Fix typo in Makefile +Caused FTBFS with /bin/sh -> bash. --- Makefile |2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile -index e4ffb01..64923ae 100644 +index 7928b12..64923ae 100644 --- a/Makefile +++ b/Makefile @@ -138,7 +138,7 @@ logrotate: | sed s%USER%$(OCSIGENUSER)%g \ | sed s%GROUP%$(OCSIGENGROUP)%g \ | sed s%_COMMANDPIPE_%$(COMMANDPIPE)%g \ -- > $(TEMPROOT)/etc/logrotate.d/$(PROJECTNAME); } +- > $(TEMPROOT)/etc/logrotate.d/$(PROJECTNAME) } + > $(TEMPROOT)/etc/logrotate.d/$(PROJECTNAME) ### -- ocsigenserver 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] ocsigenserver packaging branch, master, updated. debian/2.0.4-1-6-g3522a60
The following commit has been merged in the master branch: commit 8ca201f9a9a0a4514d2c7957d7a4f950a3addf0a Merge: bd1203b9ff576af6c8d5e9d26b4c5d202aef26ff 3a77106bb17d4b9a570ebc9a10be7f987dcd1114 Author: Stephane Glondu Date: Fri Jun 8 07:38:42 2012 +0200 Merge tag 'upstream/2.1' Upstream version 2.1 -- ocsigenserver 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] aac-tactics packaging annotated tag, debian/0.2.pl2-7, created. debian/0.2.pl2-7
The annotated tag, debian/0.2.pl2-7 has been created at b18aa12892bc8fd16f34649cab1cf51a419e31fa (tag) tagging 967ef647c79fa0409671b819a1ab5477419eb762 (commit) replaces debian/0.2.pl2-6 tagged by Stephane Glondu on Sat Jun 9 10:35:50 2012 +0200 - Shortlog Debian release 0.2.pl2-7 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.12 (GNU/Linux) iQIcBAABCgAGBQJP0wrmAAoJEHhT2k1JiBrTNecQAIdmHO/xcdzxRchnvISiwr9H KJdhcYMmCe0rSE+yTMIOpZGhUpRUq38HGOM7a5acBQoDlRxM026QcDrt65s9+VcJ jtYw7EcWUWEFqZu3xcAbmifPjuaV11MevypfqrxV8LlPCAH/6lXllJd3k+kWmI4Q BEzk8Hs/kE6k7pVcShjKgHYd61TjMW2Bp/O3hkwnzTqxMfMU1YjPXQEWM4n9BTrV 7NYfCvNJ28KS+C1MBo6baYYobt3EMsNTJ9U21ZT9+icdAiNgZwRz6dMT+IsFiE27 1t6eK7/293xhPpqXCUD0J8NHvseJ20eAx3QdZwK9/DQBAwb1TsHj+stzRel8cH1q rGduqOl4vyQVokFhW3tSw6EW9z8yf+r2d0LPwdQkvkdqZXaG/LUO7JWNP1HllWUu KA823T0DeY+uYyy3llsJiLT6yygPIud93JqXhjVu8XmYyGA9aIVPmRroVvI+hinD F2GMEW71w0OD1KO7aNQ3xcUr2ypyPki0NA/0SceKl45/Fym2mMyb3n4JzajSJ8Ts j925Fpz6L6dJgdNimzxf9phZj6PgZkjp+RgAMumj9E+VDMEcjAyJKs11DBcDnC3I irXxlcVk0phZfDI+zmInQ5bbhoLKNNp8S9MH+BpKCVkNvDOtqfsUolqTuHaNWiog Dq/DcKlWK2g97ErDdmgb =uFt4 -END PGP SIGNATURE- Stephane Glondu (1): Recompile with camlp5 6.06 (no changes) --- -- aac-tactics 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] aac-tactics packaging branch, master, updated. debian/0.2.pl2-6-1-g967ef64
The following commit has been merged in the master branch: commit 967ef647c79fa0409671b819a1ab5477419eb762 Author: Stephane Glondu Date: Sat Jun 9 10:31:25 2012 +0200 Recompile with camlp5 6.06 (no changes) diff --git a/debian/changelog b/debian/changelog index 7205d6e..23c78a2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +aac-tactics (0.2.pl2-7) unstable; urgency=low + + * Recompile with camlp5 6.06 (no changes) + + -- Stéphane Glondu Sat, 09 Jun 2012 10:31:21 +0200 + aac-tactics (0.2.pl2-6) unstable; urgency=medium * Recompile with camlp5 6.05 and coq 8.3pl4 (no changes) -- aac-tactics 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] ssreflect packaging annotated tag, upstream/1.3pl4, created. upstream/1.3pl4
The annotated tag, upstream/1.3pl4 has been created at 7393b05c96a790b2a9321f18d47d83fd6a93aca3 (tag) tagging 52f12a454e592fc9d8f67ea1faf6f37f79ebac3f (commit) replaces upstream/1.3pl3 tagged by Stephane Glondu on Sat Jun 9 09:25:40 2012 +0200 - Shortlog Upstream version 1.3pl4 Stephane Glondu (1): Imported Upstream version 1.3pl4 --- -- ssreflect 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] ssreflect packaging annotated tag, upstream/1.3pl3, created. upstream/1.3pl3
The annotated tag, upstream/1.3pl3 has been created at a10b5ca21a4d3c9c0c7b4aa7d5bf450c95ec4cd3 (tag) tagging 400091eb24f9af2cc03597bed996ca474735bff3 (commit) replaces upstream/1.3pl2 tagged by Stephane Glondu on Sat Jun 9 09:25:31 2012 +0200 - Shortlog Upstream version 1.3pl3 Stephane Glondu (1): Imported Upstream version 1.3pl3 --- -- ssreflect 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] ssreflect packaging annotated tag, debian/1.3pl4-1, created. debian/1.3pl4-1
The annotated tag, debian/1.3pl4-1 has been created at 73423b5679e345c73d3d265643527d707aaacf49 (tag) tagging bac31964e63fc9cfa178e150bb9c705c38e85683 (commit) replaces debian/1.3pl2-4 tagged by Stephane Glondu on Sat Jun 9 10:30:30 2012 +0200 - Shortlog Debian release 1.3pl4-1 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.12 (GNU/Linux) iQIcBAABCgAGBQJP0wmmAAoJEHhT2k1JiBrT1tkQAIME8PCCNHTWQEXNnqa4SstW QPd+RZ5WeAuyRYJ1l+DPBqZXk5ldeGOtiPgKjL0Dx4Zm6UYkmJ2sg4vfClFURjJk 4QFuf1mTghasvOokHB2MRzcNCz9vK4npIRqkz4sGI9txYFT2506LKMC/VvV8mJJj p2joGBwPZdeIB9RmqORVrlpc2vGy7p+5RVwgl7Q6F2id9As6aE7m7WFNP2q69wBp gOqMnderN3jJ2CnQL+4MPaRkVlxQPHRBLorUxuDdajrArBLfAgAwdZ7Zb3VgzFVN 4otolGXbP0itKKCZl3DJc9awBZ1auu/7bvhDqdmn31X0kz0R+yZ1CJHgvHFRjfhS GWdVdJOt4KA7mj9a9g8oxmVr1kINBHbF+oR2pelSTazIGTTl78upA8neyvJYu0Rf VeJp9dL9gebqkADHwCU+CN8ZoWoHca5/Bw/kM5TDpIOZ6IBmrMtTVvhNkXJrRFgM ddb8y1Eq22VaPXkUJawg1GUalIIdL/r+0ZYlmpwuA5PmIpI5N6S0bzJ5Y/mNJgWX +NkuK4rDdserTMCUaosq7hZsKcJgX2SchFXv5AsH38FUdULCjLAi7YiaVrN9uUAz 8IYZ3F8VzZhelYpkled+KX13CZMQ1kWQv5Ot/Bnw71xTl6tKLwLApWyWsd9fi1Ud K+EDqiPvuwsXW2TzH54d =mMrG -END PGP SIGNATURE- Stephane Glondu (8): Imported Upstream version 1.3pl3 Imported Upstream version 1.3pl4 Merge tag 'upstream/1.3pl4' New upstream release Refresh patches debian/copyright in format 1.0 Bump Standards-Version to 3.9.3 Update changelog and prepare upload to unstable --- -- ssreflect 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] ssreflect packaging branch, pristine-tar, updated. 135e4bda787e179474259e959ee53eb33c8d5771
The following commit has been merged in the pristine-tar branch: commit 135e4bda787e179474259e959ee53eb33c8d5771 Author: Stephane Glondu Date: Sat Jun 9 09:25:40 2012 +0200 pristine-tar data for ssreflect_1.3pl4.orig.tar.gz diff --git a/ssreflect_1.3pl4.orig.tar.gz.delta b/ssreflect_1.3pl4.orig.tar.gz.delta new file mode 100644 index 000..3b55813 Binary files /dev/null and b/ssreflect_1.3pl4.orig.tar.gz.delta differ diff --git a/ssreflect_1.3pl4.orig.tar.gz.id b/ssreflect_1.3pl4.orig.tar.gz.id new file mode 100644 index 000..c85956b --- /dev/null +++ b/ssreflect_1.3pl4.orig.tar.gz.id @@ -0,0 +1 @@ +bf741eecb3942d5fadf29bd864f8712aa7e8f1a2 -- ssreflect 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] ssreflect packaging branch, pristine-tar, updated. 135e4bda787e179474259e959ee53eb33c8d5771
The following commit has been merged in the pristine-tar branch: commit 40cda54d2e5623d94212a4822218bc67d13417e7 Author: Stephane Glondu Date: Sat Jun 9 09:25:31 2012 +0200 pristine-tar data for ssreflect_1.3pl3.orig.tar.gz diff --git a/ssreflect_1.3pl3.orig.tar.gz.delta b/ssreflect_1.3pl3.orig.tar.gz.delta new file mode 100644 index 000..6e64995 Binary files /dev/null and b/ssreflect_1.3pl3.orig.tar.gz.delta differ diff --git a/ssreflect_1.3pl3.orig.tar.gz.id b/ssreflect_1.3pl3.orig.tar.gz.id new file mode 100644 index 000..4271fc2 --- /dev/null +++ b/ssreflect_1.3pl3.orig.tar.gz.id @@ -0,0 +1 @@ +dd3896b9e49bd7e98d645ea5e304d57e9a5b249a -- ssreflect 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] ssreflect packaging branch, master, updated. debian/1.3pl2-4-8-gbac3196
The following commit has been merged in the master branch: commit 39a4052c230b5eb226f89dfd5f5075ba95d771eb Author: Stephane Glondu Date: Sat Jun 9 09:35:19 2012 +0200 Bump Standards-Version to 3.9.3 diff --git a/debian/control b/debian/control index 259a8ed..35cb570 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,7 @@ Build-Depends: camlp5 (>= 5.12-2~), ocaml-best-compilers, ocaml-nox (>= 3.11.1-3~) -Standards-Version: 3.9.2 +Standards-Version: 3.9.3 Section: math Homepage: http://www.msr-inria.inria.fr/Projects/math-components Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ssreflect.git -- ssreflect 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] ssreflect packaging branch, master, updated. debian/1.3pl2-4-8-gbac3196
The following commit has been merged in the master branch: commit bac31964e63fc9cfa178e150bb9c705c38e85683 Author: Stephane Glondu Date: Sat Jun 9 09:35:43 2012 +0200 Update changelog and prepare upload to unstable diff --git a/debian/changelog b/debian/changelog index 0fa0e37..225b10f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,10 @@ -ssreflect (1.3pl4-1) UNRELEASED; urgency=low +ssreflect (1.3pl4-1) unstable; urgency=low * New upstream release + * Put debian/copyright in format 1.0 + * Bump Standards-Version to 3.9.3 - -- Stéphane Glondu Sat, 09 Jun 2012 09:25:46 +0200 + -- Stéphane Glondu Sat, 09 Jun 2012 09:35:40 +0200 ssreflect (1.3pl2-4) unstable; urgency=medium -- ssreflect 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] ssreflect packaging branch, master, updated. debian/1.3pl2-4-8-gbac3196
The following commit has been merged in the master branch: commit a246a7c0350292f1aa11469ca5b21aea3e7a62e1 Author: Stephane Glondu Date: Sat Jun 9 09:27:30 2012 +0200 Refresh patches diff --git a/debian/patches/0001-Fix-tests-Make.patch b/debian/patches/0001-Fix-tests-Make.patch index 08c202f..4859bfa 100644 --- a/debian/patches/0001-Fix-tests-Make.patch +++ b/debian/patches/0001-Fix-tests-Make.patch @@ -5,7 +5,7 @@ Subject: Fix tests' Make Signed-off-by: Stephane Glondu --- test/Make |2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) + 1 file changed, 2 deletions(-) diff --git a/test/Make b/test/Make index 043d05c..8319f1d 100644 diff --git a/debian/patches/0002-Activated-option-Automatic-Coercions-Import.patch b/debian/patches/0002-Activated-option-Automatic-Coercions-Import.patch deleted file mode 100644 index 9213654..000 --- a/debian/patches/0002-Activated-option-Automatic-Coercions-Import.patch +++ /dev/null @@ -1,30 +0,0 @@ -From: Hugo Herbelin -Date: Fri, 9 Dec 2011 11:16:43 + -Subject: Activated option "Automatic Coercions Import" - -Activated option "Automatic Coercions Import" so that -ReleasedSsreflect compile after Coq v8.3 revision 14776 fixed -unexpected import of coercions in innermost modules of a chain of -nested module when only outermost module is imported. - -This patch fixes FTBFS with Coq 8.3pl3. - -Origin: https://gforge.inria.fr/scm/viewvc.php?view=rev&root=coq-contribs&revision=1697 -Signed-off-by: Stephane Glondu - theories/ssreflect.v |1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -diff --git a/theories/ssreflect.v b/theories/ssreflect.v -index 5b3c345..44981c6 100644 a/theories/ssreflect.v -+++ b/theories/ssreflect.v -@@ -3,6 +3,7 @@ - Require Import Bool. (* For bool_scope delimiter 'bool'. *) - - Declare ML Module "ssreflect". -+Global Set Automatic Coercions Import. - - (***) - (* This file is the Gallina part of the ssreflect plugin implementation. *) --- diff --git a/debian/patches/0003-Fix-compilation-with-camlp5-6.05-and-coq-8.3pl4.patch b/debian/patches/0003-Fix-compilation-with-camlp5-6.05-and-coq-8.3pl4.patch deleted file mode 100644 index 46eafd3..000 --- a/debian/patches/0003-Fix-compilation-with-camlp5-6.05-and-coq-8.3pl4.patch +++ /dev/null @@ -1,24 +0,0 @@ -From: Stephane Glondu -Date: Sun, 1 Apr 2012 16:43:08 +0200 -Subject: Fix compilation with camlp5 6.05 and coq 8.3pl4 - - src/ssreflect.ml |4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/ssreflect.ml b/src/ssreflect.ml -index 357cf57..e1b4215 100644 a/src/ssreflect.ml -+++ b/src/ssreflect.ml -@@ -2683,8 +2683,8 @@ let tclDO n tac = - try tac gl - with - | UserError (l, s) -> raise (UserError (l, prefix i ++ s)) --| Stdpp.Exc_located(loc, UserError (l, s)) -> --raise (Stdpp.Exc_located(loc, UserError (l, prefix i ++ s))) in -+| Compat.Exc_located(loc, UserError (l, s)) -> -+raise (Compat.Exc_located(loc, UserError (l, prefix i ++ s))) in - let rec loop i gl = - if i = n then tac_err_at i gl else - (tclTHEN (tac_err_at i) (loop (i + 1))) gl in --- diff --git a/debian/patches/series b/debian/patches/series index e8726c8..f38427a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1 @@ 0001-Fix-tests-Make.patch -0002-Activated-option-Automatic-Coercions-Import.patch -0003-Fix-compilation-with-camlp5-6.05-and-coq-8.3pl4.patch -- ssreflect 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] ssreflect packaging branch, master, updated. debian/1.3pl2-4-8-gbac3196
The following commit has been merged in the master branch: commit 1d633d7b15179a4aefb62a0e39be1a0486077d80 Author: Stephane Glondu Date: Sat Jun 9 09:25:50 2012 +0200 New upstream release diff --git a/debian/changelog b/debian/changelog index dae37fe..0fa0e37 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ssreflect (1.3pl4-1) UNRELEASED; urgency=low + + * New upstream release + + -- Stéphane Glondu Sat, 09 Jun 2012 09:25:46 +0200 + ssreflect (1.3pl2-4) unstable; urgency=medium * Fix compilation with camlp5 6.05 and coq 8.3pl4 -- ssreflect 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] ssreflect packaging branch, master, updated. debian/1.3pl2-4-8-gbac3196
The following commit has been merged in the master branch: commit a0e43503df84019660955044a56370de6c79c605 Merge: 65d50eb4b9e803c448279b4df746b312b0d1e03d 52f12a454e592fc9d8f67ea1faf6f37f79ebac3f Author: Stephane Glondu Date: Sat Jun 9 09:25:40 2012 +0200 Merge tag 'upstream/1.3pl4' Upstream version 1.3pl4 -- ssreflect 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
