From b74312090d8524783996f22d11bf694f2db4a4bc Mon Sep 17 00:00:00 2001
From: Simon Cruanes <simon.cruanes.2007@m4x.org>
Date: Thu, 15 Jan 2015 00:15:18 +0100
Subject: [PATCH] prepare for 0.5.5

---
 CHANGELOG.md       |  6 ------
 Makefile           | 12 ++++++++++++
 sequence.mli       |  2 +-
 sequenceLabels.mli |  2 +-
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ceb12d4..a51e448 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -90,10 +90,4 @@
 - `zip`, `unzip` and `zip_i` to convert between `t` and `t2`
 - added `scan` combinator
 
-<<<<<<< HEAD
-note: git log --no-merges --pretty=%s previous_version..HEAD
-||||||| merged common ancestors
-note: git log --no-merges previous_version..HEAD --pretty=%s
-=======
 note: `git log --no-merges previous_version..HEAD --pretty=%s`
->>>>>>> master
diff --git a/Makefile b/Makefile
index 8abcac6..f09d544 100644
--- a/Makefile
+++ b/Makefile
@@ -69,6 +69,18 @@ update_next_tag:
 NAME_VERSION := sequence.$(VERSION)
 URL := https://github.com/c-cube/sequence/archive/$(VERSION).tar.gz
 
+release:
+	git tag -a $(VERSION) -m "Version $(VERSION)."
+	git push origin $(VERSION)
+	opam publish prepare $(NAME_VERSION) $(URL)
+	cp descr $(NAME_VERSION)
+	echo "submit?"
+	@read
+	opam publish submit $(NAME_VERSION)
+
+NAME_VERSION := sequence.$(VERSION)
+URL := https://github.com/c-cube/sequence/archive/$(VERSION).tar.gz
+
 release:
 	git tag -a $(VERSION) -m "Version $(VERSION)."
 	git push origin $(VERSION)
diff --git a/sequence.mli b/sequence.mli
index 7957890..92ffb1d 100644
--- a/sequence.mli
+++ b/sequence.mli
@@ -275,7 +275,7 @@ val take_while : ('a -> bool) -> 'a t -> 'a t
 val fold_while : ('a -> 'b -> 'a * [`Stop | `Continue]) -> 'a -> 'b t -> 'a
   (** Folds over elements of the sequence, stopping early if the accumulator
       returns [('a, `Stop)]
-      @since NEXT_RELEASE *)
+      @since  *)
 
 val drop : int -> 'a t -> 'a t
   (** Drop the [n] first elements of the sequence. Lazy. *)
diff --git a/sequenceLabels.mli b/sequenceLabels.mli
index a4cab02..84a7cfc 100644
--- a/sequenceLabels.mli
+++ b/sequenceLabels.mli
@@ -27,7 +27,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 Version of {!Sequence} with labels
 
-@since NEXT_RELEASE *)
+@since  *)
 
 type +'a t = ('a -> unit) -> unit
   (** A sequence of values of type ['a]. If you give it a function ['a -> unit]