The following commit has been merged in the master branch: commit aabd29077d4c575745ca28b7e0ede93fd9334d3c Author: Mehdi Dogguy <me...@debian.org> Date: Tue May 15 13:25:54 2012 +0200
Mark Coq 8.3pl4 as compatible. diff --git a/debian/changelog b/debian/changelog index 7da615a..de377ba 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +why (2.30+dfsg-5) UNRELEASED; urgency=low + + * Update 0001-Why-2.29-do-support-Coq-8.3.patch + - Mark Coq 8.3pl4 as compatible. + + -- Mehdi Dogguy <me...@debian.org> Tue, 15 May 2012 13:24:28 +0200 + why (2.30+dfsg-4) unstable; urgency=high * Team upload diff --git a/debian/patches/0001-Why-2.29-do-support-Coq-8.3.patch b/debian/patches/0001-Why-2.29-do-support-Coq-8.3.patch index 62068cf..21e1f47 100644 --- a/debian/patches/0001-Why-2.29-do-support-Coq-8.3.patch +++ b/debian/patches/0001-Why-2.29-do-support-Coq-8.3.patch @@ -4,7 +4,7 @@ Subject: Why 2.29 do support Coq 8.3 --- tools/dpConfig.ml | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/dpConfig.ml b/tools/dpConfig.ml index e298bcf..66be764 100644 diff --git a/debian/patches/0002-Mark-alt-ergo-0.93-as-compatible.patch b/debian/patches/0002-Mark-alt-ergo-0.93-as-compatible.patch index bec9419..c8757e5 100644 --- a/debian/patches/0002-Mark-alt-ergo-0.93-as-compatible.patch +++ b/debian/patches/0002-Mark-alt-ergo-0.93-as-compatible.patch @@ -3,11 +3,11 @@ Date: Thu, 8 Dec 2011 16:42:30 +0100 Subject: Mark alt-ergo > 0.93 as compatible --- - tools/dpConfig.ml | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + tools/dpConfig.ml | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/dpConfig.ml b/tools/dpConfig.ml -index 66be764..ca83a38 100644 +index 66be764..935189f 100644 --- a/tools/dpConfig.ml +++ b/tools/dpConfig.ml @@ -83,8 +83,8 @@ let alt_ergo = @@ -21,4 +21,13 @@ index 66be764..ca83a38 100644 versions_old = ["0.8"; "0.9" ; "0.91"; "0.92.1"; "0.92.2" ]; command = "alt-ergo"; command_switches = ""; +@@ -221,7 +221,7 @@ let coq = + version = ""; + version_switch = "-v"; + version_regexp = "The Coq Proof Assistant, version \\([^ ]+\\)"; +- versions_ok = ["8.0"; "8.1";"8.2";"8.2pl1";"8.3pl2";"8.3pl3"]; ++ versions_ok = ["8.0"; "8.1";"8.2";"8.2pl1";"8.3pl2";"8.3pl3";"8.3pl4"]; + versions_old = ["7.4"]; + command = "coqc"; + command_switches = ""; -- diff --git a/debian/patches/0003-Fix-non-exhaustive-pattern-matching-in-jc_annot_infe.patch b/debian/patches/0003-Fix-non-exhaustive-pattern-matching-in-jc_annot_infe.patch index 54177f4..c328685 100644 --- a/debian/patches/0003-Fix-non-exhaustive-pattern-matching-in-jc_annot_infe.patch +++ b/debian/patches/0003-Fix-non-exhaustive-pattern-matching-in-jc_annot_infe.patch @@ -4,7 +4,7 @@ Subject: Fix non-exhaustive pattern-matching in jc_annot_inference.ml --- jc/jc_annot_inference.ml | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) + 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jc/jc_annot_inference.ml b/jc/jc_annot_inference.ml index f4c9791..d9dbbd7 100644 diff --git a/debian/patches/0004-Default-to-why2-for-jessie-atp.patch b/debian/patches/0004-Default-to-why2-for-jessie-atp.patch index 4021bcf..38c4e68 100644 --- a/debian/patches/0004-Default-to-why2-for-jessie-atp.patch +++ b/debian/patches/0004-Default-to-why2-for-jessie-atp.patch @@ -4,7 +4,7 @@ Subject: Default to why2 for -jessie-atp --- frama-c-plugin/jessie_options.ml | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frama-c-plugin/jessie_options.ml b/frama-c-plugin/jessie_options.ml index 8e57656..ce0e99c 100644 diff --git a/debian/patches/0005-Fix-Jc_annot_inference-use-old_reg_pos.patch b/debian/patches/0005-Fix-Jc_annot_inference-use-old_reg_pos.patch index 5d8c520..f8adabf 100644 --- a/debian/patches/0005-Fix-Jc_annot_inference-use-old_reg_pos.patch +++ b/debian/patches/0005-Fix-Jc_annot_inference-use-old_reg_pos.patch @@ -4,7 +4,7 @@ Subject: Fix Jc_annot_inference (use old_reg_pos) --- jc/jc_annot_inference.ml | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jc/jc_annot_inference.ml b/jc/jc_annot_inference.ml index d9dbbd7..0d3143e 100644 diff --git a/debian/patches/0007-Replace-caduceus-invocation-by-Frama-C.patch b/debian/patches/0007-Replace-caduceus-invocation-by-Frama-C.patch index 0e130b2..825bc6b 100644 --- a/debian/patches/0007-Replace-caduceus-invocation-by-Frama-C.patch +++ b/debian/patches/0007-Replace-caduceus-invocation-by-Frama-C.patch @@ -4,7 +4,7 @@ Subject: Replace caduceus invocation by Frama-C --- bin/gwhy.sh | 4 +--- - 1 files changed, 1 insertions(+), 3 deletions(-) + 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/bin/gwhy.sh b/bin/gwhy.sh index 35c487e..f7d7a6b 100755 -- why 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