[svn] gpgme - r1149 - trunk

[svn author wk]

Author: wk
Date: 2006-01-03 19:40:33 +0100 (Tue, 03 Jan 2006)
New Revision: 1149

Modified:
   trunk/ChangeLog
   trunk/configure.ac
Log:
Append revision number to the version string


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2006-01-03 18:31:48 UTC (rev 1148)
+++ trunk/ChangeLog	2006-01-03 18:40:33 UTC (rev 1149)
@@ -1,3 +1,7 @@
+2006-01-03  Werner Koch  <wk at g10code.com>
+
+	* configure.ac: Append SVN revision to the version.
+
 2005-11-18  Werner Koch  <wk at g10code.com>
 
 	* configure.ac (BUILD_REVISION): New.

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2006-01-03 18:31:48 UTC (rev 1148)
+++ trunk/configure.ac	2006-01-03 18:40:33 UTC (rev 1149)
@@ -25,7 +25,24 @@
 
 # Version number: Remember to change it immediately *after* a release.
 #                 Make sure to run  "svn up" before a "make dist".
-AC_INIT(gpgme, 1.1.1-cvs, [bug-gpgme at gnupg.org])
+#                 See below for the LT versions.
+#
+# The CVS version is usually the next intended release version with
+# the string "-cvs" appended.  The reason for this is that tests for a
+# specific feature can already be done under the assumption that the
+# CVS version is the most recent one in a branch.  To disable the CVS
+# version for the real release, just comment out the my_iscvs macro.
+# Note, that we are now using Subversion instead of CVS and append the
+# SVN revision number to the "cvs" suffix.  To make this most useful
+# for snapshot releases please do an "svn up" right before recreating
+# the configure script, so that a proper revision number for all files
+# is available when running a "make distcheck".
+m4_define(my_version, [1.1.1])
+m4_define(my_iscvs, yes)
+AC_INIT([gpgme], my_version[]m4_ifdef([my_iscvs], [-cvs[]m4_translit(
+               [$Revision$],[Ra-z $:])]),
+               [bug-gpgme at gnupg.org])
+
 # LT Version numbers, remember to change them just *before* a release.
 #   (Code changed:			REVISION++)
 #   (Interfaces added/removed/changed:	CURRENT++, REVISION=0)