Prepare for release.

diff --git a/trunk/ChangeLog b/trunk/ChangeLog
index 4c77add17f6bb8393397589d57a4c1bf72b40b0e..0f4af8cf3b28e04e72b7014c583428ed40aa05c0 100644 (file)
--- a/trunk/ChangeLog
+++ b/trunk/ChangeLog
@@ -1,5 +1,7 @@
 2008-01-04  Marcus Brinkmann  <marcus@g10code.de>
 
+       Release GPGME 1.1.6.
+
        * configure.ac: Support gpgconf.
 
 2007-09-27  Marcus Brinkmann  <marcus@g10code.de>

diff --git a/trunk/NEWS b/trunk/NEWS
index d64a3ebcb90132f20f372cc4e905838532d0da6c..d268942cb7ef766bb0db6399d1cbaf85a9dad7a1 100644 (file)
--- a/trunk/NEWS
+++ b/trunk/NEWS
@@ -1,8 +1,12 @@
-Noteworthy changes in version 1.1.6 (unreleased)
+Noteworthy changes in version 1.1.6 (2008-01-04)
 ------------------------------------------------
 
  * Bug fixes for for W32.
 
+ * A new, experimental (and thus undocumented and potentially
+   unstable) interface for accessing gpg-conf through GPGME has been
+   added.
+
  * Interface changes relative to the 1.1.1 release:
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  gpgme_signature_t               EXTENDED: New field chain_model.

diff --git a/trunk/configure.ac b/trunk/configure.ac
index fcae5ab59649773740bb6ef6b03872ce4d87ad43..2449319650a53a3117d03cd150396a12552e5b0b 100644 (file)
--- a/trunk/configure.ac
+++ b/trunk/configure.ac
@@ -32,7 +32,7 @@ min_automake_version="1.9.3"
 # 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.6])
-m4_define(my_issvn, [yes])
+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;}')]))