diff --git a/Makefile.am b/Makefile.am index 2dc02e7e..829cf14e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -34,7 +34,8 @@ ACLOCAL_AMFLAGS = -I m4 DISTCHECK_CONFIGURE_FLAGS = EXTRA_DIST = autogen.sh autogen.rc gpgme.spec.in \ - ChangeLog-2011 m4/ChangeLog-2011 contrib/ChangeLog-2011 + ChangeLog-2011 m4/ChangeLog-2011 contrib/ChangeLog-2011 \ + conf/whatisthis if RUN_GPG_TESTS diff --git a/NEWS b/NEWS index 20a80e8d..883159fe 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,12 @@ -Noteworthy changes in version 1.11.2 (unreleased) +Noteworthy changes in version 1.12.0 (2018-10-08) ------------------------------------------------- + * Enhanced the JSON based interface tool gpgme-json to support Native + Messaging as well as new Javascript code to support the browser + site. See lang/js/README for details. + + * Major overhaul of the Python language bindings documentation. + * Even for old versions of gpg a missing MDC will now lead to a decryption failure. @@ -9,6 +15,12 @@ Noteworthy changes in version 1.11.2 (unreleased) * New data function to create a data object from an estream. + * Add more interfaces to the C++ bindings. + + * Improved error codes on decryption failure. + + * Lots of minor fixes. + * Interface changes relative to the 1.11.1 release: ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ gpgme_data_new_from_estream NEW. @@ -25,6 +37,10 @@ Noteworthy changes in version 1.11.2 (unreleased) cpp: Context::getFlag NEW. cpp: Context::createKeyEx NEW. + [c=C32/A21/R0 cpp=C14/A8/R0 qt=C10/A3/R2] + + Release-info: https://dev.gnupg.org/T4109 + Noteworthy changes in version 1.11.1 (2018-04-20) ------------------------------------------------- diff --git a/conf/whatisthis b/conf/whatisthis new file mode 100644 index 00000000..9005fe99 --- /dev/null +++ b/conf/whatisthis @@ -0,0 +1,2 @@ +Configuration files may go here. Note that config.h.in is +auto-generated so that this file is not in git. diff --git a/configure.ac b/configure.ac index b190e4b1..af569ac0 100644 --- a/configure.ac +++ b/configure.ac @@ -27,8 +27,8 @@ min_automake_version="1.14" # commit and push so that the git magic is able to work. See below # for the LT versions. m4_define(mym4_version_major, [1]) -m4_define(mym4_version_minor, [11]) -m4_define(mym4_version_micro, [2]) +m4_define(mym4_version_minor, [12]) +m4_define(mym4_version_micro, [0]) # Below is m4 magic to extract and compute the revision number, the # decimalized short revision number, a beta version string, and a flag @@ -54,15 +54,15 @@ AC_INIT([gpgme],[mym4_full_version],[http://bugs.gnupg.org]) # (Interfaces added: AGE++) # (Interfaces removed/changed: AGE=0) # -LIBGPGME_LT_CURRENT=31 -LIBGPGME_LT_AGE=20 -LIBGPGME_LT_REVISION=1 +LIBGPGME_LT_CURRENT=32 +LIBGPGME_LT_AGE=21 +LIBGPGME_LT_REVISION=0 # If there is an ABI break in gpgmepp or qgpgme also bump the # version in IMPORTED_LOCATION in the GpgmeppConfig-w32.cmake.in.in -LIBGPGMEPP_LT_CURRENT=13 -LIBGPGMEPP_LT_AGE=7 +LIBGPGMEPP_LT_CURRENT=14 +LIBGPGMEPP_LT_AGE=8 LIBGPGMEPP_LT_REVISION=0 LIBQGPGME_LT_CURRENT=10 diff --git a/lang/qt/tests/Makefile.am b/lang/qt/tests/Makefile.am index bfe77ad5..08b1c4c8 100644 --- a/lang/qt/tests/Makefile.am +++ b/lang/qt/tests/Makefile.am @@ -68,7 +68,7 @@ noinst_PROGRAMS = t-keylist t-keylocate t-ownertrust t-tofuinfo t-encrypt \ CLEANFILES = secring.gpg pubring.gpg pubring.kbx trustdb.gpg dirmngr.conf \ gpg-agent.conf pubring.kbx~ S.gpg-agent gpg.conf pubring.gpg~ \ random_seed S.gpg-agent .gpg-v21-migrated pubring-stamp $(moc_files) \ - gpg.conf tofu.db + gpg.conf tofu.db reader_0.status reader_1.status clean-local: -$(TESTS_ENVIRONMENT) $(top_srcdir)/tests/start-stop-agent --stop diff --git a/src/gpgme.h.in b/src/gpgme.h.in index 17315939..3bf968e1 100644 --- a/src/gpgme.h.in +++ b/src/gpgme.h.in @@ -405,7 +405,7 @@ gpgme_pinentry_mode_t; #define GPGME_EXPORT_MODE_SECRET 16 #define GPGME_EXPORT_MODE_RAW 32 #define GPGME_EXPORT_MODE_PKCS12 64 -#define GPGME_EXPORT_MODE_NOUID 128 +#define GPGME_EXPORT_MODE_NOUID 128 /* Experimental(!)*/ typedef unsigned int gpgme_export_mode_t;