From 3cd0a296bd66ec61249ae75a39e66f5d2f7f7481 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 25 Nov 2022 07:27:34 +0530
Subject: [PATCH] version 6.9.0

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

diff --git a/Changelog.txt b/Changelog.txt
index a7355ad070..737a06b259 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -23,6 +23,48 @@
 # - title by author
 # }}}
 
+{{{ 6.9.0 2022-11-25
+
+:: new features
+
+- E-book viewer: When exporting highlights as plain text include titles from chapters at all levels not just the first level
+
+- Edit book: Reports: Show the number of words per file in the Files section of the report
+
+- Windows builds: sign DLLs in addition to EXEs to make Microsoft's new "Smart App Control" tool happy
+
+- Sending by email: When adding comments also add series
+
+- [1990730] Nook driver: Put files in NOOK/Books instead of NOOK/My Files on recent nook devices so they are all listed in one place in the NOOK UI
+
+- calibredb list: Allow using a template as one of the returned fields
+
+- Tag browser: Add context menu action to turn on/off sub-categorization for a category
+
+:: bug fixes
+
+- [1996802] Merging books: Fix title sort not being updated when the title is updated
+
+- Content server viewer: Fix incorrect sorting of highlights in the same paragraph
+
+- Content server viewer: When exporting highlights as text include chapter titles
+
+- Improve rendering of the separator handle dots introduced in the previous release
+
+- Edit book: Fix regression in previous release causing applying any container update marking all open image editors as modified
+
+- Fix a regression in the previous release that caused copying book details to clipboard to use unix line endings on windows
+
+:: improved recipes
+- Bloomberg
+- The Globe and Mail
+- Spectator Magazine
+- The New York Times
+- The Hindu
+- MIT Technology Review
+
+}}}
+
 {{{ 6.8.0 2022-11-04
 
 :: new features
diff --git a/src/calibre/constants.py b/src/calibre/constants.py
index d22e9136b7..94591da48f 100644
--- a/src/calibre/constants.py
+++ b/src/calibre/constants.py
@@ -5,7 +5,7 @@ from functools import lru_cache
 import sys, locale, codecs, os, collections, collections.abc
 
 __appname__   = 'calibre'
-numeric_version = (6, 8, 0)
+numeric_version = (6, 9, 0)
 __version__   = '.'.join(map(str, numeric_version))
 git_version   = None
 __author__    = "Kovid Goyal <kovid@kovidgoyal.net>"