From 91ce55a4e3c1f29f4710499464b61dc014bb7588 Mon Sep 17 00:00:00 2001
From: Jay Berkenbilt <ejb@ql.org>
Date: Fri, 30 Oct 2009 23:58:19 +0000
Subject: [PATCH] 2.1

git-svn-id: svn+q:///qpdf/trunk@913 71b93d88-0707-0410-a8cf-f5a4172ac649
---
 configure.ac           |  2 +-
 libqpdf/QPDF.cc        | 12 ++++++------
 manual/qpdf-manual.xml |  6 +++---
 qpdf.spec              |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/configure.ac b/configure.ac
index 94a1130d..040793f6 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.1.rc1)
+AC_INIT(qpdf,2.1)
 
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_FILES([autoconf.mk])
diff --git a/libqpdf/QPDF.cc b/libqpdf/QPDF.cc
index 0a017b41..4317bdd0 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.1.rc1";
+std::string QPDF::qpdf_version = "2.1";
 
 void
 QPDF::InputSource::setLastOffset(off_t offset)
@@ -425,9 +425,9 @@ QPDF::setTrailer(QPDFObjectHandle obj)
 void
 QPDF::reconstruct_xref(QPDFExc& e)
 {
-    static PCRE obj_re("^(\\d+) (\\d+) obj\\b");
-    static PCRE endobj_re("^endobj\\b");
-    static PCRE trailer_re("^trailer\\b");
+    static PCRE obj_re("^\\s*(\\d+)\\s+(\\d+)\\s+obj\\b");
+    static PCRE endobj_re("^\\s*endobj\\b");
+    static PCRE trailer_re("^\\s*trailer\\b");
 
     warn(QPDFExc(qpdf_e_damaged_pdf, this->file.getName(), "", 0,
 		 "file is damaged"));
@@ -561,7 +561,7 @@ QPDF::read_xref(off_t xref_offset)
 int
 QPDF::read_xrefTable(off_t xref_offset)
 {
-    static PCRE xref_first_re("^(\\d+)\\s+(\\d+)");
+    static PCRE xref_first_re("^\\s*(\\d+)\\s+(\\d+)");
     static PCRE xref_entry_re("(?s:(^\\d{10}) (\\d{5}) ([fn])[ \r\n]{2}$)");
 
     std::vector<ObjGen> deleted_items;
@@ -1350,7 +1350,7 @@ int
 QPDF::recoverStreamLength(InputSource* input,
 			  int objid, int generation, off_t stream_offset)
 {
-    static PCRE endobj_re("^endobj\\b");
+    static PCRE endobj_re("^\\s*endobj\\b");
 
     // Try to reconstruct stream length by looking for
     // endstream(\r\n?|\n)endobj
diff --git a/manual/qpdf-manual.xml b/manual/qpdf-manual.xml
index bd180352..ee6ec19c 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.1.rc1">
-<!ENTITY lastreleased "October 24, 2009">
+<!ENTITY swversion "2.1">
+<!ENTITY lastreleased "October 30, 2009">
 ]>
 <book>
  <bookinfo>
@@ -2072,7 +2072,7 @@ print "\n";
   </para>
   <variablelist>
    <varlistentry>
-    <term>2.1.rc1: October 24, 2009</term>
+    <term>2.1: October 30, 2009</term>
     <listitem>
      <itemizedlist>
       <listitem>
diff --git a/qpdf.spec b/qpdf.spec
index 5ce98276..7dee8e88 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.1.rc1
+Version: 2.1
 Release: 1%{?dist}
 License: Artistic
 Group: System Environment/Libraries