From cf172cf550f00fdadbff635ad6f8c4b00aa800fb Mon Sep 17 00:00:00 2001
From: Jay Berkenbilt <ejb@ql.org>
Date: Fri, 6 Aug 2010 01:38:24 +0000
Subject: [PATCH] some doc updates, shlib version

git-svn-id: svn+q:///qpdf/trunk@1002 71b93d88-0707-0410-a8cf-f5a4172ac649
---
 TODO                   | 12 +++++++++---
 libqpdf/build.mk       |  2 +-
 manual/qpdf-manual.xml | 43 ++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 53 insertions(+), 4 deletions(-)

diff --git a/TODO b/TODO
index 5495c8cf..2f5668e4 100644
--- a/TODO
+++ b/TODO
@@ -1,7 +1,13 @@
-Next
-====
+2.2.0
+=====
 
- * Work in contrib/vc6.  See email from stronghorse@tom.com
+ * shared library version information already bumped for 2.2.0.rc1
+
+ * Work in contrib/vc6.  See email from stronghorse@tom.com.  Not yet
+   mentioned in the docs.
+
+ * Finish maintainer checklist.  Some release notes items have been
+   updated.
 
  * Find messages exchanged with Stefan Heinsen <stefan.heinsen@gmx.de>
    in August, 2009.  He seems to like to send encrypted mail (key
diff --git a/libqpdf/build.mk b/libqpdf/build.mk
index ac411d86..60cf5db0 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,4,0)
+	$(call makelib,$(OBJS_libqpdf),$@,$(LDFLAGS),$(LIBS),4,0,1)
diff --git a/manual/qpdf-manual.xml b/manual/qpdf-manual.xml
index 5d862364..6a5c010b 100644
--- a/manual/qpdf-manual.xml
+++ b/manual/qpdf-manual.xml
@@ -2071,6 +2071,49 @@ print "\n";
    <filename>ChangeLog</filename> in the source distribution.
   </para>
   <variablelist>
+   <varlistentry>
+    <term>2.2.0.rc1: XXX, 2010</term>
+    <listitem>
+     <itemizedlist>
+      <listitem>
+       <para>
+        Add new methods to <classname>QPDFObjectHandle</classname>
+        (<function>newStream</function> and
+        <function>replaceStreamData</function> for creating new
+        streams and replacing stream data.  This makes it possible to
+        perform a wide range of operations that were not previously
+        possible.
+       </para>
+      </listitem>
+      <listitem>
+       <para>
+        Add new helper method in
+        <classname>QPDFObjectHandle</classname>
+        (<function>addPageContents</function>) for appending or
+        prepending new content streams to a page.  This method makes
+        it possible to manipulate content streams without having to be
+        concerned whether a page's contents are a single stream or an
+        array of streams.
+       </para>
+      </listitem>
+      <listitem>
+       <para>
+        Provide two new examples:
+        <command>pdf-double-page-size</command> and
+        <command>pdf-invert-images</command> that illustrate the newly
+        added interfaces.
+       </para>
+      </listitem>
+      <listitem>
+       <para>
+        Fix a memory leak that would cause loss of a few bytes for
+        every object involved in a cycle of object references.  Thanks
+        to Jian Ma for calling my attention to the leak.
+       </para>
+      </listitem>
+     </itemizedlist>
+    </listitem>
+   </varlistentry>
    <varlistentry>
     <term>2.1.5: April 25, 2010</term>
     <listitem>