summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--configure.ac2
-rw-r--r--libqpdf/build.mk2
-rw-r--r--manual/qpdf-manual.xml4
-rw-r--r--qpdf.spec2
-rw-r--r--qpdf/qpdf.cc2
6 files changed, 13 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 931a0a27..8930e06b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-05-03 Jay Berkenbilt <ejb@ql.org>
+
+ * 2.0.6. release
+
+ * libqpdf/QPDF_Stream.cc (filterable): ignore /DecodeParms if it's
+ not a type we recognize. (Fixes qpdf-Bugs-2779746.)
+
2009-03-10 Jay Berkenbilt <ejb@ql.org>
* 2.0.5: release
diff --git a/configure.ac b/configure.ac
index b21aaa6d..adb7f293 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.0.5)
+AC_INIT(qpdf,2.0.6)
dnl No AC_CONFIG_HEADERS. If this changes, update README.maintainer.
AC_CONFIG_FILES([autoconf.mk])
diff --git a/libqpdf/build.mk b/libqpdf/build.mk
index 3bc9df32..3ee11dfa 100644
--- a/libqpdf/build.mk
+++ b/libqpdf/build.mk
@@ -69,5 +69,5 @@ $(OBJS_libqpdf): libqpdf/$(OUTPUT_DIR)/%.lo: libqpdf/%.cc
# * Otherwise, increment REVISION
libqpdf/$(OUTPUT_DIR)/libqpdf.la: $(OBJS_libqpdf)
- $(call makelib,$(OBJS_libqpdf),$@,2,0,1)
+ $(call makelib,$(OBJS_libqpdf),$@,2,1,1)
diff --git a/manual/qpdf-manual.xml b/manual/qpdf-manual.xml
index fbb1ff8d..eb3c54b9 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.0.5">
-<!ENTITY lastreleased "March 9, 2009">
+<!ENTITY swversion "2.0.6">
+<!ENTITY lastreleased "May 3, 2009">
]>
<book>
<bookinfo>
diff --git a/qpdf.spec b/qpdf.spec
index f2a293d1..f7fd855a 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.0.5
+Version: 2.0.6
Release: 1%{?dist}
License: Artistic
Group: System Environment/Libraries
diff --git a/qpdf/qpdf.cc b/qpdf/qpdf.cc
index 50f6e750..8335ad8f 100644
--- a/qpdf/qpdf.cc
+++ b/qpdf/qpdf.cc
@@ -456,7 +456,7 @@ int main(int argc, char* argv[])
// 1 2 3 4 5 6 7 8
// 12345678901234567890123456789012345678901234567890123456789012345678901234567890
std::cout
- << whoami << " version 2.0.5" << std::endl
+ << whoami << " version 2.0.6" << std::endl
<< "Copyright (c) 2005-2009 Jay Berkenbilt"
<< std::endl
<< "This software may be distributed under the terms of version 2 of the"