Increment version to 4.9.2 in preparation for release

8 files changed, 86 insertions, 40 deletions

diff --git a/.gitignore b/.gitignore
index 0868c086..3981c24b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,8 @@ CMakeFiles
 CMakeCache.txt
 CTestTestfile.cmake
 cmake_install.cmake
+install_manifest.txt
+cmake/project-config*.cmake
 
 /*.manifest
 /*.swp
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6b3734b0..8bd0f260 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -31,9 +31,9 @@ colormsg(_HIBLUE_ "Configuring PROJ:")
 #PROJ version information
 #################################################################################
 include(Proj4Version)
-proj_version(MAJOR 4 MINOR 9 PATCH 1)
-set(PROJ_API_VERSION "9")
-set(PROJ_BUILD_VERSION "9.0.0")
+proj_version(MAJOR 4 MINOR 9 PATCH 2)
+set(PROJ_API_VERSION "10")
+set(PROJ_BUILD_VERSION "10.0.1")
 
 #################################################################################
 # Build features and variants
diff --git a/ChangeLog b/ChangeLog
index f56821f6..ab3ece16 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,20 +1,59 @@
+2015-05-25 Elliott Sales de Andrade <https://github.com/QuLogic>
+	* : Fix inverse stereo projection on an ellipsoid
+	https://github.com/OSGeo/proj.4/pull/277
+
+2015-09-08 Charles Karney <https://github.com/cffk>
+	* : Update Geodesic library from GeographicLib
+		* Improve accuracy of calculations by evaluating trigonometric
+		  functions more carefully and replacing the series for the reduced
+		  length with one with a smaller truncation error.
+		* The allowed ranges for longitudes and azimuths is now unlimited; it
+		  used to be [-540d, 540d).
+		* Enforce the restriction of latitude to [-90d, 90d] by returning NaNs
+		  if the latitude is outside this range.
+		* The inverse calculation sets s12 to zero for coincident points at
+		  pole (instead of returning a tiny quantity).
+		* This commit also includes a work-around for an inaccurate value for
+		  pi/180 in dmstor.c (see the definitions of DEG_IN and DEG_OUT in
+		  geod_interface.c).
+
+2015-09-06 Even Rouault <even.rouault@spatialys.com>
+	* re-add proj_def.dat which was missing from source distribution
+	https://github.com/OSGeo/proj.4/issues/274
+	https://github.com/OSGeo/proj.4/issues/296 and
+	https://github.com/OSGeo/proj.4/issues/297
+
+2015-06-01 Charles Karney <https://github.com/cffk>
+	Make PJ_aeqd.c use geodesics for inverse and forward projection
+	modification so that the geodesic structure is not global
+	https://github.com/OSGeo/proj.4/pull/281
+
 2015-07-27 Even Rouault <even.rouault@spatialys.com>
 	* : Remove setlocale() use in pj_init_ctx(), and replace uses of atof() &
 	strtod() by their locale safe variants pj_atof() and pj_strtod().
 	Proj versions from now advertize #define PJ_LOCALE_SAFE 1 in proj_api.h
 	and export pj_atof() & pj_strtod() (#226)
 
+2015-06-01 Charles Karney <https://github.com/cffk>
+	Make PJ_aeqd.c use geodesics for inverse and forward projection
+	modification so that the geodesic structure is not global
+	https://github.com/OSGeo/proj.4/pull/281
+
+2015-05-25 Elliott Sales de Andrade <https://github.com/QuLogic>
+	* : Fix inverse stereo projection on an ellipsoid
+	https://github.com/OSGeo/proj.4/pull/277
+
 2015-02-21 Even Rouault <even.rouault@spatialys.com>
 	* nad/epsg: regenerate nad/epsg with GDAL r28536 to avoid
 	precision loss in TOWGS84 parameters, e.g. on Amersfoort / RD
 	EPSG:4289 (#260)
 
 2015-02-21 Howard Butler <howard@hobu.co>
-	* cmake/Proj4Version.cmake src\lib_proj.cmake: Align 
+	* cmake/Proj4Version.cmake src\lib_proj.cmake: Align
 	SOVERSION CMake configuration with autotools #263
 
 2015-02-21 Howard Butler <howard@hobu.co>
-	* src/lib_proj.cmake: define PROJ_LIB as part 
+	* src/lib_proj.cmake: define PROJ_LIB as part
 	of the compilation defines #261
 
 2015-02-21 Even Rouault <even.rouault@spatialys.com>
@@ -54,9 +93,9 @@
 	files for dist-all target
 
 2015-02-20 Howard Butler <howard@hobu.co>
-	* CMakeLists.txt cmake/Proj4Mac.cmake 
-	man/CMakeLists.txt src/bin_cs2cs.cmake 
-	src/lib_proj.cmake: Adapt Charles Karney 
+	* CMakeLists.txt cmake/Proj4Mac.cmake
+	man/CMakeLists.txt src/bin_cs2cs.cmake
+	src/lib_proj.cmake: Adapt Charles Karney
 	CMake patches for smoother build #258
 
 2015-02-20 Howard Butler <howard@hobu.co>
@@ -64,24 +103,24 @@
 	and config.sub
 
 2015-02-17 Howard Butler <howard@hobu.co>
-	* src/PJ_aitoff.c: #250 Inverse solution for Winkel Tripel 
-	from Drazan Tutic 
+	* src/PJ_aitoff.c: #250 Inverse solution for Winkel Tripel
+	from Drazan Tutic
 
 2015-02-17 Howard Butler <howard@hobu.co>
-	* CMakeLists.txt cmake/policies.cmake src/lib_proj.cmake: #256 
-	CMake tweaks to shut off some noisy policies, fix installation 
-	of proj_config header, and shut off Framework building by 
+	* CMakeLists.txt cmake/policies.cmake src/lib_proj.cmake: #256
+	CMake tweaks to shut off some noisy policies, fix installation
+	of proj_config header, and shut off Framework building by
 	default on OSX
 
 2015-02-17 Howard Butler <howard@hobu.co>
 	* src/lib_proj.cmake CMakeLists: Fix #248 healpix compilation typo
 
 2015-02-16 Howard Butler <howard@hobu.co>
-	* src/pj_init.c: Fix #237 warning about initialization 
+	* src/pj_init.c: Fix #237 warning about initialization
 	ordering due to setlocale
 
 2015-02-16 Howard Butler <howard@hobu.co>
-	* nad/Makefile.am nad/Makefile.in and others in nad/: Fix #247 to 
+	* nad/Makefile.am nad/Makefile.in and others in nad/: Fix #247 to
 	allow out-of-tree autoconf builds
 
 2014-09-17 Even Rouault <even.rouault@spatialys.com>
@@ -91,9 +130,9 @@
 
 2014-09-16  Frank Warmerdam  <warmerdam@pobox.com>
 
-	* Generate 4.9.0 RC2. 
+	* Generate 4.9.0 RC2.
 
-	* nad/epsg: updated with Pulkova 1942(58) reverted, and vertical 
+	* nad/epsg: updated with Pulkova 1942(58) reverted, and vertical
 	coordinate system names coming through properly.
 
 	* src/pj_gridinfo.c, pj_apply_vgridshift.c, pj_apply_gridshift.c:
diff --git a/HOWTO-RELEASE b/HOWTO-RELEASE
index cd4645f6..bc763f4f 100644
--- a/HOWTO-RELEASE
+++ b/HOWTO-RELEASE
@@ -3,25 +3,30 @@
 
 1) Update the version number in configure.in (in AC_INIT()).
 
+   1a) Update the version number in PROJ_BUILD_VERSION in CMakeLists.txt
+
 2) Update the version number in proj_api.h (#define PJ_VERSION).
 
 3) Update the version number, and date in src/pj_release.c.
 
-4) Update the version number in the -version-info definition in 
-   src/Makefile.am.  It consists of "current:revision:age".  Set 
+4) Update the version number in the -version-info definition in
+   src/Makefile.am.  It consists of "current:revision:age".  Set
    the same in the PROJ_SOVERSION variable in CMakeLists.txt
 
-   - If the library source code has changed at all since the last update, 
-     then increment revision (c:r:a becomes c:r+1:a). 
+   4a) Increment PROJ_BUILD_VERSION in CMakeLists.txt to follow
+       libtool versioning
+
+   - If the library source code has changed at all since the last update,
+     then increment revision (c:r:a becomes c:r+1:a).
 
-   - If any interfaces have been added, removed, or changed since the last 
-     update, increment current, and set revision to 0. 
+   - If any interfaces have been added, removed, or changed since the last
+     update, increment current, and set revision to 0.
 
-   - If any interfaces have been added since the last public release, then 
-     increment age. 
+   - If any interfaces have been added since the last public release, then
+     increment age.
 
-   - If any interfaces have been removed since the last public release, then 
-     set age to 0. 
+   - If any interfaces have been removed since the last public release, then
+     set age to 0.
 
 4.5) Run "autogen.sh" (hopefully on the same machine it was last run on)
 
@@ -36,33 +41,33 @@
     - %setup line
     - rm -rf line
 
-8) If this is a major release, prepare a branch. 
+8) If this is a major release, prepare a branch.
 
    svn copy https://svn.osgeo.org/metacrs/proj/trunk \
             https://svn.osgeo.org/metacrs/proj/branches/4.7
 
-9) Tag the release set in SVN 
+9) Tag the release set in SVN
 
    svn copy https://svn.osgeo.org/metacrs/proj/branches/4.7 \
             https://svn.osgeo.org/metacrs/proj/tags/4.7.0
 
 10) Do a "make dist-all" in the proj root directory.  After some grinding
    this should result in files like proj-4.4.3.tar.gz and proj-4.4.3.zip
-   being created.  These are full source distributions. 
+   being created.  These are full source distributions.
 
-11) Put these in the proj ftp area on /osgeo/download/proj on 
-   download.osgeo.org.  This can be done via scp using a command like the 
+11) Put these in the proj ftp area on /osgeo/download/proj on
+   download.osgeo.org.  This can be done via scp using a command like the
    following.
 
   scp proj-4.4.3.{tar.gz,zip} warmerdam@download.osgeo.org:/osgeo/download/proj
 
-12) Announce the new release on the PROJ.4 and MetaCRS mailing lists. 
+12) Announce the new release on the PROJ.4 and MetaCRS mailing lists.
 
-13) Issue a new release report on Freshmeat.  
+13) Issue a new release report on Freshmeat.
 
    http://freshmeat.net/projects/proj.4/
 
 NOTES:
 
  o Information about preparing binary releases, and RPMs should be formalized.
- o A "beta" release step should likely be incorporated. 
+ o A "beta" release step should likely be incorporated.
diff --git a/configure.in b/configure.in
index 20e929ca..095a191f 100644
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT([PROJ.4 Projections], 4.9.1, [warmerdam@pobox.com], proj)
+AC_INIT([PROJ.4 Projections], 4.9.2, [warmerdam@pobox.com], proj)
 AC_CONFIG_MACRO_DIR([m4])
 AC_LANG(C)
 
diff --git a/src/Makefile.am b/src/Makefile.am
index e53e7082..3344a7e6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -29,7 +29,7 @@ test228_LDADD = libproj.la @THREAD_LIB@
 
 lib_LTLIBRARIES = libproj.la
 
-libproj_la_LDFLAGS = -no-undefined -version-info 9:0:0
+libproj_la_LDFLAGS = -no-undefined -version-info 10:0:1
 
 libproj_la_SOURCES = \
 	pj_list.h \
diff --git a/src/pj_release.c b/src/pj_release.c
index f60b2204..c3736b44 100644
--- a/src/pj_release.c
+++ b/src/pj_release.c
@@ -2,7 +2,7 @@
 
 #include <projects.h>
 
-char const pj_release[]="Rel. 4.9.1, 04 March 2015";
+char const pj_release[]="Rel. 4.9.2, 08 September 2015";
 
 const char *pj_get_release()
 
diff --git a/src/proj_api.h b/src/proj_api.h
index ed11d6a4..99faeafb 100644
--- a/src/proj_api.h
+++ b/src/proj_api.h
@@ -38,7 +38,7 @@ extern "C" {
 #endif
 
 /* Try to update this every version! */
-#define PJ_VERSION 491
+#define PJ_VERSION 492
 
 /* pj_init() and similar functions can be used with a non-C locale */
 /* Can be detected too at runtime if the symbol pj_atof exists */
@@ -91,7 +91,7 @@ int pj_geodetic_to_geocentric( double a, double es,
                                long point_count, int point_offset,
                                double *x, double *y, double *z );
 int pj_compare_datums( projPJ srcdefn, projPJ dstdefn );
-int pj_apply_gridshift( projCtx, const char *, int, 
+int pj_apply_gridshift( projCtx, const char *, int,
                         long point_count, int point_offset,
                         double *x, double *y, double *z );
 void pj_deallocate_grids(void);