[proj] 01/04: New upstream version 5.0.0~rc4

[Bas Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch experimental
in repository proj.

commit 1c892e273beeeb5f5233fa05254b68ec6e21b5d0
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Feb 21 18:11:52 2018 +0100

    New upstream version 5.0.0~rc4
---
 NEWS                  |  2 +-
 README                | 10 ++++++++--
 src/proj_4D_api.c     |  1 +
 test/gie/builtins.gie |  4 ++--
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/NEWS b/NEWS
index 1f9aef2..c61bcd2 100644
--- a/NEWS
+++ b/NEWS
@@ -5,7 +5,7 @@ This version of PROJ introduces some significant extensions and
 improvements to (primarily) the geodetic functionality of the system.
 
 The main driver for introducing the new features is the emergence of
-dynamic reference frames, the increasing use of high accuracy GNNS,
+dynamic reference frames, the increasing use of high accuracy GNSS,
 and the related growing demand for accurate coordinate
 transformations.  While older versions of PROJ included some geodetic
 functionality, the new framework lays the foundation for turning PROJ
diff --git a/README b/README
index 91bdc27..58061b7 100644
--- a/README
+++ b/README
@@ -82,16 +82,22 @@ script out of the Visual C++ tree.
 
 The `makefile.vc` builds `proj.exe`, `proj.dll` and `proj.lib`.
 
+On Windows you have to set the PROJ_LIB environment variable to make
+sure that PROJ can find the resource files that it needs. For the
+default install directory you can set PROJ_LIB with:
+
+    C:\> set PROJ_LIB C:\PROJ\share
+
 
 ### Distribution files and format
 
 Sources are distributed in one or more files.  The principle elements
-of the system are in a compress tar file named `PROJ-x.y.z.tar.gz` where
+of the system are in a compress tar file named `proj-x.y.z.tar.gz` where
 "x" will indicate major release number, "y" indicates minor release
 number and "z" indicates the patch number of the release.
 
 In addition to the PROJ software package, a distribution of datum
 conversion grid files is also available. The grid package is
-distributed under the name `PROJ-datumgrid-x.y.zip`, where "x" is the
+distributed under the name `proj-datumgrid-x.y.zip`, where "x" is the
 major release version and "y" the minor release version numbers.
 The grid package can be downloaded from the PROJ.4 website.
diff --git a/src/proj_4D_api.c b/src/proj_4D_api.c
index dab4b40..fb20978 100644
--- a/src/proj_4D_api.c
+++ b/src/proj_4D_api.c
@@ -734,6 +734,7 @@ int proj_errno_reset (const PJ *P) {
 
     pj_ctx_set_errno (pj_get_ctx ((PJ *) P), 0);
     errno = 0;
+    pj_errno = 0;
     return last_errno;
 }
 
diff --git a/test/gie/builtins.gie b/test/gie/builtins.gie
index 66916cd..a8a440e 100644
--- a/test/gie/builtins.gie
+++ b/test/gie/builtins.gie
@@ -627,7 +627,7 @@ Chamberlin Trimetric
 -------------------------------------------------------------------------------
 operation +proj=chamb   +R=6400000    +lat_1=0.5 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.1 mm
+tolerance 0.5 mm
 accept  2 1
 expect  -27864.779586801 -223364.324593274
 accept  2 -1
@@ -4315,7 +4315,7 @@ van der Grinten II
 -------------------------------------------------------------------------------
 operation +proj=vandg2   +a=6400000    +lat_1=0.5 +lat_2=2
 -------------------------------------------------------------------------------
-tolerance 0.1 mm
+tolerance 0.5 mm
 accept  2 1
 expect  223395.247850437 111718.491037226
 accept  2 -1

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/proj.git