From 161bf3bcda84a218f325935cb3a00835c3776baa Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 13 Jun 2014 07:29:41 +0530
Subject: [PATCH] version 1.40.0

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

diff --git a/Changelog.yaml b/Changelog.yaml
index c94512b466..8ba4507b7d 100644
--- a/Changelog.yaml
+++ b/Changelog.yaml
@@ -20,6 +20,58 @@
 #   new recipes:
 #     - title: 
 
+- version: 1.40.0
+  date: 2014-06-12
+
+  new features:
+    - title: "Edit Book: Add a new tool to manage fonts. Allows easily changing/removing/embedding fonts in the entire book. To use it go to Tools->Manage Fonts"
+
+    - title: "Edit Book: Allow the color of the links in the Live CSS panel to be themed."
+      tickets: [1326897]
+
+    - title: "E-book viewer: Add a keyboard shortcut to bookmark current location."
+      tickets: [1326198]
+
+  bug fixes:
+    - title: "Edit Book: Check book: When auto-changing font name to match actual name in font file, also change the font name in shorthand font declarations"
+
+    - title: "Edit Book/Book polishing: Fix embedding all referenced fonts not catching fonts that are only specified via style attributes and not in any stylesheets."
+
+    - title: "Conversion: Fix normalization of CSS shorthand font property not working when multiple font families are specified in the same shorthand property"
+
+    - title: "Edit Book: Live CSS: Fix clicking on link to go to style definition not working if the stylesheet contains CSS 3 @media queries or @font-face rules"
+
+    - title: "Edit Book: When importing DOCX files, set the media type for html files correctly"
+
+    - title: "Edit Book: Fix import of DOCX files that contain no Table of Contents not working."
+      tickets: [1327522]
+
+    - title: "Portable installer: Fix a crash if the user selects a destination for the portable install that does not have enough disk space."
+      tickets: [1324575]
+
+    - title: "Fix date column not showing date added when adding zip/rar files that contain an OPF with a calibre timestamp in its metadata"
+
+    - title: "Sony driver: Fix SONY annotation app not working with files sent to the device by calibre"
+
+    - title: "Linux build: Fix regression that caused opening PDF files (or any externally viewed files) preventing calibre from being restarted as long as the external viewer is not shutdown."
+      tickets: [1326453]
+
+    - title: "Edit book: Fix changing underline style to none when creating a custom color scheme causes error."
+
+    - title: "Check Book: Fix empty (zero byte) XML files causing check book to fail."
+      tickets: [1326073]
+
+    - title: "Check Book: Fix combination of mismatching font family names and a font-family declaration with an invalid value (such as a dimension) causing auto fixing of errors to fail."
+      tickets: [1325070]
+
+  improved recipes:
+    - Respekt
+    - Newsweek
+    - Jerusalem Post
+    - Outlook India
+    - PC Magazine
+    - Instapaper
+
 - version: 1.39.0
   date: 2014-05-29
 
diff --git a/src/calibre/constants.py b/src/calibre/constants.py
index 94ea4df7d4..6a58e83587 100644
--- a/src/calibre/constants.py
+++ b/src/calibre/constants.py
@@ -4,7 +4,7 @@ __license__   = 'GPL v3'
 __copyright__ = '2008, Kovid Goyal kovid@kovidgoyal.net'
 __docformat__ = 'restructuredtext en'
 __appname__   = u'calibre'
-numeric_version = (1, 39, 0)
+numeric_version = (1, 40, 0)
 __version__   = u'.'.join(map(unicode, numeric_version))
 __author__    = u"Kovid Goyal <kovid@kovidgoyal.net>"