From d3a501566b3c673bc67c478b1be980d4a705c50e Mon Sep 17 00:00:00 2001
From: Marek Kubica <marek@xivilization.net>
Date: Tue, 11 Dec 2018 16:41:21 +0100
Subject: [PATCH 1/2] Update opam file to OPAM 2 format

---
 yojson.opam | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/yojson.opam b/yojson.opam
index f0c3dbe6..ef332518 100644
--- a/yojson.opam
+++ b/yojson.opam
@@ -1,22 +1,32 @@
-opam-version: "1.2"
+opam-version: "2.0"
 maintainer: "martin@mjambon.com"
 authors: ["Martin Jambon"]
-homepage: "https://mjambon.github.io/mjambon2016/yojson-doc/Yojson.html"
-bug-reports: "https://github.com/mjambon/yojson/issues"
-dev-repo: "https://github.com/mjambon/yojson.git"
-available: [ ocaml-version >= "4.02.3"]
+homepage: "https://github.com/ocaml-community/yojson"
+bug-reports: "https://github.com/ocaml-community/yojson/issues"
+dev-repo: "git+https://github.com/ocaml-community/yojson.git"
+doc: "https://ocaml-community.github.io/yojson/"
 build: [
   ["jbuilder" "subst" "-n" name] {pinned}
   ["jbuilder" "build" "-p" name "-j" jobs]
 ]
-
-build-test: [
-  ["jbuilder" "runtest" "-p" name]
-]
-
+run-test: ["jbuilder" "runtest" "-p" name]
 depends: [
+  "ocaml" {>= "4.02.3"}
   "jbuilder" {build}
   "cppo" {build}
   "easy-format"
   "biniou" {>= "1.2.0"}
 ]
+synopsis:
+  "Yojson is an optimized parsing and printing library for the JSON format"
+description: """
+Yojson is an optimized parsing and printing library for the JSON format.
+
+It addresses a few shortcomings of json-wheel including 2x speedup,
+polymorphic variants and optional syntax for tuples and variants.
+
+ydump is a pretty-printing command-line program provided with the
+yojson package.
+
+The program atdgen can be used to derive OCaml-JSON serializers and
+deserializers from type definitions."""

From 8853750d2f745b826801347ebdbd38ce635b94e9 Mon Sep 17 00:00:00 2001
From: Marek Kubica <marek@xivilization.net>
Date: Wed, 12 Dec 2018 08:39:14 +0100
Subject: [PATCH 2/2] Ignore opam2 local switches and make ignore rules more
 strict

---
 .gitignore | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3fce4793..4a19da35 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
-_build
+/_build/
+/_opam/
 .merlin
-*.install
+/*.install