[Pkg-gnupg-commit] [libassuan] 418/437: Release 2.2.0

[Eric Dorland]

This is an automated email from the git hooks/post-receive script.

eric pushed a commit to branch master
in repository libassuan.

commit 261498de39a10a00d5035f2481d33319c983875f
Author: Werner Koch <wk at gnupg.org>
Date:   Thu Dec 11 13:10:24 2014 +0100

    Release 2.2.0
    
    * configure.ac: Set LT version to C5/A5/R0.
    (AM_INIT_AUTOMAKE): Add options.
    * Makefile.am (AUTOMAKE_OPTIONS): Remove.
---
 Makefile.am  |  1 -
 NEWS         |  4 +++-
 configure.ac | 12 ++++++------
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 15b1533..ad8efca 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,7 +19,6 @@
 
 
 ACLOCAL_AMFLAGS = -I m4
-AUTOMAKE_OPTIONS = dist-bzip2 no-dist-gzip
 
 # (A suitable gitlog-to-changelog script can be found in GnuPG master.)
 GITLOG_TO_CHANGELOG=gitlog-to-changelog
diff --git a/NEWS b/NEWS
index a2611db..3d74644 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,8 @@
-Noteworthy changes in version 2.1.4 (unreleased) [C4/A4/R_]
+Noteworthy changes in version 2.2.0 (2014-12-11) [C5/A5/R0]
 ------------------------------------------------
 
+ * Added support for socket redirection.
+
  * Interface changes relative to the 2.1.3 release:
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  assuan_sock_set_sockaddr_un  NEW.
diff --git a/configure.ac b/configure.ac
index 2f09e98..5cdf883 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,8 +30,8 @@ min_automake_version="1.10"
 # for the LT versions.
 m4_define([mym4_package],[libassuan])
 m4_define([mym4_major], [2])
-m4_define([mym4_minor], [1])
-m4_define([mym4_micro], [4])
+m4_define([mym4_minor], [2])
+m4_define([mym4_micro], [0])
 
 # To start a new development series, i.e a new major or minor number
 # you need to mark an arbitrary commit before the first beta release
@@ -58,9 +58,9 @@ AC_INIT([mym4_package],[mym4_version], [http://bugs.gnupg.org])
 #   (Interfaces added:			AGE++)
 #   (Interfaces removed/changed:	AGE=0)
 #
-LIBASSUAN_LT_CURRENT=4
-LIBASSUAN_LT_AGE=4
-LIBASSUAN_LT_REVISION=3
+LIBASSUAN_LT_CURRENT=5
+LIBASSUAN_LT_AGE=5
+LIBASSUAN_LT_REVISION=0
 
 # If the API is changed in an incompatible way: increment the next counter.
 LIBASSUAN_CONFIG_API_VERSION=2
@@ -74,7 +74,7 @@ PACKAGE=$PACKAGE_NAME
 VERSION=$PACKAGE_VERSION
 
 AC_CONFIG_AUX_DIR([build-aux])
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([dist-bzip2 no-dist-gzip])
 AM_MAINTAINER_MODE
 AC_CONFIG_SRCDIR(src/assuan.h.in)
 AC_CONFIG_MACRO_DIR(m4)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/libassuan.git