From c71085ed326239dc2d318d848ded9a99e4e3c107 Mon Sep 17 00:00:00 2001
From: Sameer Agarwal <sameeragarwal@google.com>
Date: Thu, 31 Oct 2013 13:56:38 -0700
Subject: [PATCH] Update to 1.8.0rc1.

Change-Id: Iaa10fd5a20be2ef84aca0119306c44669d87cc5d
---
 CMakeLists.txt                  |  4 ++--
 docs/source/conf.py             |  2 +-
 docs/source/version_history.rst | 28 +++++++++++++++++++++-------
 include/ceres/ceres.h           |  4 ++--
 scripts/ceres-solver.spec       |  7 +++++--
 5 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 41db59abc..55b6b1615 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -81,11 +81,11 @@ SET(CMAKE_DEBUG_POSTFIX "-debug")
 # For versions without ABI changes, bump the smallest number in CERES_VERSION,
 # but leave the CERES_ABI_VERSION unchanged.
 SET(CERES_VERSION_MAJOR 1)
-SET(CERES_VERSION_MINOR 7)
+SET(CERES_VERSION_MINOR 8)
 SET(CERES_VERSION_PATCH 0)
 SET(CERES_VERSION
     ${CERES_VERSION_MAJOR}.${CERES_VERSION_MINOR}.${CERES_VERSION_PATCH})
-SET(CERES_ABI_VERSION 1.7.0)
+SET(CERES_ABI_VERSION 1.8.0)
 
 ENABLE_TESTING()
 
diff --git a/docs/source/conf.py b/docs/source/conf.py
index f5ffb6de0..58026daa2 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -50,7 +50,7 @@ copyright = u'2013, Google Inc.'
 # The short X.Y version.
 version = '1.7'
 # The full version, including alpha/beta/rc tags.
-release = '1.7.0'
+release = '1.8.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/docs/source/version_history.rst b/docs/source/version_history.rst
index 93207a4d5..a6d6c8a2c 100644
--- a/docs/source/version_history.rst
+++ b/docs/source/version_history.rst
@@ -4,22 +4,36 @@
 Version History
 ===============
 
-HEAD
-====
+1.8.0
+=====
 
 New Features
 ------------
-#. ``DynamicNumericDiffCostFunction`` for numerically differentiated cost
-   functions whose sizing is determined at run time.
+#. Significant improved ``CMake`` files with better robustness,
+   dependency checking and GUI support. (Alex Stewart)
+#. ``DynamicNumericDiffCostFunction`` for numerically differentiated
+   cost functions whose sizing is determined at run time.
 #. ``NumericDiffCostFunction`` now supports a dynamic number of
    residuals just like ``AutoDiffCostFunction``.
-#. Significant refactoring of the ``CMake`` for increased robustness,
-   better dependency checking, better GUI support. (Alex Stewart)
+#. ``Problem`` exposes more of its structure in its API.
 #. Faster Automatic differentiation (Tim Langlois)
+#. Added the commonly occuring ``2_d_d`` template specialization for
+   the Schur Eliminator.
+#. Faster ``ITERATIVE_SCHUR`` solver using template specializations.
+#. Faster ``SCHUR_JACOBI`` preconditioner construction.
+#. Faster ``AngleAxisRotatePoint``.
+#. Added support for multiple clustering algorithms in visibility
+   based preconditioning, including a new fast single linkage
+   clustering algorithm.
 
 Bug Fixes
 ---------
-
+#. Fix build on MSVC 2013 (Petter Strandmark)
+#. Fixed ``AngleAxisToRotationMatrix`` near zero.
+#. Move ``CERES_HASH_NAMESPACE`` macros to ``collections_port.h``.
+#. Fix handling of unordered_map/unordered_set on OSX 10.9.0.
+#. Explicitly link to libm for ``curve_fitting_c.c``. (Alex Stewart)
+#. Minor type conversion fix to autodiff.h
 #. Remove RuntimeNumericDiffCostFunction.
 #. Fix operator= ambiguity on some versions of Clang. (Alex Stewart)
 #. Various Lint cleanups (William Rucklidge & Jim Roseborough)
diff --git a/include/ceres/ceres.h b/include/ceres/ceres.h
index 7552a68e2..fca4907d3 100644
--- a/include/ceres/ceres.h
+++ b/include/ceres/ceres.h
@@ -34,8 +34,8 @@
 #ifndef CERES_PUBLIC_CERES_H_
 #define CERES_PUBLIC_CERES_H_
 
-#define CERES_VERSION 1.7.0
-#define CERES_ABI_VERSION 1.7.0
+#define CERES_VERSION 1.8.0
+#define CERES_ABI_VERSION 1.8.0
 
 #include "ceres/autodiff_cost_function.h"
 #include "ceres/autodiff_local_parameterization.h"
diff --git a/scripts/ceres-solver.spec b/scripts/ceres-solver.spec
index b3b6f0f58..1edae5394 100644
--- a/scripts/ceres-solver.spec
+++ b/scripts/ceres-solver.spec
@@ -1,9 +1,9 @@
 Name:           ceres-solver
-Version:        1.7.0
+Version:        1.8.0
 # Release candidate versions are messy. Give them a release of
 # e.g. "0.1.0%{?dist}" for RC1 (and remember to adjust the Source0
 # URL). Non-RC releases go back to incrementing integers starting at 1.
-Release:        0.3.0%{?dist}
+Release:        0.1.0%{?dist}
 Summary:        A non-linear least squares minimizer
 
 Group:          Development/Libraries
@@ -110,6 +110,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Oct 31 2013 Sameer Agarwal <sameeragarwal@google.com> - 1.8.0-0.1.0
+- Bump version
+
 * Thu Aug 29 2013 Taylor Braun-Jones <taylor@braun-jones.org> - 1.7.0-0.3.0
 - Bump version