From 6b4d2312458de367ef2a12cbe211e72634233d71 Mon Sep 17 00:00:00 2001
From: Jay Berkenbilt <ejb@ql.org>
Date: Sat, 14 Aug 2010 16:43:18 +0000
Subject: [PATCH] 2.2.0

git-svn-id: svn+q:///qpdf/trunk@1016 71b93d88-0707-0410-a8cf-f5a4172ac649
---
 ChangeLog              |  2 ++
 README.maintainer      |  3 +++
 TODO                   | 11 -----------
 configure.ac           |  2 +-
 libqpdf/QPDF.cc        |  2 +-
 manual/qpdf-manual.xml |  6 +++---
 qpdf.spec              |  2 +-
 7 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5a467aef..6add548a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2010-08-14  Jay Berkenbilt  <ejb@ql.org>
 
+	* 2.2.0: release
+
 	* Rename README.windows to README-windows.txt and convert its line
 	endings to Windows-style line endings.  Also mention Jian Ma's VC6
 	port in the manual and README-windows.txt.
diff --git a/README.maintainer b/README.maintainer
index 585c8fbb..c265651b 100644
--- a/README.maintainer
+++ b/README.maintainer
@@ -20,6 +20,9 @@ Release Reminders
 
  * Update release date in manual/qpdf-manual.xml
 
+ * Check TODO file to make sure all planned items for the release are
+   done or retargeted.
+
  * Each year, update copyright notices.  Just search for Copyright.
    Last updated: 2010.
 
diff --git a/TODO b/TODO
index 32364dea..fe45f513 100644
--- a/TODO
+++ b/TODO
@@ -1,14 +1,3 @@
-2.2.0
-=====
-
- * shared library version information already bumped for 2.2.rc1;
-   replace 2.2.rc1 with 2.2.0 in manual and update in other places for
-   2.2.0.
-
- * Work in contrib/vc6.  See email from stronghorse@tom.com.  Not yet
-   mentioned in the docs.
-
-
 General
 =======
 
diff --git a/configure.ac b/configure.ac
index 4c57ba2c..26a2741d 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.rc1)
+AC_INIT(qpdf,2.2.0)
 
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_FILES([autoconf.mk])
diff --git a/libqpdf/QPDF.cc b/libqpdf/QPDF.cc
index 8849c3c7..0ee097d5 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.rc1";
+std::string QPDF::qpdf_version = "2.2.0";
 
 void
 QPDF::InputSource::setLastOffset(off_t offset)
diff --git a/manual/qpdf-manual.xml b/manual/qpdf-manual.xml
index c10e6195..cab6740e 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.rc1">
-<!ENTITY lastreleased "August 8, 2010">
+<!ENTITY swversion "2.2.0">
+<!ENTITY lastreleased "August 14, 2010">
 ]>
 <book>
  <bookinfo>
@@ -2075,7 +2075,7 @@ print "\n";
   </para>
   <variablelist>
    <varlistentry>
-    <term>2.2.rc1: August 8, 2010</term>
+    <term>2.2.0: August 14, 2010</term>
     <listitem>
      <itemizedlist>
       <listitem>
diff --git a/qpdf.spec b/qpdf.spec
index e2bb8986..662ed442 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.rc1
+Version: 2.2.0
 Release: 1%{?dist}
 License: Artistic
 Group: System Environment/Libraries