summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJay Berkenbilt <ejb@ql.org>2023-09-05 19:59:15 +0200
committerJay Berkenbilt <ejb@ql.org>2023-09-05 19:59:23 +0200
commitb352791a07a5488e6f1f67220ddce147d20aa26a (patch)
tree66e46158f81830a8db0dba6e4f8a1f57d23dbb49
parent105093ae1896120035170014d17ad63f82ffa6fe (diff)
downloadqpdf-b352791a07a5488e6f1f67220ddce147d20aa26a.tar.zst
Prepare 11.6.1 releasev11.6.1
-rw-r--r--CMakeLists.txt2
-rw-r--r--ChangeLog8
-rw-r--r--include/qpdf/DLL.h4
-rw-r--r--manual/conf.py2
-rw-r--r--manual/release-notes.rst7
5 files changed, 19 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c694fe04..abf17a0b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,7 +5,7 @@ cmake_minimum_required(VERSION 3.16)
# the project line. When updating the version, check make_dist for all
# the places it has to be updated.
project(qpdf
- VERSION 11.6.0
+ VERSION 11.6.1
LANGUAGES C CXX)
# Enable correct rpath handling for MacOSX
diff --git a/ChangeLog b/ChangeLog
index 7e1d40ab..56eebe2b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2023-09-05 Jay Berkenbilt <ejb@ql.org>
+
+ * 11.6.1: release
+
+ * Fix a logic error introduced in 11.6.0 in the fix to
+ copyForeignObject. The bug could result in some pages not being
+ copied.
+
2023-09-03 Jay Berkenbilt <ejb@ql.org>
* 11.6.0: release
diff --git a/include/qpdf/DLL.h b/include/qpdf/DLL.h
index cb963316..794363a7 100644
--- a/include/qpdf/DLL.h
+++ b/include/qpdf/DLL.h
@@ -26,8 +26,8 @@
/* The first version of qpdf to include the version constants is 10.6.0. */
#define QPDF_MAJOR_VERSION 11
#define QPDF_MINOR_VERSION 6
-#define QPDF_PATCH_VERSION 0
-#define QPDF_VERSION "11.6.0"
+#define QPDF_PATCH_VERSION 1
+#define QPDF_VERSION "11.6.1"
/*
* This file defines symbols that control the which functions,
diff --git a/manual/conf.py b/manual/conf.py
index 8a0de1ea..ed9287d0 100644
--- a/manual/conf.py
+++ b/manual/conf.py
@@ -16,7 +16,7 @@ project = 'QPDF'
copyright = '2005-2023, Jay Berkenbilt'
author = 'Jay Berkenbilt'
# make_dist and the CI build lexically find the release version from this file.
-release = '11.6.0'
+release = '11.6.1'
version = release
extensions = [
'sphinx_rtd_theme',
diff --git a/manual/release-notes.rst b/manual/release-notes.rst
index 53664f2a..c07472e4 100644
--- a/manual/release-notes.rst
+++ b/manual/release-notes.rst
@@ -35,6 +35,13 @@ Planned changes for future 12.x (subject to change):
.. x.y.z: not yet released
+11.6.1: September 5, 2023
+ - Bug fixes:
+
+ - Fix a logic error introduced in 11.6.0 in the fix to
+ ``copyForeignObject``. The bug could result in some pages not
+ being copied.
+
11.6.0: September 3, 2023
- Bug fixes: