[Gpg4win-commits] r1218 - trunk

[scm-commit@wald.intevation.org]

Author: werner
Date: 2009-07-29 09:55:07 +0200 (Wed, 29 Jul 2009)
New Revision: 1218

Modified:
   trunk/ChangeLog
   trunk/README
   trunk/configure.ac
Log:
Explain version numbers.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-07-29 06:15:03 UTC (rev 1217)
+++ trunk/ChangeLog	2009-07-29 07:55:07 UTC (rev 1218)
@@ -1,3 +1,7 @@
+2009-07-29  Werner Koch  <wk at g10code.com>
+
+	* README: Explain version numbering.
+
 2009-07-28  Colin Leroy  <colin at colino.net>
 
 	* patches/libetpan-0.54: Removed

Modified: trunk/README
===================================================================
--- trunk/README	2009-07-29 06:15:03 UTC (rev 1217)
+++ trunk/README	2009-07-29 07:55:07 UTC (rev 1218)
@@ -111,6 +111,27 @@
 and run configure as described above.
 
 
+Version numbers
+===============
+
+We use a specific order of version numbers.  This is best shown by an
+example:
+
+  1.0.0             - The final 1.0.0 release. 
+  1.0.1-svn1234     - A snapshot based on SVN revision 1234
+  1.0.1-svn1235     - A newer snapshot
+  1.0.1rc1-svn1236  - A snapshot while preparing for a release candidate
+  1.0.1rc1          - The first release candidate for 1.0.1
+  1.0.1-svn1240     - yet another snapshot
+  1.0.1             - The final 1.0.1 release
+
+The important point is that we bump up the version number before we do
+an release and append a suffix to mark it as a development version.
+This allows other software to use a configure check for the next to be
+released version of gpg4win.
+
+
+
 Copyright
 =========
 

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2009-07-29 06:15:03 UTC (rev 1217)
+++ trunk/configure.ac	2009-07-29 07:55:07 UTC (rev 1218)
@@ -25,7 +25,7 @@
 # Set my_issvn to "yes" for non-released code.  Remember to run an
 # "svn up" and "autogen.sh" right before creating a distribution.
 # Right after a release the make target "copy-news" is to be called!
-m4_define([my_version], [2.0.0rc1])
+m4_define([my_version], [2.0.0])
 m4_define([my_issvn], [yes])
 
 m4_define([svn_revision], m4_esyscmd([echo -n $( (svn info 2>/dev/null \