From 6e2a07dcebdb634c37ad4efe01f1b45df13e1a0b Mon Sep 17 00:00:00 2001
From: "A. Jesse Jiryu Davis" <jesse@mongodb.com>
Date: Thu, 29 Oct 2015 16:08:31 -0400
Subject: [PATCH] 1.2.1 release (actual)

Supersedes canceled release at fe05e3f.

Signed-off-by: A. Jesse Jiryu Davis <jesse@mongodb.com>
---
 CMakeLists.txt              |  6 +++---
 build/autotools/Versions.m4 |  4 ++--
 build/rpm/libbson.spec      |  7 +++++--
 doc/installing.page         | 16 ++++++++--------
 doc/version.page            |  4 ++--
 5 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index be8083f2..a3d89cb7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,10 +11,10 @@ set (SOURCE_DIR "${PROJECT_SOURCE_DIR}/")
 
 set (BSON_MAJOR_VERSION 1)
 set (BSON_MINOR_VERSION 2)
-set (BSON_MICRO_VERSION 2)
-set (BSON_PRERELEASE_VERSION dev)
+set (BSON_MICRO_VERSION 1)
+set (BSON_PRERELEASE_VERSION )
 set (BSON_API_VERSION 1.0)
-set (BSON_VERSION 1.2.2-dev)
+set (BSON_VERSION 1.2.1)
 
 set (CPACK_RESOURCE_FILE_LICENSE "${SOURCE_DIR}/COPYING")
 set (CPACK_PACKAGE_VERSION_MAJOR ${BSON_MAJOR_VERSION})
diff --git a/build/autotools/Versions.m4 b/build/autotools/Versions.m4
index 79fbc1ff..6ff86412 100644
--- a/build/autotools/Versions.m4
+++ b/build/autotools/Versions.m4
@@ -1,7 +1,7 @@
 m4_define([bson_major_version], [1])
 m4_define([bson_minor_version], [2])
-m4_define([bson_micro_version], [2])
-m4_define([bson_prerelease_version], [dev])
+m4_define([bson_micro_version], [1])
+m4_define([bson_prerelease_version], [])
 
 m4_define(
     [bson_version],
diff --git a/build/rpm/libbson.spec b/build/rpm/libbson.spec
index 4dfca330..9a43017b 100644
--- a/build/rpm/libbson.spec
+++ b/build/rpm/libbson.spec
@@ -1,11 +1,11 @@
 Name:           libbson
-Version:        1.2.0
+Version:        1.2.1
 Release:        1%{?dist}
 Summary:        BSON library
 
 License:        ASL 2.0
 URL:            https://github.com/mongodb/libbson
-Source0:        https://github.com/mongodb/libbson/releases/download/1.2.0-beta/libbson-1.2.0-beta.tar.gz
+Source0:        https://github.com/mongodb/libbson/releases/download/1.2.1/libbson-1.2.1.tar.gz
 BuildRequires:  automake
 
 %description
@@ -53,6 +53,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
 %changelog
 
+* Thu October 29 2015 A. Jesse Jiryu Davis <jesse@mongodb.com> - 1.2.1-1
+- Release 1.2.1
+
 * Tue October 13 2015 A. Jesse Jiryu Davis <jesse@mongodb.com> - 1.2.0-1
 - Release 1.2.0
 
diff --git a/doc/installing.page b/doc/installing.page
index 3196895c..728417e2 100644
--- a/doc/installing.page
+++ b/doc/installing.page
@@ -57,12 +57,12 @@
     <section id="unix-build">
       <title>Building from a release tarball</title>
       <p>Unless you intend on contributing to libbson, you will want to build from a release tarball.</p>
-      <p>The most recent release of libbson is 1.2.0 and can be <link href="https://github.com/mongodb/libbson/releases/download/1.2.0/libbson-1.2.0.tar.gz">downloaded here</link>. The following snippet will download and extract the code, and configure it:</p>
+      <p>The most recent release of libbson is 1.2.1 and can be <link href="https://github.com/mongodb/libbson/releases/download/1.2.1/libbson-1.2.1.tar.gz">downloaded here</link>. The following snippet will download and extract the code, and configure it:</p>
 
       <screen>
-$ wget https://github.com/mongodb/libbson/releases/download/1.2.0/libbson-1.2.0.tar.gz
-$ tar xzf libbson-1.2.0.tar.gz
-$ cd libbson-1.2.0
+$ wget https://github.com/mongodb/libbson/releases/download/1.2.1/libbson-1.2.1.tar.gz
+$ tar xzf libbson-1.2.1.tar.gz
+$ cd libbson-1.2.1
 $ ./configure</screen>
       <p>If <code>configure</code> completed successfully, you'll see something like the following describing your build configuration.</p>
       <screen>libbson was configured with the following options:
@@ -116,9 +116,9 @@ $ make man html</screen>
       <title>Building on OS X</title>
       <p>Download the latest release tarball:</p>
       <screen>
-$ curl -LO https://github.com/mongodb/libbson/releases/download/1.2.0/libbson-1.2.0.tar.gz
-$ tar xzf libbson-1.2.0.tar.gz
-$ cd libbson-1.2.0</screen>
+$ curl -LO https://github.com/mongodb/libbson/releases/download/1.2.1/libbson-1.2.1.tar.gz
+$ tar xzf libbson-1.2.1.tar.gz
+$ cd libbson-1.2.1</screen>
       <p>Build and install the library:</p>
       <screen>
 $ ./configure
@@ -142,7 +142,7 @@ $ make man html</screen>
 
     <p>Let's start by generating Visual Studio project files for libbson. The following assumes we are compiling for 64-bit Windows using Visual Studio 2010 Express which can be freely downloaded from Microsoft.</p>
 
-    <screen><output style="prompt">&gt; </output><input>cd libbson-1.2.0</input>
+    <screen><output style="prompt">&gt; </output><input>cd libbson-1.2.1</input>
 <output style="prompt">&gt; </output><input>cmake -G "Visual Studio 2010 Win64" "-DCMAKE_INSTALL_PREFIX=C:\libbson"</input>
 <output style="prompt">&gt; </output><input>msbuild.exe ALL_BUILD.vcxproj</input>
 <output style="prompt">&gt; </output><input>msbuild.exe INSTALL.vcxproj</input></screen>
diff --git a/doc/version.page b/doc/version.page
index 4ec780b8..13f2f103 100644
--- a/doc/version.page
+++ b/doc/version.page
@@ -25,8 +25,8 @@
 
 #define BSON_MAJOR_VERSION (1)
 #define BSON_MINOR_VERSION (2)
-#define BSON_MICRO_VERSION (0)
-#define BSON_VERSION_S     "1.2.0"
+#define BSON_MICRO_VERSION (1)
+#define BSON_VERSION_S     "1.2.1"
 
 #define BSON_VERSION_HEX (BSON_MAJOR_VERSION << 24 | \
                           BSON_MINOR_VERSION << 16 | \