prepare for 4.8.0 beta1

git-svn-id: http://svn.osgeo.org/metacrs/proj/trunk@2167 4e78687f-474d-0410-85f9-8d5e500ac6b2

8 files changed, 40 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index 42ce3871..affb922b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2012-02-20  Frank Warmerdam  <warmerdam@pobox.com>
 
+	* Prepare 4.8.0 Beta1. 
+
 	* src/PJ_isea.c: Add Icosahedral Snyder Equal Area projection (#111)
 
 	* src/nad2nad.c: completely removed as part of the ctable2 overhaul.
diff --git a/HOWTO-RELEASE b/HOWTO-RELEASE
index 5f78cbad..8ae52131 100644
--- a/HOWTO-RELEASE
+++ b/HOWTO-RELEASE
@@ -22,7 +22,7 @@
    - If any interfaces have been removed since the last public release, then 
      set age to 0. 
 
-4.5) Run "automake" and "autoconf".
+4.5) Run "autgen.sh" (hopefully on the same machine it was last run on)
 
 5) Add a note to the ChangeLog that a new release is being issued, and what
    the release number is.
diff --git a/NEWS b/NEWS
index a5bdb2f8..4ad2f9f6 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,32 @@
+4.8.0 Release Notes
+-------------------
+
+ o Added HEALPIX, rHEALPIX and Icosahedral Snyder Equal Area projections.
+
+ o nad2bin now produces "CTable2" format grid shift files by default which
+   are platform independent.  
+
+ o Add pj_get_spheroid_defn() accessor.
+
+ o Added an alternate version of pj_init() that takes a projCtx (execution
+   context) structure to address multithreading issues with error management
+   and to provide a support for application hookable error reporting and
+   logging.
+
+ o Upgrade to EPSG 7.9.  Some changes in ideal datum selection.
+
+ o JNI bindings reworked, org.proj4.Projections deprecated in favor of 
+   org.proj4.PJ. 
+
+ o Added preliminary vertical datum support.
+
+ o Fix various multithreading issues, particular in datum grid handling code.
+
+ o Added support for the +axis= option for alternate axis orientations as
+   part of a coordinate system (used for TM South Orientated support).
+
+   
+
 4.7.0 Release Notes
 -------------------
 
diff --git a/configure.in b/configure.in
index a828736e..161d10e3 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.7.0, [warmerdam@pobox.com], proj)
+AC_INIT([PROJ.4 Projections], 4.8.0, [warmerdam@pobox.com], proj)
 AC_CONFIG_MACRO_DIR([m4])
 AC_LANG(C)
 
diff --git a/proj.spec b/proj.spec
index d3f9d437..2b05f6b7 100644
--- a/proj.spec
+++ b/proj.spec
@@ -1,5 +1,5 @@
 %define PACKAGE_NAME proj
-%define PACKAGE_VERSION 4.6.1
+%define PACKAGE_VERSION 4.8.0
 %define PACKAGE_URL http://trac.osgeo.org/proj
 %define _prefix /usr
 
@@ -7,7 +7,7 @@ Summary: Cartographic projection software
 Name: %PACKAGE_NAME
 Version: %PACKAGE_VERSION
 Release: 1
-Source0: proj-4.6.1.tar.gz
+Source0: proj-4.8.0.tar.gz
 Copyright: MIT License, Copyright (c) 2000, Frank Warmerdam
 Group: Applications/GIS
 Vendor: Intevation GmbH <http://intevation.net>
@@ -24,7 +24,7 @@ forward and inverse transformation of cartographic data to or from cartesian
 data with a wide range of selectable projection functions. 
 
 %prep
-%setup -D -n proj-4.6.1
+%setup -D -n proj-4.8.0
 %configure
 
 %build
@@ -35,7 +35,7 @@ rm -rf $RPM_BUILD_ROOT
 %makeinstall
 
 %clean
-rm -rf %{_builddir}/proj-4.6.1
+rm -rf %{_builddir}/proj-4.8.0
 rm -rf $RPM_BUILD_ROOT
 
 %files
diff --git a/src/Makefile.am b/src/Makefile.am
index c57342ae..b8d0e952 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -19,7 +19,7 @@ geod_LDADD = libproj.la
 
 lib_LTLIBRARIES = libproj.la
 
-libproj_la_LDFLAGS = -no-undefined -version-info 6:6:6
+libproj_la_LDFLAGS = -no-undefined -version-info 7:0:7
 
 libproj_la_SOURCES = \
 	projects.h pj_list.h \
diff --git a/src/Makefile.in b/src/Makefile.in
index 014aa181..3d3281ba 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -276,7 +276,7 @@ cs2cs_LDADD = libproj.la
 nad2bin_LDADD = libproj.la
 geod_LDADD = libproj.la
 lib_LTLIBRARIES = libproj.la
-libproj_la_LDFLAGS = -no-undefined -version-info 6:6:6
+libproj_la_LDFLAGS = -no-undefined -version-info 7:0:7
 libproj_la_SOURCES = \
 	projects.h pj_list.h \
 	PJ_aeqd.c PJ_gnom.c PJ_laea.c PJ_mod_ster.c \
diff --git a/src/pj_release.c b/src/pj_release.c
index d1e22095..eecfd869 100644
--- a/src/pj_release.c
+++ b/src/pj_release.c
@@ -2,7 +2,7 @@
 
 #include <projects.h>
 
-char const pj_release[]="Rel. 4.7.1, 23 September 2009";
+char const pj_release[]="Rel. 4.8.0, 20 February 2012";
 
 const char *pj_get_release()