[Pkg-ocaml-maint-commits] [SCM] coq packaging branch, experimental/master, updated. debian/8.4_beta+dfsg-4-8-g509d6d4
The following commit has been merged in the experimental/master branch: commit 676cc7a1dcf1634005c67f76f17390cc8fe44f00 Merge: ff61c7f8b0cbe6f0173720e08a63142a3146cc53 86535d84cc3cffeee1dcd8545343f234e7285530 Author: Stephane Glondu st...@glondu.net Date: Mon Jun 4 12:29:12 2012 +0200 Merge tag 'upstream/8.4_gamma0+really8.4beta2+dfsg' into experimental/master Upstream version 8.4~gamma0+really8.4beta2+dfsg -- coq 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] coq packaging branch, experimental/master, updated. debian/8.4_beta+dfsg-4-8-g509d6d4
The following commit has been merged in the experimental/master branch: commit 3a10a27a477f3df2f3f51a1011fef318ff4f5f58 Author: Stephane Glondu st...@glondu.net Date: Mon Jun 4 12:26:25 2012 +0200 New upstream beta release diff --git a/debian/changelog b/debian/changelog index 5f36510..698bd42 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +coq (8.4~gamma0+really8.4beta2+dfsg-1) UNRELEASED; urgency=low + + * New upstream beta release + + -- Stéphane Glondu glo...@debian.org Mon, 04 Jun 2012 12:26:18 +0200 + coq (8.4~beta+dfsg-4) experimental; urgency=low * Recompile with camlp5 6.05 (no changes) -- coq 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] coq packaging branch, experimental/master, updated. debian/8.4_beta+dfsg-4-8-g509d6d4
The following commit has been merged in the experimental/master branch: commit 4c3793181d62c1e4c883cea7547ee04ea423fbe4 Author: Stephane Glondu st...@glondu.net Date: Mon Jun 4 12:28:06 2012 +0200 Refresh patches diff --git a/debian/patches/0001-Add-distclean-back-to-test-suite-Makefile.patch b/debian/patches/0001-Add-distclean-back-to-test-suite-Makefile.patch deleted file mode 100644 index 80cd27a..000 --- a/debian/patches/0001-Add-distclean-back-to-test-suite-Makefile.patch +++ /dev/null @@ -1,23 +0,0 @@ -From: Stephane Glondu st...@glondu.net -Date: Thu, 12 Jan 2012 16:30:10 +0100 -Subject: Add distclean back to test-suite/Makefile - - test-suite/Makefile |3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -diff --git a/test-suite/Makefile b/test-suite/Makefile -index cd5886f..f3013c0 100644 a/test-suite/Makefile -+++ b/test-suite/Makefile -@@ -97,6 +97,9 @@ clean: - -name '*.stamp' -o -name '*.vo' -o -name '*.log' \ - \) -print0 | xargs -0 rm -f - -+distclean: clean -+ $(HIDE)find . -name '*.log' -print0 | xargs -0 rm -f -+ - ### - # Per-subsystem targets - ### --- diff --git a/debian/patches/0003-test-suite-success-Nsatz.v-comment-out-Ceva.patch b/debian/patches/0001-test-suite-success-Nsatz.v-comment-out-Ceva.patch similarity index 94% rename from debian/patches/0003-test-suite-success-Nsatz.v-comment-out-Ceva.patch rename to debian/patches/0001-test-suite-success-Nsatz.v-comment-out-Ceva.patch index 6969f7d..722ab00 100644 --- a/debian/patches/0003-test-suite-success-Nsatz.v-comment-out-Ceva.patch +++ b/debian/patches/0001-test-suite-success-Nsatz.v-comment-out-Ceva.patch @@ -5,7 +5,7 @@ Subject: test-suite/success/Nsatz.v: comment out Ceva This lemma uses too much memory for many buildds... --- test-suite/success/Nsatz.v |2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) + 1 file changed, 2 insertions(+) diff --git a/test-suite/success/Nsatz.v b/test-suite/success/Nsatz.v index d316e4a..d783b2a 100644 diff --git a/debian/patches/0002-coq_micromega.ml-fix-order-of-recursive-calls-to-rco.patch b/debian/patches/0002-coq_micromega.ml-fix-order-of-recursive-calls-to-rco.patch deleted file mode 100644 index 3307023..000 --- a/debian/patches/0002-coq_micromega.ml-fix-order-of-recursive-calls-to-rco.patch +++ /dev/null @@ -1,31 +0,0 @@ -From: Stephane Glondu st...@glondu.net -Date: Sat, 14 Jan 2012 01:24:30 +0100 -Subject: coq_micromega.ml: fix order of recursive calls to rconstant - -Some tests were failing on architectures without native code because -the evaluation order of arguments in a function call is not the same -on bytecode, leading to different behaviours for the psatzl tactic. - plugins/micromega/coq_micromega.ml |8 ++-- - 1 files changed, 6 insertions(+), 2 deletions(-) - -diff --git a/plugins/micromega/coq_micromega.ml b/plugins/micromega/coq_micromega.ml -index 1ad49bb..543ab1b 100644 a/plugins/micromega/coq_micromega.ml -+++ b/plugins/micromega/coq_micromega.ml -@@ -991,8 +991,12 @@ struct - else raise ParseError - | App(op,args) - - begin --try -- (assoc_const op rconst_assoc) (rconstant args.(0)) (rconstant args.(1)) -+try -+(* the evaluation order is important in the following *) -+let f = assoc_const op rconst_assoc in -+let a = rconstant args.(0) in -+let b = rconstant args.(1) in -+f a b - with - ParseError - - match op with --- diff --git a/debian/patches/series b/debian/patches/series index b0df385..53d51a1 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1 @@ -0001-Add-distclean-back-to-test-suite-Makefile.patch -0002-coq_micromega.ml-fix-order-of-recursive-calls-to-rco.patch -0003-test-suite-success-Nsatz.v-comment-out-Ceva.patch +0001-test-suite-success-Nsatz.v-comment-out-Ceva.patch -- coq 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] coq packaging branch, experimental/master, updated. debian/8.4_beta+dfsg-4-8-g509d6d4
The following commit has been merged in the experimental/master branch: commit c467035933a683a7b7ac214fc511604735f15e7f Author: Stephane Glondu st...@glondu.net Date: Mon Jun 4 14:18:02 2012 +0200 Update ABI diff --git a/debian/rules b/debian/rules index 4ed4e3a..d885ece 100755 --- a/debian/rules +++ b/debian/rules @@ -22,7 +22,7 @@ ADDPREF := COQINSTALLPREFIX=$(COQPREF) OLDROOT= PACKAGES := $(shell dh_listpackages) -COQ_VERSION := 8.4beta +COQ_VERSION := 8.4beta2 COQ_ABI := $(COQ_VERSION)+$(OCAML_ABI) CONFIGUREOPTS := --arch Linux --prefix /usr --mandir /usr/share/man \ -- coq 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] coq packaging branch, experimental/master, updated. debian/8.4_beta+dfsg-4-8-g509d6d4
The following commit has been merged in the experimental/master branch: commit 9ba360bc40800295fd8f706a4d561805c2e4c8db Author: Stephane Glondu st...@glondu.net Date: Mon Jun 4 15:03:22 2012 +0200 Dp plugin has been dropped diff --git a/debian/libcoq-ocaml.install.in b/debian/libcoq-ocaml.install.in index c650772..07fca0a 100644 --- a/debian/libcoq-ocaml.install.in +++ b/debian/libcoq-ocaml.install.in @@ -13,7 +13,6 @@ usr/lib/coq/plugins/syntax/ascii_syntax_plugin.cma usr/lib/coq/plugins/funind/recdef_plugin.cma usr/lib/coq/plugins/nsatz/nsatz_plugin.cma usr/lib/coq/plugins/xml/xml_plugin.cma -usr/lib/coq/plugins/dp/dp_plugin.cma usr/lib/coq/plugins/romega/romega_plugin.cma usr/lib/coq/plugins/firstorder/ground_plugin.cma usr/lib/coq/plugins/subtac/subtac_plugin.cma @@ -37,7 +36,6 @@ DYN: usr/lib/coq/plugins/syntax/ascii_syntax_plugin.cmxs DYN: usr/lib/coq/plugins/funind/recdef_plugin.cmxs DYN: usr/lib/coq/plugins/nsatz/nsatz_plugin.cmxs DYN: usr/lib/coq/plugins/xml/xml_plugin.cmxs -DYN: usr/lib/coq/plugins/dp/dp_plugin.cmxs DYN: usr/lib/coq/plugins/romega/romega_plugin.cmxs DYN: usr/lib/coq/plugins/firstorder/ground_plugin.cmxs DYN: usr/lib/coq/plugins/subtac/subtac_plugin.cmxs -- coq 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] coq packaging branch, experimental/master, updated. debian/8.4_beta+dfsg-4-8-g509d6d4
The following commit has been merged in the experimental/master branch: commit 509d6d4b58f50b86ca482d49fb6b2fee7fc3dfe9 Author: Stephane Glondu st...@glondu.net Date: Tue Jun 5 07:38:34 2012 +0200 Prepare upload to experimental diff --git a/debian/changelog b/debian/changelog index 698bd42..a67dc78 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -coq (8.4~gamma0+really8.4beta2+dfsg-1) UNRELEASED; urgency=low +coq (8.4~gamma0+really8.4beta2+dfsg-1) experimental; urgency=low * New upstream beta release - -- Stéphane Glondu glo...@debian.org Mon, 04 Jun 2012 12:26:18 +0200 + -- Stéphane Glondu glo...@debian.org Tue, 05 Jun 2012 07:38:25 +0200 coq (8.4~beta+dfsg-4) experimental; urgency=low -- coq 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
