From 349c80c895c961afe4654e0590698f879becca22 Mon Sep 17 00:00:00 2001
From: Jay Berkenbilt <ejb@ql.org>
Date: Sun, 18 Apr 2010 23:25:12 +0000
Subject: [PATCH] 2.1.4

git-svn-id: svn+q:///qpdf/trunk@958 71b93d88-0707-0410-a8cf-f5a4172ac649
---
 configure.ac           |  2 +-
 libqpdf/QPDF.cc        |  2 +-
 libqpdf/build.mk       |  2 +-
 manual/qpdf-manual.xml | 29 ++++++++++++++++++++++++-----
 qpdf.spec              |  2 +-
 5 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/configure.ac b/configure.ac
index 9bf00e9b..395b1622 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.60)
-AC_INIT(qpdf,2.1.3)
+AC_INIT(qpdf,2.1.4)
 
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_FILES([autoconf.mk])
diff --git a/libqpdf/QPDF.cc b/libqpdf/QPDF.cc
index b3c4b86f..8371b381 100644
--- a/libqpdf/QPDF.cc
+++ b/libqpdf/QPDF.cc
@@ -15,7 +15,7 @@
 #include <qpdf/QPDF_Null.hh>
 #include <qpdf/QPDF_Dictionary.hh>
 
-std::string QPDF::qpdf_version = "2.1.3";
+std::string QPDF::qpdf_version = "2.1.4";
 
 void
 QPDF::InputSource::setLastOffset(off_t offset)
diff --git a/libqpdf/build.mk b/libqpdf/build.mk
index e7d2c71e..b2922a36 100644
--- a/libqpdf/build.mk
+++ b/libqpdf/build.mk
@@ -72,4 +72,4 @@ $(OBJS_libqpdf): libqpdf/$(OUTPUT_DIR)/%.$(LOBJ): libqpdf/%.cc
 # * Otherwise, increment REVISION
 
 $(TARGETS_libqpdf): $(OBJS_libqpdf)
-	$(call makelib,$(OBJS_libqpdf),$@,$(LDFLAGS),$(LIBS),3,2,0)
+	$(call makelib,$(OBJS_libqpdf),$@,$(LDFLAGS),$(LIBS),3,3,0)
diff --git a/manual/qpdf-manual.xml b/manual/qpdf-manual.xml
index bee1db29..3c2ae1a3 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 "2.1.3">
-<!ENTITY lastreleased "March 27, 2010">
+<!ENTITY swversion "2.1.4">
+<!ENTITY lastreleased "April 18, 2010">
 ]>
 <book>
  <bookinfo>
@@ -2072,9 +2072,28 @@ print "\n";
   </para>
   <variablelist>
    <varlistentry>
-<!--
-clarified check output
--->
+    <term>2.1.4: April 18, 2010</term>
+    <listitem>
+     <itemizedlist>
+      <listitem>
+       <para>
+        Apply the same padding calculation fix from version 2.1.2 to
+        the main cross reference stream as well.
+       </para>
+      </listitem>
+      <listitem>
+       <para>
+        Since <command>qpdf --check</command> only performs limited
+        checks, clarify the output to make it clear that there still
+        may be errors that qpdf can't check.  This should make it less
+        surprising to people when another PDF reader is unable to read
+        a file that qpdf thinks is okay.
+       </para>
+      </listitem>
+     </itemizedlist>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
     <term>2.1.3: March 27, 2010</term>
     <listitem>
      <itemizedlist>
diff --git a/qpdf.spec b/qpdf.spec
index 8885d691..3296993f 100644
--- a/qpdf.spec
+++ b/qpdf.spec
@@ -1,6 +1,6 @@
 Summary: Command-line tools and library for transforming PDF files
 Name: qpdf
-Version: 2.1.3
+Version: 2.1.4
 Release: 1%{?dist}
 License: Artistic
 Group: System Environment/Libraries