2009-06-18 Marcus Brinkmann <marcus@g10code.de>

	* configure.ac (my_version): Set to 1.2.0.
	(LIBGPGME_LT_CURRENT, LIBGPGME_LT_AGE): Bump.
	(LIBGPGME_LT_REVISION): Reset.

diff --git a/trunk/ChangeLog b/trunk/ChangeLog
index 886249bf7482b834ecee448e0fdbef090d20db36..6be60e4f23809576801b1dc4bf34fb0f2582dce8 100644 (file)
--- a/trunk/ChangeLog
+++ b/trunk/ChangeLog
@@ -1,3 +1,9 @@
+2009-06-18  Marcus Brinkmann  <marcus@g10code.de>
+
+       * configure.ac (my_version): Set to 1.2.0.
+       (LIBGPGME_LT_CURRENT, LIBGPGME_LT_AGE): Bump.
+       (LIBGPGME_LT_REVISION): Reset.
+
 2009-05-05  Marcus Brinkmann  <marcus@g10code.de>
 
        * configure.ac: Add infrastructure for compile time check of

diff --git a/trunk/NEWS b/trunk/NEWS
index 449dcbf9243ada0c9d581658f69a558e78aab9f6..6b967f3a42ef6d5279a140d45fc535c004948aae 100644 (file)
--- a/trunk/NEWS
+++ b/trunk/NEWS
@@ -1,4 +1,4 @@
-Noteworthy changes in version 1.2.0 (unreleased)
+Noteworthy changes in version 1.2.0 (2009-06-18)
 ------------------------------------------------
 
  * New encryption flag GPGME_ENCRYPT_NO_ENCRYPT_TO to disable default

diff --git a/trunk/configure.ac b/trunk/configure.ac
index f02ca8bae1ee5fe4129756adc2ea7249be55ec21..fd17cae8a6d134ba60ba921a203eee9c4ea9e11c 100644 (file)
--- a/trunk/configure.ac
+++ b/trunk/configure.ac
@@ -31,8 +31,8 @@ min_automake_version="1.10"
 # specific feature can already be done under the assumption that the
 # SVN version is the most recent one in a branch.  To disable the SVN
 # version for the real release, set the my_issvn macro to no.
-m4_define(my_version, [1.1.9])
-m4_define(my_issvn, [yes])
+m4_define(my_version, [1.2.0])
+m4_define(my_issvn, [no])
 
 m4_define([svn_revision], m4_esyscmd([echo -n $( (svn info 2>/dev/null \
             || echo 'Revision: 0')|sed -n '/^Revision:/ {s/[^0-9]//gp;q;}')]))
@@ -47,11 +47,11 @@ AC_INIT([gpgme],
 #   (Interfaces added:                 AGE++)
 #   (Interfaces removed/changed:       AGE=0)
 #
-LIBGPGME_LT_CURRENT=17
+LIBGPGME_LT_CURRENT=18
 # Subtract 2 from this value if you want to make the LFS transition an
 # ABI break.  [Note to self: Remove this comment with the next regular break.]
-LIBGPGME_LT_AGE=6
-LIBGPGME_LT_REVISION=6
+LIBGPGME_LT_AGE=7
+LIBGPGME_LT_REVISION=0`
 
 # If the API is changed in an incompatible way: increment the next counter.
 GPGME_CONFIG_API_VERSION=1