From dd2420bcdec490af99974f05c0cfdf3ae5316d4e Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 12 May 2017 08:32:47 +0530
Subject: [PATCH] version 2.85.0

---
 Changelog.yaml           | 41 ++++++++++++++++++++++++++++++++++++++++
 src/calibre/constants.py |  2 +-
 2 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/Changelog.yaml b/Changelog.yaml
index 0ee5f9bbf4..ebd0cb56cb 100644
--- a/Changelog.yaml
+++ b/Changelog.yaml
@@ -20,6 +20,47 @@
 #   new recipes:
 #     - title:
 
+- version: 2.85.0
+  date: 2017-05-12
+
+  new features:
+    - title: "Book details panel: Allow right click to search the internet for the current book"
+
+    - title: "Book details panel: Allow right clicking on an author name to search the internet for works by that author"
+
+    - title: "Book details panel: Clicking an author name now searches Goodreads by default instead of Wikipedia. Can be changed in Preferences->Look & feel->Book details"
+
+    - title: "Kobo driver: Add support for the Kobo Auro H2O Edition 2"
+
+  bug fixes:
+    - title: "PDF Output: Fix a regression in the previous release that broke conversion to PDF for some files."
+      tickets: [1689192]
+
+    - title: "DOCX Output: Fix lengths specified in percentage of page size not being converted correctly."
+      tickets: [1688690]
+
+    - title: "DOCX Output: Fix some hyperlinks not working in word because the bookmark name is longer than forty characters."
+      tickets: [1688690]
+
+    - title: "DOCX Output: Prevent images from being larger than the page size."
+      tickets: [1688690]
+
+    - title: "Comic Input: Fix the number of colors control not allowing values less than 8"
+
+    - title: "Kobo driver: Fix main memory and Card A being swapped on some systems"
+
+    - title: "Kobo driver: Fix the ignore collections option being accidentally case-insensitive"
+
+    - title: "Preferences->Toolbars: Show an error message when the user tries to remove either the Preferences or Location Manager buttons instead of just silently adding them back."
+      tickets: [1689022]
+
+  improved recipes:
+    - Private Eye
+
+  new recipes:
+    - title: Balkanist
+      author: Darko Miletic
+
 - version: 2.84.0
   date: 2017-05-05
 
diff --git a/src/calibre/constants.py b/src/calibre/constants.py
index 75bd5c5166..52e5971330 100644
--- a/src/calibre/constants.py
+++ b/src/calibre/constants.py
@@ -6,7 +6,7 @@ from future_builtins import map
 import sys, locale, codecs, os, importlib, collections
 
 __appname__   = u'calibre'
-numeric_version = (2, 84, 0)
+numeric_version = (2, 85, 0)
 __version__   = u'.'.join(map(unicode, numeric_version))
 __author__    = u"Kovid Goyal <kovid@kovidgoyal.net>"