8.5

3 files changed, 34 insertions, 4 deletions

diff --git a/debian/patches/0001-test-suite-success-Nsatz.v-comment-out-Ceva.patch b/debian/patches/0001-test-suite-success-Nsatz.v-comment-out-Ceva.patch
index 198188e7..2cf6af5c 100644
--- a/debian/patches/0001-test-suite-success-Nsatz.v-comment-out-Ceva.patch
+++ b/debian/patches/0001-test-suite-success-Nsatz.v-comment-out-Ceva.patch
@@ -8,10 +8,10 @@ This lemma uses too much memory for many buildds...
  1 file changed, 2 insertions(+)
 
 diff --git a/test-suite/success/Nsatz.v b/test-suite/success/Nsatz.v
-index d316e4a..d783b2a 100644
+index e38affd..040169e 100644
 --- a/test-suite/success/Nsatz.v
 +++ b/test-suite/success/Nsatz.v
-@@ -461,6 +461,7 @@ idtac "chords".
+@@ -462,6 +462,7 @@ idtac "chords".
  (*Finished transaction in 4. secs (3.959398u,0.s)*)
  Qed.
  
@@ -19,7 +19,7 @@ index d316e4a..d783b2a 100644
  Lemma Ceva: forall A B C D E F M:point,
    collinear M A D -> collinear M B E -> collinear M C F ->
    collinear B C D -> collinear E A C -> collinear F A B ->
-@@ -472,6 +473,7 @@ idtac "Ceva".
+@@ -473,6 +474,7 @@ idtac "Ceva".
  Time nsatz.
  (*Finished transaction in 105. secs (104.121171u,0.474928s)*)
  Qed.
@@ -27,4 +27,3 @@ index d316e4a..d783b2a 100644
  
  Lemma bissectrices: forall A B C M:point,
    equaltangente C A M M A B ->
--- 
diff --git a/debian/patches/0002-Remove-test-4366-too-picky-on-the-timeout.patch b/debian/patches/0002-Remove-test-4366-too-picky-on-the-timeout.patch
new file mode 100644
index 00000000..e71306ce
--- /dev/null
+++ b/debian/patches/0002-Remove-test-4366-too-picky-on-the-timeout.patch
@@ -0,0 +1,30 @@
+From: Enrico Tassi <gareuselesinge@debian.org>
+Date: Tue, 26 Jan 2016 16:58:25 +0100
+Subject: Remove test 4366 (too picky on the timeout)
+
+---
+ test-suite/bugs/closed/4366.v | 15 ---------------
+ 1 file changed, 15 deletions(-)
+ delete mode 100644 test-suite/bugs/closed/4366.v
+
+diff --git a/test-suite/bugs/closed/4366.v b/test-suite/bugs/closed/4366.v
+deleted file mode 100644
+index 6a5e9a4..0000000
+--- a/test-suite/bugs/closed/4366.v
++++ /dev/null
+@@ -1,15 +0,0 @@
+-Fixpoint stupid (n : nat) : unit :=
+-match n with
+-| 0 => tt
+-| S n =>
+-  let () := stupid n in
+-  let () := stupid n in
+-  tt
+-end.
+-
+-Goal True.
+-Proof.
+-pose (v := stupid 24).
+-Timeout 2 vm_compute in v.
+-exact I.
+-Qed.
diff --git a/debian/patches/series b/debian/patches/series
index 53d51a16..75215115 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-test-suite-success-Nsatz.v-comment-out-Ceva.patch
+0002-Remove-test-4366-too-picky-on-the-timeout.patch