From eefbeeb6a8be29e5b9b326aeef81ad2bdaa658e0 Mon Sep 17 00:00:00 2001
From: Anton Bachin <antonbachin@yahoo.com>
Date: Tue, 8 Nov 2016 11:29:56 -0600
Subject: [PATCH] Bump version to 1.2.0

---
 README.md              |  4 ++--
 doc/CHANGES            | 20 ++++++++++++++++++++
 doc/RELEASING.md       |  4 +++-
 opam/opam              |  7 +++++--
 src/META               | 10 +++++-----
 src/library/version.ml |  2 +-
 6 files changed, 36 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index db9394c7..c5c9613e 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Bisect_ppx &nbsp; [![version 1.1.0][version]][releases] [![Travis status][travis-img]][travis] [![Coverage][coveralls-img]][coveralls]
+# Bisect_ppx &nbsp; [![version 1.2.0][version]][releases] [![Travis status][travis-img]][travis] [![Coverage][coveralls-img]][coveralls]
 
 [Bisect_ppx][self] is a code coverage tool for OCaml. It helps you test
 thoroughly by showing which parts of your code are **not** tested. You can also
@@ -14,7 +14,7 @@ generates for itself. You may also want to see
 
 [self]:          https://github.com/aantron/bisect_ppx
 [releases]:      https://github.com/aantron/bisect_ppx/releases
-[version]:       https://img.shields.io/badge/version-1.1.0-blue.svg
+[version]:       https://img.shields.io/badge/version-1.2.0-blue.svg
 [self-coverage]: http://aantron.github.io/bisect_ppx/coverage/
 [travis]:        https://travis-ci.org/aantron/bisect_ppx/branches
 [travis-img]:    https://img.shields.io/travis/aantron/bisect_ppx/master.svg
diff --git a/doc/CHANGES b/doc/CHANGES
index fb38756d..b71cfa78 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,3 +1,23 @@
+Version 1.2.0 (2016-11-08):
+---------------------------
+  Additions
+
+  - Compatibility with OCaml 4.04 (#113).
+  - Install .mli files (#98, prompted Christian Lindig).
+
+  Removals
+
+  This release removes several features which appear to get little or no use.
+
+  - Rename package bisect_ppx.plugin to bisect_ppx.ocamlbuild; bisect_ppx.plugin
+    is still available as a deprecated name (#93).
+  - Remove -combine-expr option from the reporter (#105, #106).
+  - Remove EMMA, XML, and "bisect" output formats (#105, #106).
+  - Remove obsolete -no-navbar and -no-folding options from HTML output (#106).
+  - Remove point kinds (#101).
+  - Eliminate .cmp files; this makes the -I option unnecessary for output
+    formats besides HTML (#102, #108).
+
 Version 1.1.0 (2016-04-02):
 ---------------------------
   - Port to 4.03.
diff --git a/doc/RELEASING.md b/doc/RELEASING.md
index 53588747..47c42112 100644
--- a/doc/RELEASING.md
+++ b/doc/RELEASING.md
@@ -8,7 +8,9 @@
 - `grep` for the previous version number. Replace occurences with the new
   version number. This should include `META`, `opam`, `version.ml`, and
   `README.md`,
-- Tag (`tag -a`) the release and push the tag.
+- Tag (`tag -a`) the release. Include the changelog in the tag message, so it
+  can be viewed with `git tag -n99`.
+- Push the tag.
 - Submit the release to OPAM.
 - After release is accepted in OPAM, make a GitHub release for it as well. List
   the changes there. The reason this is done after OPAM is that the OPAM release
diff --git a/opam/opam b/opam/opam
index 52b6d8e0..64b0efa5 100644
--- a/opam/opam
+++ b/opam/opam
@@ -1,7 +1,10 @@
 name: "bisect_ppx"
-version: "1.1.0"
+version: "1.2.0"
 opam-version: "1.2"
-maintainer: "Anton Bachin <antonbachin@yahoo.com>"
+maintainer: [
+  "Anton Bachin <antonbachin@yahoo.com>"
+  "Leonid Rozenberg <leonidr@gmail.com>"
+]
 authors: [
   "Xavier Clerc <bisect@x9c.fr>"
   "Leonid Rozenberg <leonidr@gmail.com>"
diff --git a/src/META b/src/META
index 1f593d05..5eb6c061 100644
--- a/src/META
+++ b/src/META
@@ -1,30 +1,30 @@
-version="1.1.0"
+version="1.2.0"
 description="Code coverage for OCaml"
 requires="bisect_ppx.runtime"
 ppx="./bisect_ppx"
 
 package "runtime" (
-  version="1.1.0"
+  version="1.2.0"
   description="Code coverage for OCaml"
   archive(byte)="bisect.cma"
   archive(native)="bisect.cmxa"
 )
 
 package "fast" (
-  version="1.1.0"
+  version="1.2.0"
   description="Code coverage for OCaml (deprecated package)"
   requires="bisect_ppx"
 )
 
 package "ocamlbuild" (
-  version="1.1.0"
+  version="1.2.0"
   description="Bisect_ppx Ocamlbuild plugin"
   archive(byte)="bisect_ppx_plugin.cma"
   archive(native)="bisect_ppx_plugin.cmxa"
 )
 
 package "plugin" (
-  version="1.1.0"
+  version="1.2.0"
   description="Bisect_ppx Ocamlbuild plugin (deprecated package)"
   requires="bisect_ppx.ocamlbuild"
 )
diff --git a/src/library/version.ml b/src/library/version.ml
index 24d232ae..c0232b54 100644
--- a/src/library/version.ml
+++ b/src/library/version.ml
@@ -1 +1 @@
-let value = "1.1.0"
+let value = "1.2.0"