[git] GPGME - branch, master, updated. gpgme-1.3.2-32-g9c5733b
by Werner Koch
cvs at cvs.gnupg.org
Tue Feb 12 15:44:44 CET 2013
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 "GnuPG Made Easy".
The branch, master has been updated
via 9c5733b89f858e947f954c56c00a9fee227ef362 (commit)
via f48f75b1e812d33b76e439412efffa8277ab9abe (commit)
from 4f381554411ef019d79492f1751543f145604bcf (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 9c5733b89f858e947f954c56c00a9fee227ef362
Author: Werner Koch <wk at gnupg.org>
Date: Tue Feb 12 14:06:07 2013 +0100
Declare next version to be 1.4.0
--
diff --git a/NEWS b/NEWS
index 2678a21..2d6ccf1 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-Noteworthy changes in version 1.3.3 (unreleased)
+Noteworthy changes in version 1.4.0 (unreleased)
------------------------------------------------
* Interface changes relative to the 1.3.1 release:
diff --git a/README b/README
index 8b0cc36..be07a0f 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
GPGME - GnuPG Made Easy
---------------------------
- Copyright 2004, 2006, 2010, 2012 g10 Code GmbH
+ Copyright 2004, 2006, 2010, 2012, 2013 g10 Code GmbH
This file is free software; as a special exception the author gives
unlimited permission to copy and/or distribute it, with or without
diff --git a/configure.ac b/configure.ac
index af3788d..6ba74c3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,8 +34,8 @@ min_automake_version="1.11"
# the GIT version is the most recent one in a branch. To disable the
# GIT version for the real release, set the my_isgit macro to no.
m4_define(my_version_major, [1])
-m4_define(my_version_minor, [3])
-m4_define(my_version_micro, [3])
+m4_define(my_version_minor, [4])
+m4_define(my_version_micro, [0])
m4_define(my_isgit, [yes])
m4_define(my_version, [my_version_major.my_version_minor.my_version_micro])
commit f48f75b1e812d33b76e439412efffa8277ab9abe
Author: Werner Koch <wk at gnupg.org>
Date: Tue Feb 12 14:02:08 2013 +0100
Add macro GPGME_VERSION_NUMBER.
* src/gpgme.h.in (GPGME_VERSION_NUMBER): New.
* configure.ac (my_version_major, my_version_minor)
(my_version_micro): New m4 macros.
(my_version): Build from new m4 macros.
(VERSION_NUMBER): New ac_subst.
diff --git a/NEWS b/NEWS
index 1690272..2678a21 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,7 @@ Noteworthy changes in version 1.3.3 (unreleased)
* Interface changes relative to the 1.3.1 release:
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ GPGME_VERSION_NUMBER NEW.
gpgme_io_writen NEW.
gpgme_set_global_flag NEW.
gpgme_set_pinentry_mode NEW.
diff --git a/configure.ac b/configure.ac
index 75b6fcb..af3788d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -33,9 +33,12 @@ min_automake_version="1.11"
# for a specific feature can already be done under the assumption that
# the GIT version is the most recent one in a branch. To disable the
# GIT version for the real release, set the my_isgit macro to no.
-m4_define(my_version, [1.3.3])
+m4_define(my_version_major, [1])
+m4_define(my_version_minor, [3])
+m4_define(my_version_micro, [3])
m4_define(my_isgit, [yes])
+m4_define(my_version, [my_version_major.my_version_minor.my_version_micro])
m4_define([svn_revision], m4_esyscmd([printf "%d" $( (svn info 2>/dev/null \
|| echo 'Revision: 0')|sed -n '/^Revision:/ {s/[^0-9]//gp;q;}')]))
m4_define([git_revision],
@@ -64,9 +67,10 @@ GPGME_CONFIG_API_VERSION=1
NEED_LIBASSUAN_API=2
NEED_LIBASSUAN_VERSION=2.0.2
-
m4_define([git_brevis],m4_esyscmd(printf "%u" 0x[]m4_substr(git_revision,0,4)))
BUILD_REVISION=m4_if(git_revision,[],[svn_revision],[git_brevis])
+VERSION_NUMBER=m4_esyscmd(printf "0x%02x%02x%02x" \
+ my_version_major my_version_minor my_version_micro)
PACKAGE=$PACKAGE_NAME
VERSION=$PACKAGE_VERSION
@@ -100,6 +104,7 @@ AC_SUBST(LIBGPGME_LT_REVISION)
AC_SUBST(PACKAGE)
AC_SUBST(VERSION)
+AC_SUBST(VERSION_NUMBER)
AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of this package])
AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version of this package])
diff --git a/src/gpgme.h.in b/src/gpgme.h.in
index 9d9a556..12bd4ac 100644
--- a/src/gpgme.h.in
+++ b/src/gpgme.h.in
@@ -80,6 +80,10 @@ extern "C" {
library. */
#define GPGME_VERSION "@PACKAGE_VERSION@"
+/* The version number of this header. It may be used to handle minor
+ API incompatibilities. */
+#define GPGME_VERSION_NUMBER @VERSION_NUMBER@
+
/* Check for a matching _FILE_OFFSET_BITS definition. */
#if @NEED__FILE_OFFSET_BITS@
#ifndef _FILE_OFFSET_BITS
@@ -95,7 +99,7 @@ extern "C" {
/* Some opaque data types used by GPGME. */
-/* The context holds some global state and configration options, as
+/* The context holds some global state and configuration options, as
well as the results of a crypto operation. */
struct gpgme_context;
typedef struct gpgme_context *gpgme_ctx_t;
-----------------------------------------------------------------------
Summary of changes:
NEWS | 3 ++-
README | 2 +-
configure.ac | 9 +++++++--
src/gpgme.h.in | 6 +++++-
4 files changed, 15 insertions(+), 5 deletions(-)
hooks/post-receive
--
GnuPG Made Easy
http://git.gnupg.org
More information about the Gnupg-commits
mailing list