From 8f074ed42fe6e6cbea14f94d561f25396e53a3f4 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 7 Oct 2023 16:37:30 +0530
Subject: [PATCH] version 6.28.1

---
 Changelog.txt            | 4 +++-
 src/calibre/constants.py | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Changelog.txt b/Changelog.txt
index b2ea764d61..ae0ec1ff51 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -23,7 +23,7 @@
 # - title by author
 # }}}
 
-{{{ 6.28.0 2023-10-06
+{{{ 6.28.1 2023-10-07
 
 :: new features
 
@@ -61,6 +61,8 @@
 
 - [2037237] Fix errors caused by .DS_Store files inserted into the .caltrash directory on macOS if the user happens to open .caltrash in Finder
 
+- Version 6.28.1 fixes a regression in 6.28.0 that could cause errors when merging some book records in calibre
+
 :: improved recipes
 - National Geographic
 - Bloomberg
diff --git a/src/calibre/constants.py b/src/calibre/constants.py
index e5bbedfede..ce331deb41 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, 28, 0)
+numeric_version = (6, 28, 1)
 __version__   = '.'.join(map(str, numeric_version))
 git_version   = None
 __author__    = "Kovid Goyal <kovid@kovidgoyal.net>"