[git] Assuan - branch, master, updated. libassuan-2.1.2-8-g61e24ad

[by Werner Koch]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPC library used by GnuPG".

The branch, master has been updated
       via  61e24ad79cb4477b32542399e48b56b3115ae1e7 (commit)
       via  261498de39a10a00d5035f2481d33319c983875f (commit)
      from  0fce017100c5896cf9dc1fcbd4a39053651c3910 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 61e24ad79cb4477b32542399e48b56b3115ae1e7
Author: Werner Koch <wk at gnupg.org>
Date:   Thu Dec 11 13:13:53 2014 +0100

    Post release updates
    
    --

diff --git a/NEWS b/NEWS
index 3d74644..1f6f992 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+Noteworthy changes in version 2.2.1 (unreleased) [C5/A5/R_]
+------------------------------------------------
+
+
 Noteworthy changes in version 2.2.0 (2014-12-11) [C5/A5/R0]
 ------------------------------------------------
 
diff --git a/configure.ac b/configure.ac
index 5cdf883..dffc18d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,7 +31,7 @@ min_automake_version="1.10"
 m4_define([mym4_package],[libassuan])
 m4_define([mym4_major], [2])
 m4_define([mym4_minor], [2])
-m4_define([mym4_micro], [0])
+m4_define([mym4_micro], [1])
 
 # 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
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 6229ddc..fc4e97d 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -28,8 +28,7 @@ assuan_TEXINFOS = lgpl.texi gpl.texi
 online: assuan.html assuan.pdf
 	set -e; \
 	echo "Uploading current manuals to www.gnupg.org ..."; \
-        user=werner ; \
+        user=werner ; webhost="ftp.gnupg.org"; \
 	(cd assuan.html && rsync -vr --exclude='.svn' .  \
-	  $${user}@cvs.gnupg.org:webspace/manuals/assuan/ ); \
-        rsync -v assuan.pdf $${user}@cvs.gnupg.org:webspace/manuals/
-
+	  $${user}@$${webhost}:webspace/manuals/assuan/ ); \
+        rsync -v assuan.pdf $${user}@$${webhost}:webspace/manuals/

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.

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)

-----------------------------------------------------------------------

Summary of changes:
 Makefile.am     |    1 -
 NEWS            |    8 +++++++-
 configure.ac    |   12 ++++++------
 doc/Makefile.am |    7 +++----
 4 files changed, 16 insertions(+), 12 deletions(-)


hooks/post-receive
-- 
IPC library used by GnuPG
http://git.gnupg.org