summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--configure.ac2
-rw-r--r--libqpdf/QPDF.cc2
-rw-r--r--libqpdf/build.mk2
-rw-r--r--manual/qpdf-manual.xml6
-rw-r--r--qpdf.spec2
6 files changed, 9 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 8474f68d..92ba6292 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2010-10-01 Jay Berkenbilt <ejb@ql.org>
+ * 2.2.1: release
+
* include/qpdf/QPDF.hh: Add setOutputStreams method to allow
redirection of library-generated output/error to alternative
streams.
diff --git a/configure.ac b/configure.ac
index 26a2741d..ea4dbca3 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.2.0)
+AC_INIT(qpdf,2.2.1)
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_FILES([autoconf.mk])
diff --git a/libqpdf/QPDF.cc b/libqpdf/QPDF.cc
index 122b0bdb..493d519e 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.2.0";
+std::string QPDF::qpdf_version = "2.2.1";
void
QPDF::InputSource::setLastOffset(off_t offset)
diff --git a/libqpdf/build.mk b/libqpdf/build.mk
index 60cf5db0..45c1919b 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),4,0,1)
+ $(call makelib,$(OBJS_libqpdf),$@,$(LDFLAGS),$(LIBS),5,0,2)
diff --git a/manual/qpdf-manual.xml b/manual/qpdf-manual.xml
index ab9891fb..0c193e20 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.2.0">
-<!ENTITY lastreleased "August 14, 2010">
+<!ENTITY swversion "2.2.1">
+<!ENTITY lastreleased "October 1, 2010">
]>
<book>
<bookinfo>
@@ -2075,7 +2075,7 @@ print "\n";
</para>
<variablelist>
<varlistentry>
- <term>2.2.1: XXX</term>
+ <term>2.2.1: October 1, 2010</term>
<listitem>
<itemizedlist>
<listitem>
diff --git a/qpdf.spec b/qpdf.spec
index 662ed442..36d110f9 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.2.0
+Version: 2.2.1
Release: 1%{?dist}
License: Artistic
Group: System Environment/Libraries