Prepare 4.2.0 releaserelease-qpdf-4.2.0

5 files changed, 5 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index 02b21570..a5f0aa16 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2013-07-07  Jay Berkenbilt  <ejb@ql.org>
 
+	* 4.2.0: release
+
 	* Ignore error case of a stream's decode parameters having invalid
 	length when there are no stream filters.
 
diff --git a/TODO b/TODO
index f19c0b6f..1749b843 100644
--- a/TODO
+++ b/TODO
@@ -1,9 +1,3 @@
-4.2.0
-=====
-
- * New interfaces have been added.
-
-
 4.3.0
 =====
 
diff --git a/configure.ac b/configure.ac
index 5a2483b0..14f05c4c 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],[4.1.0])
+AC_INIT([qpdf],[4.2.0])
 
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_FILES([autoconf.mk])
diff --git a/libqpdf/QPDF.cc b/libqpdf/QPDF.cc
index ad742daa..2bdfa963 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 = "4.1.0";
+std::string QPDF::qpdf_version = "4.2.0";
 
 static char const* EMPTY_PDF =
     "%PDF-1.3\n"
diff --git a/libqpdf/build.mk b/libqpdf/build.mk
index 9c86e774..095ac198 100644
--- a/libqpdf/build.mk
+++ b/libqpdf/build.mk
@@ -94,4 +94,4 @@ $(COBJS_libqpdf): libqpdf/$(OUTPUT_DIR)/%.$(LOBJ): libqpdf/%.c
 # * Otherwise, increment REVISION
 
 $(TARGETS_libqpdf): $(OBJS_libqpdf)
-	$(call makelib,$(OBJS_libqpdf),$@,$(LDFLAGS),$(LIBS),11,0,1)
+	$(call makelib,$(OBJS_libqpdf),$@,$(LDFLAGS),$(LIBS),12,0,2)