From 5f3eb3134d02a2cec801aea69ef9b58500ff0046 Mon Sep 17 00:00:00 2001
From: Anil Madhavapeddy <anil@recoil.org>
Date: Mon, 14 Jan 2019 18:53:10 +0000
Subject: [PATCH] update opam metadata to 2.0 format

---
 CHANGES.md |  1 +
 utop.descr |  6 ------
 utop.opam  | 33 ++++++++++++++++++++-------------
 3 files changed, 21 insertions(+), 19 deletions(-)
 delete mode 100644 utop.descr

diff --git a/CHANGES.md b/CHANGES.md
index 901df90d..7f68b55d 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -2,6 +2,7 @@ dev
 ---
 
 * Port build to dune from jbuilder (@avsm)
+* Upgrade local opam metadata to opam 2.0 format (@avsm)
 
 2.2.0 (2018-07-15)
 ------------------
diff --git a/utop.descr b/utop.descr
deleted file mode 100644
index 54f6a148..00000000
--- a/utop.descr
+++ /dev/null
@@ -1,6 +0,0 @@
-Universal toplevel for OCaml
-
-utop is an improved toplevel (i.e., Read-Eval-Print Loop or REPL) for
-OCaml.  It can run in a terminal or in Emacs. It supports line
-edition, history, real-time and context sensitive completion, colors,
-and more.  It integrates with the Tuareg mode in Emacs.
diff --git a/utop.opam b/utop.opam
index 66716cc8..8441f162 100644
--- a/utop.opam
+++ b/utop.opam
@@ -1,25 +1,32 @@
-opam-version: "1.2"
+opam-version: "2.0"
 maintainer: "jeremie@dimino.org"
-authors: ["Jérémie Dimino"]
+authors: "Jérémie Dimino"
 license: "BSD3"
 homepage: "https://github.com/ocaml-community/utop"
 bug-reports: "https://github.com/ocaml-community/utop/issues"
-dev-repo: "https://github.com/ocaml-community/utop.git"
-build: [
-  ["dune" "subst"] {pinned}
-  ["dune" "build" "-p" name "-j" jobs]
-]
 depends: [
+  "ocaml" {>= "4.03.0"}
   "base-unix"
   "base-threads"
-  "ocamlfind"    {>= "1.7.2"}
-  "lambda-term"  {>= "1.13"}
+  "ocamlfind" {>= "1.7.2"}
+  "lambda-term" {>= "1.13"}
   "lwt"
   "lwt_react"
   "camomile"
-  "react"        {>= "1.0.0"}
-  "cppo"         {build & >= "1.1.2"}
+  "react" {>= "1.0.0"}
+  "cppo" {build & >= "1.1.2"}
   "dune" {build}
 ]
-build-test: [["dune" "runtest" "-p" name "-j" jobs]]
-available: [ocaml-version >= "4.03.0"]
+build: [
+  ["dune" "subst"] {pinned}
+  ["dune" "build" "-p" name "-j" jobs]
+  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
+]
+dev-repo: "git+https://github.com/ocaml-community/utop.git"
+synopsis: "Universal toplevel for OCaml"
+description: """
+utop is an improved toplevel (i.e., Read-Eval-Print Loop or REPL) for
+OCaml.  It can run in a terminal or in Emacs. It supports line
+edition, history, real-time and context sensitive completion, colors,
+and more.  It integrates with the Tuareg mode in Emacs.
+"""