[geos-commits] r2721 - in branches/3.1: . capi source/headers/geos

[svn_geos at osgeo.org]

Author: pramsey
Date: 2009-11-18 13:58:12 -0500 (Wed, 18 Nov 2009)
New Revision: 2721

Modified:
   branches/3.1/HOWTO_RELEASE
   branches/3.1/capi/geos_c.h.in
   branches/3.1/configure.in
   branches/3.1/source/headers/geos/version.h.vc
Log:
Reverse the upgrade process a bit, bump up revision numbers *after* release so that the repo version is always one higher than the release version. (#287)


Modified: branches/3.1/HOWTO_RELEASE
===================================================================
--- branches/3.1/HOWTO_RELEASE	2009-11-18 18:57:49 UTC (rev 2720)
+++ branches/3.1/HOWTO_RELEASE	2009-11-18 18:58:12 UTC (rev 2721)
@@ -1,12 +1,39 @@
+1: Verify that the versions currently set (see 10 and 11 below) make
+   sense for this release.
 
-1: Increment CAPI_INTERFACE_X in configure.in
+2: Run 'make distcheck', fix any problem with it.
+
+3: Generate the ChangeLog by running 'make cl'
+
+4: Update the NEWS file (extract most important things from the ChangeLog)
+
+5. Commit the new ChangeLog and NEWS files.
+
+6: Tag the release:
+   $ base=http://svn.osgeo.org/geos/
+   $ svn copy -m "Tagged release MAJOR.MINOR.PATCH" \
+		$base/trunk $base/tags/MAJOR.MINOR.PATCH
+
+7: Export the tag and 'make dist'. Un-gzip the tarball and bzip2 it
+   instead. 
+   $ svn export http://svn.osgeo.org/geos/tags/MAJOR.MINOR.PATCH 
+   $ cd MAJOR.MINOR.PATCH
+   $ ./autogen ; ./configure ; make dist
+   $ gzip -d geos-MAJOR.MINOR-PATCH.tar.gz
+   $ bzip2 geos-MAJOR.MINOR-PATCH.tar
+
+8: Copy the tarball to upload.osgeo.org:/download_data/download/geos
+
+9: Increment all the version numbers for the next release, as below.
+
+10: Increment CAPI_INTERFACE_X in configure.in
    - For a release with no interface changes just bump REVISION.
      [ Even if *nothing* changed in CAPI ]
    - Adding interfaces, bump CURRENT/AGE, set REVISION to 0.
    - Deleting interfaces / compatibility issues - bump CURRENT, others to zero
      [ THIS MUST BE CAREFULLY AVOIDED ]
 
-2: Increment release version:
+11: Increment release version:
    - In configure.in
    - In source/headers/geos/version.h.vc
    - In capi/geos_c.h.in
@@ -15,16 +42,3 @@
      - VERSION_MAJOR for SUBSTANTIAL additions or C lib ABI break
        [ THIS MUST BE CAREFULLY AVOIDED ]
    
-3: Update the ChangeLog by running svn2cl. Commit the new ChangeLog
-
-4: Update the NEWS file (extract most important things from the ChangeLog)
-
-5: make distcheck
-
-6: check everything is ok ;)
-   ./configure ; make ; make check
-
-7: Tag the release:
-   $ base=http://svn.osgeo.org/geos/
-   $ svn copy -m "Tagged release MAJOR.MINOR.PATCH" \
-		$base/trunk $base/tags/MAJOR.MINOR.PATCH

Modified: branches/3.1/capi/geos_c.h.in
===================================================================
--- branches/3.1/capi/geos_c.h.in	2009-11-18 18:57:49 UTC (rev 2720)
+++ branches/3.1/capi/geos_c.h.in	2009-11-18 18:58:12 UTC (rev 2721)
@@ -54,8 +54,8 @@
 #include <geos/version.h>
 #define GEOS_CAPI_VERSION_MAJOR 1
 #define GEOS_CAPI_VERSION_MINOR 6
-#define GEOS_CAPI_VERSION_PATCH 0
-#define GEOS_CAPI_VERSION "3.1.1-CAPI-1.6.0"
+#define GEOS_CAPI_VERSION_PATCH 1
+#define GEOS_CAPI_VERSION "3.1.2-CAPI-1.6.1"
 #else
 #ifndef GEOS_VERSION_MAJOR
 #define GEOS_VERSION_MAJOR @VERSION_MAJOR@

Modified: branches/3.1/configure.in
===================================================================
--- branches/3.1/configure.in	2009-11-18 18:57:49 UTC (rev 2720)
+++ branches/3.1/configure.in	2009-11-18 18:58:12 UTC (rev 2721)
@@ -16,7 +16,7 @@
 
 dnl -- Version info for the CAPI
 CAPI_INTERFACE_CURRENT=7
-CAPI_INTERFACE_REVISION=0
+CAPI_INTERFACE_REVISION=1
 CAPI_INTERFACE_AGE=6
 
 dnl
@@ -25,7 +25,7 @@
 dnl
 VERSION_MAJOR=3
 VERSION_MINOR=1
-VERSION_PATCH=1
+VERSION_PATCH=2
 VERSION="$VERSION_MAJOR.$VERSION_MINOR.$VERSION_PATCH"
 
 dnl CAPI_VERSION_MAJOR=$(($CAPI_INTERFACE_CURRENT-$CAPI_INTERFACE_AGE))

Modified: branches/3.1/source/headers/geos/version.h.vc
===================================================================
--- branches/3.1/source/headers/geos/version.h.vc	2009-11-18 18:57:49 UTC (rev 2720)
+++ branches/3.1/source/headers/geos/version.h.vc	2009-11-18 18:58:12 UTC (rev 2721)
@@ -35,11 +35,11 @@
 #endif
 
 #ifndef GEOS_VERSION_PATCH
-#define GEOS_VERSION_PATCH 1
+#define GEOS_VERSION_PATCH 2
 #endif
 
 #ifndef GEOS_VERSION
-#define GEOS_VERSION "3.1.1"
+#define GEOS_VERSION "3.1.2"
 #endif
 
 #ifndef GEOS_JTS_PORT