2.2.2release-qpdf-2.2.2

git-svn-id: svn+q:///qpdf/trunk@1045 71b93d88-0707-0410-a8cf-f5a4172ac649

5 files changed, 11 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 92ba6292..ecc174b9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-10-04  Jay Berkenbilt  <ejb@ql.org>
+
+	* 2.2.2: release
+
+	* include/qpdf/qpdf-c.h: Add qpdf_read_memory to C API to call
+	QPDF::processMemoryFile.
+
 2010-10-01  Jay Berkenbilt  <ejb@ql.org>
 
 	* 2.2.1: release
diff --git a/configure.ac b/configure.ac
index ea4dbca3..6352b81a 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.1)
+AC_INIT(qpdf,2.2.2)
 
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_FILES([autoconf.mk])
diff --git a/libqpdf/QPDF.cc b/libqpdf/QPDF.cc
index 493d519e..d176e516 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.1";
+std::string QPDF::qpdf_version = "2.2.2";
 
 void
 QPDF::InputSource::setLastOffset(off_t offset)
diff --git a/libqpdf/build.mk b/libqpdf/build.mk
index 45c1919b..603830fb 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),5,0,2)
+	$(call makelib,$(OBJS_libqpdf),$@,$(LDFLAGS),$(LIBS),6,0,3)
diff --git a/qpdf.spec b/qpdf.spec
index 36d110f9..7f399ee0 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.1
+Version: 2.2.2
 Release: 1%{?dist}
 License: Artistic
 Group: System Environment/Libraries