From c6ae283b7e95a35f0fcd276e082c7e4a848b89d6 Mon Sep 17 00:00:00 2001
From: Louis Gesbert <louis.gesbert@ocamlpro.com>
Date: Mon, 12 Nov 2018 15:05:58 +0100
Subject: [PATCH] Bump version to 1.1.7, update opam files to 2.0 format

---
 CHANGES.md       |  7 +++++++
 ocp-browser.opam | 15 ++++++++++-----
 ocp-index.opam   | 18 ++++++++++++++----
 version          |  2 +-
 4 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index e239f91..be25fed 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,10 @@
+### 1.1.7
+* Support for OCaml 4.07
+* Drop support for OCaml < 4.02
+* Emacs mode: fix a few issues (capitalisation of filenames)
+* ocp-browser: sort output, add hints and show doc by default, skip `Foo__bar`
+  when `Foo` exists
+
 ### 1.1.6
 * Fixed escaping issue in tuareg doc mode
 * Emacs mode: support eldoc
diff --git a/ocp-browser.opam b/ocp-browser.opam
index af81d57..448c189 100644
--- a/ocp-browser.opam
+++ b/ocp-browser.opam
@@ -1,6 +1,11 @@
-opam-version: "1.2"
-version: "1.1.6"
+opam-version: "2.0"
+version: "1.1.7"
 maintainer: "louis.gesbert@ocamlpro.com"
+synopsis: "Console browser for the documentation of installed OCaml libraries"
+description: """
+ocp-browser is a ncurses-like interface that allows to easily browse the
+interfaces and documentation of all installed OCaml modules.
+"""
 authors: [
   "Louis Gesbert"
   "Gabriel Radanne"
@@ -9,13 +14,13 @@ homepage: "http://www.typerex.org/ocp-index.html"
 bug-reports: "https://github.com/OCamlPro/ocp-index/issues"
 license: "LGPL-2.1 with OCaml linking exception"
 tags: [ "org:ocamlpro" "org:typerex" ]
-dev-repo: "https://github.com/OCamlPro/ocp-index.git"
+dev-repo: "git+https://github.com/OCamlPro/ocp-index.git"
 build: ["jbuilder" "build" "-p" name "-j" jobs]
 depends: [
+  "ocaml" {>= "4.02.0"}
   "ocp-pp" {build}
   "jbuilder" {build}
-  "ocp-index" {= "1.1.6"}
+  "ocp-index" {= version}
   "cmdliner"
   "lambda-term"
 ]
-available: [ocaml-version >= "4.02.0"]
diff --git a/ocp-index.opam b/ocp-index.opam
index d348438..0324b7c 100644
--- a/ocp-index.opam
+++ b/ocp-index.opam
@@ -1,6 +1,16 @@
-opam-version: "1.2"
-version: "1.1.6"
+opam-version: "2.0"
+version: "1.1.7"
 maintainer: "louis.gesbert@ocamlpro.com"
+synopsis:
+  "Lightweight completion and documentation browsing for OCaml libraries"
+description: """
+This package includes
+* The `ocp-index` library and command-line tool
+* `ocp-grep`, a tool that finds uses of a given (qualified) identifier in a source tree
+* bindings for emacs and vim (sublime text also [available](https://github.com/whitequark/sublime-ocp-index/))
+
+To automatically configure your editors, install this with package `user-setup`.
+"""
 authors: [
   "Louis Gesbert"
   "Gabriel Radanne"
@@ -9,16 +19,16 @@ homepage: "http://www.typerex.org/ocp-index.html"
 bug-reports: "https://github.com/OCamlPro/ocp-index/issues"
 license: "LGPL-2.1 with OCaml linking exception"
 tags: [ "org:ocamlpro" "org:typerex" ]
-dev-repo: "https://github.com/OCamlPro/ocp-index.git"
+dev-repo: "git+https://github.com/OCamlPro/ocp-index.git"
 build: ["jbuilder" "build" "-p" name "-j" jobs]
 depends: [
+  "ocaml" {>= "4.02.0"}
   "ocp-pp" {build}
   "jbuilder" {build}
   "ocp-indent" {>= "1.4.2"}
   "re" {>= "1.7.2"}
   "cmdliner"
 ]
-available: [ocaml-version >= "4.02.0" ]
 post-messages:
   "This package requires additional configuration for use in editors. Either install package 'user-setup', or manually:
 
diff --git a/version b/version
index 0664a8f..2bf1ca5 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-1.1.6
+1.1.7