aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrank Warmerdam <warmerdam@pobox.com>2009-09-24 02:26:05 +0000
committerFrank Warmerdam <warmerdam@pobox.com>2009-09-24 02:26:05 +0000
commit85bd0a82fa3d7b72a068afdfda24bdaa9346f8a2 (patch)
treebed38e52b11715bc7d6a75c1863fa4b0e8969ae7
parenta26eeddef9022ffdcdcc6bc5b301346d2da22f7a (diff)
downloadPROJ-85bd0a82fa3d7b72a068afdfda24bdaa9346f8a2.tar.gz
PROJ-85bd0a82fa3d7b72a068afdfda24bdaa9346f8a2.zip
prepare for 4.7.0 release
git-svn-id: http://svn.osgeo.org/metacrs/proj/trunk@1631 4e78687f-474d-0410-85f9-8d5e500ac6b2
-rw-r--r--ChangeLog2
-rw-r--r--HOWTO-RELEASE2
-rw-r--r--NEWS13
-rw-r--r--configure.in2
-rw-r--r--src/Makefile.am2
-rw-r--r--src/pj_release.c2
-rw-r--r--src/proj_api.h2
7 files changed, 20 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index c43d062c..6045b7c8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2009-09-23 Frank Warmerdam <warmerdam@pobox.com>
+ * Preparing for 4.7.0 release.
+
* src/pj_init.c: Temporarily set locale to "C" to avoid locale
specific number parsing (#49).
diff --git a/HOWTO-RELEASE b/HOWTO-RELEASE
index 05ae04b9..f1bc9c09 100644
--- a/HOWTO-RELEASE
+++ b/HOWTO-RELEASE
@@ -1,7 +1,7 @@
Preparing a PROJ.4 Release
==========================
-1) Update the version number in configure.in (in AM_INIT_AUTOMAKE()).
+1) Update the version number in configure.in (in AC_INIT()).
2) Update the version number in proj_api.h (#define PJ_VERSION).
diff --git a/NEWS b/NEWS
index 0212aeed..a5bdb2f8 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,16 @@
+4.7.0 Release Notes
+-------------------
+
+ o Added in memory caching of init file search results for substantial
+ acceleration in some application environments (like MapServer).
+
+ o Regenerated nad/epsg init file with EPSG 7.1 database, including new
+ support for Google Mercator (EPSG:3857).
+
+ o Various thread safety improvements, including preliminary support for
+ a mutex lock around some operations, like grid loading.
+
+
4.6.1 Release Notes
-------------------
diff --git a/configure.in b/configure.in
index 4431a97b..0159ec15 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.6.1, [warmerdam@pobox.com], proj)
+AC_INIT([PROJ.4 Projections], 4.7.0, [warmerdam@pobox.com], proj)
AC_LANG(C)
diff --git a/src/Makefile.am b/src/Makefile.am
index a22343a6..676ae916 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -21,7 +21,7 @@ geod_LDADD = libproj.la
lib_LTLIBRARIES = libproj.la
-libproj_la_LDFLAGS = -no-undefined -version-info 5:5:5
+libproj_la_LDFLAGS = -no-undefined -version-info 6:6:6
libproj_la_SOURCES = \
projects.h pj_list.h \
diff --git a/src/pj_release.c b/src/pj_release.c
index e46cf9a0..d1e22095 100644
--- a/src/pj_release.c
+++ b/src/pj_release.c
@@ -2,7 +2,7 @@
#include <projects.h>
-char const pj_release[]="Rel. 4.6.1, 21 August 2008";
+char const pj_release[]="Rel. 4.7.1, 23 September 2009";
const char *pj_get_release()
diff --git a/src/proj_api.h b/src/proj_api.h
index f0efcbe5..d1f643b6 100644
--- a/src/proj_api.h
+++ b/src/proj_api.h
@@ -40,7 +40,7 @@ extern "C" {
#endif
/* Try to update this every version! */
-#define PJ_VERSION 461
+#define PJ_VERSION 470
extern char const pj_release[]; /* global release id string */