New upstream release

5 files changed, 5 insertions, 125 deletions

diff --git a/debian/changelog b/debian/changelog
index 17ff3b14..9e1c6aa0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-coq (8.2.pl1+dfsg-7) UNRELEASED; urgency=low
+coq (8.2.pl2+dfsg-1) UNRELEASED; urgency=low
 
-  * Add 0003-Fix-build-with-OCaml-3.12.patch (Closes: #585452)
+  * New upstream release (Closes: #585452)
+    - remove 0001-Update-for-why-2.19.patch (applied upstream)
 
- -- Stéphane Glondu <glondu@debian.org>  Mon, 28 Jun 2010 15:32:29 +0200
+ -- Stéphane Glondu <glondu@debian.org>  Thu, 01 Jul 2010 17:25:52 +0200
 
 coq (8.2.pl1+dfsg-6) unstable; urgency=low
 
diff --git a/debian/patches/0002-Disable-micromega-tests.patch b/debian/patches/0001-Disable-micromega-tests.patch
index 8857a874..8857a874 100644
--- a/debian/patches/0002-Disable-micromega-tests.patch
+++ b/debian/patches/0001-Disable-micromega-tests.patch
diff --git a/debian/patches/0001-Update-for-why-2.19.patch b/debian/patches/0001-Update-for-why-2.19.patch
deleted file mode 100644
index fc6ab68f..00000000
--- a/debian/patches/0001-Update-for-why-2.19.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From: Stephane Glondu <steph@glondu.net>
-Date: Sat, 29 Aug 2009 16:35:56 +0200
-Subject: [PATCH] Update for why 2.19
-
-Patch taken from upstream SVN.
-
-Signed-off-by: Stephane Glondu <steph@glondu.net>
----
- contrib/dp/dp.ml |   18 +++++++++---------
- 1 files changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/contrib/dp/dp.ml b/contrib/dp/dp.ml
-index 79ffaf3..d880384 100644
---- a/contrib/dp/dp.ml
-+++ b/contrib/dp/dp.ml
-@@ -701,7 +701,7 @@ let file_contents f =
- let timeout_sys_command cmd =
-   if !debug then Format.eprintf "command line: %s@." cmd;
-   let out = Filename.temp_file "out" "" in
--  let cmd = sprintf "cpulimit %d %s > %s 2>&1" !timeout cmd out in
-+  let cmd = sprintf "why-cpulimit %d %s > %s 2>&1" !timeout cmd out in
-   let ret = Sys.command cmd in
-   if !debug then 
-     Format.eprintf "Output file %s:@.%s@." out (file_contents out);
-@@ -731,12 +731,12 @@ let why_files f = String.concat " " (!prelude_files @ [f])
- 
- let call_simplify fwhy =
-   let cmd = 
--    sprintf "why --no-arrays --simplify --encoding sstrat %s" (why_files fwhy) 
-+    sprintf "why --simplify %s" (why_files fwhy)
-   in
-   if Sys.command cmd <> 0 then error ("call to " ^ cmd ^ " failed");
-   let fsx = Filename.chop_suffix fwhy ".why" ^ "_why.sx" in
-   let cmd = 
--    sprintf "timeout %d Simplify %s > out 2>&1 && grep -q -w Valid out" 
-+    sprintf "why-cpulimit %d Simplify %s > out 2>&1 && grep -q -w Valid out"
-       !timeout fsx
-   in
-   let out = Sys.command cmd in
-@@ -747,7 +747,7 @@ let call_simplify fwhy =
-   r
- 
- let call_ergo fwhy =
--  let cmd = sprintf "why --no-arrays --why %s" (why_files fwhy) in
-+  let cmd = sprintf "why --alt-ergo %s" (why_files fwhy) in
-   if Sys.command cmd <> 0 then error ("call to " ^ cmd ^ " failed");
-   let fwhy = Filename.chop_suffix fwhy ".why" ^ "_why.why" in
-   let ftrace = Filename.temp_file "ergo_trace" "" in
-@@ -797,12 +797,12 @@ let call_zenon fwhy =
- 
- let call_yices fwhy =
-   let cmd = 
--    sprintf "why --no-arrays -smtlib --encoding sstrat %s" (why_files fwhy)
-+    sprintf "why -smtlib --encoding sstrat %s" (why_files fwhy)
-   in
-   if Sys.command cmd <> 0 then error ("call to " ^ cmd ^ " failed");
-   let fsmt = Filename.chop_suffix fwhy ".why" ^ "_why.smt" in
-   let cmd = 
--    sprintf "timeout %d yices -pc 0 -smt < %s > out 2>&1 && grep -q -w unsat out" 
-+    sprintf "why-cpulimit %d yices -pc 0 -smt %s > out 2>&1 && grep -q -w unsat out"
-       !timeout fsmt
-   in
-   let out = Sys.command cmd in
-@@ -814,7 +814,7 @@ let call_yices fwhy =
- 
- let call_cvcl fwhy =
-   let cmd = 
--    sprintf "why --no-arrays --cvcl --encoding sstrat %s" (why_files fwhy)
-+    sprintf "why --cvcl --encoding sstrat %s" (why_files fwhy)
-   in
-   if Sys.command cmd <> 0 then error ("call to " ^ cmd ^ " failed");
-   let fcvc = Filename.chop_suffix fwhy ".why" ^ "_why.cvc" in
-@@ -831,7 +831,7 @@ let call_cvcl fwhy =
- 
- let call_harvey fwhy =
-   let cmd = 
--    sprintf "why --no-arrays --harvey --encoding strat %s" (why_files fwhy)
-+    sprintf "why --harvey --encoding strat %s" (why_files fwhy)
-   in
-   if Sys.command cmd <> 0 then error ("call to " ^ cmd ^ " failed");
-   let frv = Filename.chop_suffix fwhy ".why" ^ "_why.rv" in
-@@ -856,7 +856,7 @@ let call_harvey fwhy =
-   r
- 
- let call_gwhy fwhy =
--  let cmd = sprintf "gwhy --no-arrays  %s" (why_files fwhy) in
-+  let cmd = sprintf "gwhy %s" (why_files fwhy) in
-   if Sys.command cmd <> 0 then ignore (Sys.command (sprintf "emacs %s" fwhy));
-   NoAnswer
- 
--- 
diff --git a/debian/patches/0003-Fix-build-with-OCaml-3.12.patch b/debian/patches/0003-Fix-build-with-OCaml-3.12.patch
deleted file mode 100644
index dbfdaaef..00000000
--- a/debian/patches/0003-Fix-build-with-OCaml-3.12.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From: Stephane Glondu <steph@glondu.net>
-Date: Wed, 9 Jun 2010 23:55:56 +0200
-Subject: [PATCH] Fix build with OCaml 3.12
-
-Applied-Upstream: https://gforge.inria.fr/scm/viewvc.php?view=rev&root=coq&revision=13105
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=585452
-Signed-off-by: Stephane Glondu <steph@glondu.net>
----
- ide/undo_lablgtk_ge212.mli |    3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git a/ide/undo_lablgtk_ge212.mli b/ide/undo_lablgtk_ge212.mli
-index 916a06e..4488b5e 100644
---- a/ide/undo_lablgtk_ge212.mli
-+++ b/ide/undo_lablgtk_ge212.mli
-@@ -10,9 +10,10 @@
- 
- (* An undoable view class *)
- 
--class undoable_view : [> Gtk.text_view] Gtk.obj ->
-+class undoable_view : ([> Gtk.text_view] as 'a) Gtk.obj ->
- object
-   inherit GText.view
-+  val obj : 'a Gtk.obj
-   method undo : bool
-   method redo : bool
-   method clear_undo : unit
--- 
diff --git a/debian/patches/series b/debian/patches/series
index ab43a984..d07bd020 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
-0001-Update-for-why-2.19.patch
-0002-Disable-micromega-tests.patch
-0003-Fix-build-with-OCaml-3.12.patch
+0001-Disable-micromega-tests.patch