From 2ebdd6929ea15187cdcf72acb19e8cc3047702f9 Mon Sep 17 00:00:00 2001
From: Jay Berkenbilt <ejb@ql.org>
Date: Sun, 4 Feb 2018 18:31:42 -0500
Subject: [PATCH] Prepare 7.1.1 release

---
 ChangeLog              | 15 +++++++++++++++
 configure.ac           |  4 ++--
 libqpdf/QPDF.cc        |  2 +-
 manual/qpdf-manual.xml | 23 +++++++++++++++++++++--
 4 files changed, 39 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 699a9f9c..2866ae55 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2018-02-04  Jay Berkenbilt  <ejb@ql.org>
+
+	* 7.1.1: release
+
+	* Bug fix: properly linearize files whose /ID has a length of
+	other than 16 bytes.
+
+	* Rename some test files to avoid files with three dots in their
+	names. Fixes #173.
+
+	* Fix various build and compilation issues on some platforms and
+	compilers. Fixes #176, #172, #177
+
+	* Fix a few typos and clarify a few comments in header files.
+
 2018-01-14  Jay Berkenbilt  <ejb@ql.org>
 
 	* 7.1.0: release
diff --git a/configure.ac b/configure.ac
index 8857c1d0..a9f03161 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],[7.1.0])
+AC_INIT([qpdf],[7.1.1])
 
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_FILES([autoconf.mk])
@@ -31,7 +31,7 @@ LT_INIT([win32-dll])
 # LT = libtool
 LT_CURRENT=20
 LT_AGE=2
-LT_REVISION=0
+LT_REVISION=1
 AC_SUBST(LT_CURRENT)
 AC_SUBST(LT_REVISION)
 AC_SUBST(LT_AGE)
diff --git a/libqpdf/QPDF.cc b/libqpdf/QPDF.cc
index f1088b37..3475afe4 100644
--- a/libqpdf/QPDF.cc
+++ b/libqpdf/QPDF.cc
@@ -19,7 +19,7 @@
 #include <qpdf/QPDF_Null.hh>
 #include <qpdf/QPDF_Dictionary.hh>
 
-std::string QPDF::qpdf_version = "7.1.0";
+std::string QPDF::qpdf_version = "7.1.1";
 
 static char const* EMPTY_PDF =
     "%PDF-1.3\n"
diff --git a/manual/qpdf-manual.xml b/manual/qpdf-manual.xml
index 4cf91c92..3595058b 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 "7.1.0">
-<!ENTITY lastreleased "January 14, 2018">
+<!ENTITY swversion "7.1.1">
+<!ENTITY lastreleased "February 4, 2018">
 ]>
 <book>
  <bookinfo>
@@ -2982,6 +2982,25 @@ print "\n";
    <filename>ChangeLog</filename> in the source distribution.
   </para>
   <variablelist>
+   <varlistentry>
+    <term>7.1.1: February 4, 2018</term>
+    <listitem>
+     <itemizedlist>
+      <listitem>
+       <para>
+        Bug fix: files whose /ID fields were other than 16 bytes long
+        can now be properly linearlized
+       </para>
+      </listitem>
+      <listitem>
+       <para>
+        A few compile and link issues have been corrected for some
+        platforms.
+       </para>
+      </listitem>
+     </itemizedlist>
+    </listitem>
+   </varlistentry>
    <varlistentry>
     <term>7.1.0: January 14, 2018</term>
     <listitem>