From e5abc789a26732552388fb9ca97985f8401327b1 Mon Sep 17 00:00:00 2001
From: Jay Berkenbilt <ejb@ql.org>
Date: Sat, 31 Oct 2015 18:56:26 -0400
Subject: Prepare 5.2.0 release

---
 ChangeLog              |  2 ++
 TODO                   | 17 +++++++----------
 configure.ac           |  2 +-
 libqpdf/QPDF.cc        |  2 +-
 manual/qpdf-manual.xml | 29 +++++++++++++++++++++++++++--
 5 files changed, 38 insertions(+), 14 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 34262ef0..911002e2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2015-10-31  Jay Berkenbilt  <ejb@ql.org>
 
+	* 5.2.0: release
+
 	* libqpdf/QPDF.cc (read_xrefTable): Be tolerant of some malformed
 	xref tables that don't have the required trailing space after each
 	line.
diff --git a/TODO b/TODO
index ef44b115..0ef02e03 100644
--- a/TODO
+++ b/TODO
@@ -53,18 +53,12 @@ Remove private methods that are there only for ABI compatibility
 including extra QPDFWriter writeTrailer, writeXRefTable,
 writeXRefStream.
 
+Remember that non-compatible changes to private methods still breaks
+ABI compatibility. See a3576a73593987b26cd3eff346f8f7c11f713cbd.
 
-5.2.0
-=====
-
- * Before release: remember to bump minor shared library version since
-   new methods were added (even though private).
-
- * Figure out what about a3576a73593987b26cd3eff346f8f7c11f713cbd
-   broke binary compatibility.
 
- * Implement automated testing for binary compatibility and add to
-   release checklist.
+5.3.0
+=====
 
  * Add method to push inheritable resources to a single page by
    walking up and copying without overwrite.  Above logic will also be
@@ -126,6 +120,9 @@ writeXRefStream.
 General
 =======
 
+ * Implement automated testing for binary compatibility and add to
+   release checklist.
+
  * Figure out how to find Visual Studio in Windows registry and see if
    I can get it to work with make so I can simplify creation of
    Windows releases.
diff --git a/configure.ac b/configure.ac
index 3cb458d0..c7e67458 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
 dnl This config.in requires autoconf 2.5 or greater.
 
 AC_PREREQ([2.68])
-AC_INIT([qpdf],[5.1.3])
+AC_INIT([qpdf],[5.2.0])
 
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_FILES([autoconf.mk])
diff --git a/libqpdf/QPDF.cc b/libqpdf/QPDF.cc
index a14a07ea..56119ee2 100644
--- a/libqpdf/QPDF.cc
+++ b/libqpdf/QPDF.cc
@@ -20,7 +20,7 @@
 #include <qpdf/QPDF_Null.hh>
 #include <qpdf/QPDF_Dictionary.hh>
 
-std::string QPDF::qpdf_version = "5.1.3";
+std::string QPDF::qpdf_version = "5.2.0";
 
 static char const* EMPTY_PDF =
     "%PDF-1.3\n"
diff --git a/manual/qpdf-manual.xml b/manual/qpdf-manual.xml
index 7bd787e3..65e6ded3 100644
--- a/manual/qpdf-manual.xml
+++ b/manual/qpdf-manual.xml
@@ -5,8 +5,8 @@
 <!ENTITY mdash "&#x2014;">
 <!ENTITY ndash "&#x2013;">
 <!ENTITY nbsp "&#xA0;">
-<!ENTITY swversion "5.1.3">
-<!ENTITY lastreleased "May 24, 2015">
+<!ENTITY swversion "5.2.0">
+<!ENTITY lastreleased "October 31, 2015">
 ]>
 <book>
  <bookinfo>
@@ -2684,6 +2684,31 @@ print "\n";
    <filename>ChangeLog</filename> in the source distribution.
   </para>
   <variablelist>
+   <varlistentry>
+    <term>5.2.0: October 31, 2015</term>
+    <listitem>
+     <itemizedlist>
+      <listitem>
+       <para>
+        Implement <option>--deterministic-id</option> command-line
+        option and <function>QPDFWriter::setDeterministicID</function>
+        as well as C API function
+        <function>qpdf_set_deterministic_ID</function> for generating
+        a deterministic ID for non-encrypted files. When this option
+        is selected, the ID of the file depends on the contents of the
+        output file, and not on transient items such as the timestamp
+        or output file name.
+       </para>
+      </listitem>
+      <listitem>
+       <para>
+        Make qpdf more tolerant of files whose xref table entries are
+        not the correct length.
+       </para>
+      </listitem>
+     </itemizedlist>
+    </listitem>
+   </varlistentry>
    <varlistentry>
     <term>5.1.3: May 24, 2015</term>
     <listitem>
-- 
cgit v1.2.3-54-g00ecf