From d57512a2fba70f63a107ecd7d8aacecdc063be42 Mon Sep 17 00:00:00 2001
From: Guillaume Melquiond <guillaume.melquiond@inria.fr>
Date: Tue, 13 Oct 2015 11:17:39 +0200
Subject: [PATCH] Update opam packages.

---
 ROADMAP            | 65 ++++++++++++++--------------------------------
 opam/why3-base/url |  4 +--
 opam/why3/opam     |  2 +-
 3 files changed, 23 insertions(+), 48 deletions(-)

diff --git a/ROADMAP b/ROADMAP
index 074a90a7d..d96439b9f 100644
--- a/ROADMAP
+++ b/ROADMAP
@@ -270,52 +270,27 @@ DONE * sauvegarde de la configuration : à quel endroit dans l'IDE ?
   https://gforge.inria.fr/tracker/admin/?group_id=2990&atid=10293&add_extrafield=1
 
 * prepare the OPAM package
- - update opam/url: url and checksum of why-0.86.tar.gz
+ - update opam/why3-base/url: url and checksum of why-0.86.tar.gz
    (use "md5sum distrib/why3-0.86.tar.gz")
- - update opam/descr if necessary
- - update opam/opam with correct dependencies and such
-
-* test the OPAM package
-
-  . with opam 1.2:
-    opam pin add why3 --kind=git <...>/why3/.git
-    (it runs "opam install why3")
-  . with opam < 1.2:
-
-    - first step: have a local copy of opam-repository if not done yet, e.g.:
-
-        git clone git@github.com:claudemarche/opam-repository.git
-        cd opam-repository/
-        git remote add opam https://github.com/ocaml/opam-repository.git
-
-      or, if you already have one, make sure it is up-to-date:
-
-        git fetch opam
-        git reset --hard opam/master
-        git push
-
-    - second step: copy why3 opam files into it :
-
-      cd packages/why3
-      cp -r <source why3>/opam why3.0.86
-
-    - second step:
-
-      opam repository add local <...>/opam-repository
-      opam install why3
-      (* test it, e.g.
-         cp example/quicksort.mlw ~/tmp
-         why3 ide ~/tmp/quicksort.mlw *)
-      opam remove why3
-      opam repository remove local
-
-
-* make a pull request on OPAM
-
-  git add why3.0.86
-  git commit -am "new package version why3 0.86"
-  git push
-  sur github: creer un pull request
+ - update opam/why3-base/descr and opam/why3/descr if necessary
+ - update opam/why3-base/opam with correct dependencies
+ - update opam/why3/opam with the dependency on why3-base
+ - test with "opam pin add why3 --kind=git .../why3/.git"
+   (it runs "opam install why3")
+
+* upload the OPAM package
+ - clone https://github.com/ocaml/opam-repository
+   git clone git@github.com:.../opam-repository.git
+   cd opam-repository/
+   git remote add opam https://github.com/ocaml/opam-repository.git
+ - reinitialize the repository if not fresh:
+   git fetch opam
+   git reset --hard opam/master
+   git push
+ - cd packages/why3-base; cp -r .../opam/why3-base why3-base.0.86
+ - cd packages/why3; cp -r .../opam/why3 why3.0.86
+ - commit and push
+ - make a pull request on github
 
 * inform Jerry James <loganjerry@gmail.com> so that he can produce the
   Fedora package
diff --git a/opam/why3-base/url b/opam/why3-base/url
index 2be71a73e..78d685ad4 100644
--- a/opam/why3-base/url
+++ b/opam/why3-base/url
@@ -1,2 +1,2 @@
-archive: "https://gforge.inria.fr/frs/download.php/file/34797/why3-0.86.1.tar.gz"
-checksum: "43ab4c224b025c2e3dd5526fa6bef181"
+archive: "https://gforge.inria.fr/frs/download.php/file/35214/why3-0.86.2.tar.gz"
+checksum: "ef0f4c133fc0da25a6b90adefddefa9a"
diff --git a/opam/why3/opam b/opam/why3/opam
index bfb222ab3..94a57fef4 100644
--- a/opam/why3/opam
+++ b/opam/why3/opam
@@ -19,7 +19,7 @@ tags: [
 ]
 available: [ ocaml-version >= "4.01.0" ]
 depends: [
-  "why3-base" { = "0.86" }
+  "why3-base" { = "0.86.2" }
   "lablgtk"
   "conf-gtksourceview"
   "zarith"
-- 
2.24.1