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

	Released GPGME 1.2.0.

diff --git a/ChangeLog b/ChangeLog
index 6be60e4f23809576801b1dc4bf34fb0f2582dce8..a4bac21533a71e144e0043f495d22235be0bae80 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2009-06-18  Marcus Brinkmann  <marcus@g10code.de>
 
+       Released GPGME 1.2.0.
+
        * configure.ac (my_version): Set to 1.2.0.
        (LIBGPGME_LT_CURRENT, LIBGPGME_LT_AGE): Bump.
        (LIBGPGME_LT_REVISION): Reset.

diff --git a/NEWS b/NEWS
index 6b967f3a42ef6d5279a140d45fc535c004948aae..ef5654d28674868bba89a87b30c6b8a7a03238e6 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,8 @@
+Noteworthy changes in version 1.2.1 (unreleased)
+------------------------------------------------
+
+ * (none yet)
+
 Noteworthy changes in version 1.2.0 (2009-06-18)
 ------------------------------------------------
 

diff --git a/configure.ac b/configure.ac
index 06cbb8658158d52fe8fb8a7214f6c76b22f0c87b..75d0c8f0ac4bd21be446b634c594513afb1531d6 100644 (file)
--- a/configure.ac
+++ b/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.2.0])
-m4_define(my_issvn, [no])
+m4_define(my_version, [1.2.1])
+m4_define(my_issvn, [yes])
 
 m4_define([svn_revision], m4_esyscmd([echo -n $( (svn info 2>/dev/null \
             || echo 'Revision: 0')|sed -n '/^Revision:/ {s/[^0-9]//gp;q;}')]))