From 62960c27e44ba1259bad509740a0a8b0925caa5e Mon Sep 17 00:00:00 2001 From: Kristian Evers Date: Thu, 24 May 2018 18:28:03 +0200 Subject: Update version numbers for 5.1.0 release --- CMakeLists.txt | 4 ++-- configure.ac | 2 +- src/Makefile.am | 2 +- src/pj_release.c | 2 +- src/proj_api.h | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d7afe060..5e56c102 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -58,8 +58,8 @@ colormsg(_HIBLUE_ "Configuring PROJ:") ################################################################################# include(ProjVersion) proj_version(MAJOR 5 MINOR 0 PATCH 0) -set(PROJ_API_VERSION "13") -set(PROJ_BUILD_VERSION "13.0.1") +set(PROJ_API_VERSION "14") +set(PROJ_BUILD_VERSION "14.0.2") ################################################################################# # Build features and variants diff --git a/configure.ac b/configure.ac index e47e6b46..495fb037 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) -AC_INIT([PROJ], [5.0.0], +AC_INIT([PROJ], [5.1.0], [https://github.com/OSGeo/proj.4/issues], proj, [http://proj4.org]) AC_CONFIG_MACRO_DIR([m4]) AC_LANG(C) diff --git a/src/Makefile.am b/src/Makefile.am index 2fd8aa5c..74567695 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -40,7 +40,7 @@ geodtest_LDADD = libproj.la lib_LTLIBRARIES = libproj.la -libproj_la_LDFLAGS = -no-undefined -version-info 13:0:0 +libproj_la_LDFLAGS = -no-undefined -version-info 14:0:2 libproj_la_SOURCES = \ pj_list.h proj_internal.h proj_math.h\ diff --git a/src/pj_release.c b/src/pj_release.c index 9545aad2..19ef6bf9 100644 --- a/src/pj_release.c +++ b/src/pj_release.c @@ -11,7 +11,7 @@ char const pj_release[] = STR(PROJ_VERSION_MAJOR)"." STR(PROJ_VERSION_MINOR)"." STR(PROJ_VERSION_PATCH)", " - "March 1st, 2018"; + "June 1st, 2018"; const char *pj_get_release() { return pj_release; diff --git a/src/proj_api.h b/src/proj_api.h index 36187441..9fdab08c 100644 --- a/src/proj_api.h +++ b/src/proj_api.h @@ -33,7 +33,7 @@ * */ #ifndef PJ_VERSION -#define PJ_VERSION 500 +#define PJ_VERSION 510 #endif -- cgit v1.2.3 From 08ae33432776368649ca30d6c314cc07c8eba445 Mon Sep 17 00:00:00 2001 From: Kristian Evers Date: Thu, 24 May 2018 18:28:48 +0200 Subject: Update man pages in preparation for new release --- man/man1/cct.1 | 47 ++++++++++----- man/man1/cs2cs.1 | 106 ++++++++++++++++++---------------- man/man1/geod.1 | 110 +++++++++++++++++------------------ man/man1/gie.1 | 162 ++++++++++++++++++++++++++++++++++++++++++---------- man/man1/proj.1 | 121 ++++++++++++++++++++------------------- man/man3/geodesic.3 | 2 +- man/man3/pj_init.3 | 4 +- 7 files changed, 342 insertions(+), 210 deletions(-) diff --git a/man/man1/cct.1 b/man/man1/cct.1 index 5ab6d314..3a4fdffc 100644 --- a/man/man1/cct.1 +++ b/man/man1/cct.1 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "CCT" "1" "Mar 18, 2018" "5.0.0" "PROJ.4" +.TH "CCT" "1" "May 24, 2018" "5.1.0" "PROJ.4" .SH NAME cct \- Coordinate Conversion and Transformation . @@ -33,17 +33,17 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .SH SYNOPSIS .INDENT 0.0 .INDENT 3.5 -\fBcct\fP [ \fB\-cotvz\fP [ args ] ] \fI+opts[=arg]\fP file[s] +\fBcct\fP [ \fB\-cIostvz\fP [ args ] ] \fI+opts[=arg]\fP file[s] .UNINDENT .UNINDENT .SH DESCRIPTION .sp \fBcct\fP a 4D equivalent to the \fBproj\fP projection program, -performs transformation coordinate systems on a set of input points. The -coordinate system transformation can include translation between projected +performs transformation coordinate systems on a set of input points. The +coordinate system transformation can include translation between projected and geographic coordinates as well as the application of datum shifts. .sp -The following control parameters can appear in any order: +The following control parameters can appear in any order: .INDENT 0.0 .TP .B \-c @@ -51,18 +51,32 @@ Specify input columns for (up to) 4 input parameters. Defaults to 1,2,3,4. .UNINDENT .INDENT 0.0 .TP +.B \-I +Do the inverse transformation. +.UNINDENT +.INDENT 0.0 +.TP .B \-o , \-\-output= Specify the name of the output file. .UNINDENT .INDENT 0.0 .TP .B \-t