[Pkg-gnupg-commit] [gpgme] 47/53: Merge branch 'upstream' into experimental
Daniel Kahn Gillmor
dkg at fifthhorseman.net
Mon Oct 24 19:26:53 UTC 2016
This is an automated email from the git hooks/post-receive script.
dkg pushed a commit to branch experimental
in repository gpgme.
commit 4f6e92e8408881df5f52ac90f833313d1625fcf0
Merge: 50e45de b88bd84
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date: Wed Oct 19 23:56:33 2016 -0400
Merge branch 'upstream' into experimental
ChangeLog | 353 ++++++++++++++++++++++
NEWS | 35 ++-
THANKS | 6 +-
VERSION | 2 +-
configure.ac | 21 +-
doc/ChangeLog-2011 | 2 +-
doc/gpgme.texi | 39 ++-
gpgme.spec | 2 +-
lang/cpp/src/GpgmeppConfig.cmake.in.in | 13 +-
lang/cpp/src/Makefile.am | 10 +-
lang/cpp/src/callbacks.cpp | 4 +
lang/cpp/src/configuration.cpp | 4 +
lang/cpp/src/context.cpp | 10 +-
lang/cpp/src/context.h | 4 +-
lang/cpp/src/context_vanilla.cpp | 4 +
lang/cpp/src/data.cpp | 10 +
lang/cpp/src/data.h | 5 +-
lang/cpp/src/decryptionresult.cpp | 4 +
lang/cpp/src/defaultassuantransaction.cpp | 4 +
lang/cpp/src/editinteractor.cpp | 4 +
lang/cpp/src/encryptionresult.cpp | 4 +
lang/cpp/src/engineinfo.cpp | 4 +
lang/cpp/src/eventloopinteractor.cpp | 4 +
lang/cpp/src/exception.cpp | 4 +
lang/cpp/src/gpgadduserideditinteractor.cpp | 4 +
lang/cpp/src/gpgagentgetinfoassuantransaction.cpp | 4 +
lang/cpp/src/gpgsetexpirytimeeditinteractor.cpp | 4 +
lang/cpp/src/gpgsetownertrusteditinteractor.cpp | 4 +
lang/cpp/src/gpgsignkeyeditinteractor.cpp | 4 +
lang/cpp/src/importresult.cpp | 4 +
lang/cpp/src/key.cpp | 25 ++
lang/cpp/src/key.h | 15 +
lang/cpp/src/keygenerationresult.cpp | 4 +
lang/cpp/src/keylistresult.cpp | 4 +
lang/cpp/src/scdgetinfoassuantransaction.cpp | 4 +
lang/cpp/src/signingresult.cpp | 4 +
lang/cpp/src/tofuinfo.cpp | 5 +
lang/cpp/src/trustitem.cpp | 4 +
lang/cpp/src/verificationresult.cpp | 38 +++
lang/cpp/src/verificationresult.h | 21 ++
lang/cpp/src/vfsmountresult.cpp | 4 +
lang/python/Makefile.am | 17 +-
lang/python/examples/inter-edit.py | 4 +-
lang/python/examples/testCMSgetkey.py | 2 +-
lang/python/examples/verifydetails.py | 2 +-
lang/python/gpgme.i | 92 ++++--
lang/python/helpers.c | 4 +
lang/python/helpers.h | 4 +
lang/python/pyme/core.py | 31 +-
lang/python/pyme/errors.py | 22 +-
lang/python/setup.py.in | 3 +-
lang/python/tests/support.py | 1 +
lang/python/tests/t-keylist.py | 23 ++
lang/python/tests/t-sig-notation.py | 1 +
lang/qt/src/AbstractImportJob | 1 +
lang/qt/src/Makefile.am | 18 +-
lang/qt/src/QGpgmeConfig.cmake.in.in | 13 +-
lang/qt/src/SpecialJob | 1 +
lang/qt/src/dataprovider.cpp | 6 +-
lang/qt/src/defaultkeygenerationjob.cpp | 4 +
lang/qt/src/gpgme_backend_debug.cpp | 4 +
lang/qt/src/job.cpp | 4 +
lang/qt/src/multideletejob.cpp | 117 +++++++
lang/qt/src/multideletejob.h | 2 +-
lang/qt/src/protocol.h | 6 +-
lang/qt/src/qgpgmeadduseridjob.cpp | 4 +
lang/qt/src/qgpgmebackend.cpp | 4 +
lang/qt/src/qgpgmechangeexpiryjob.cpp | 4 +
lang/qt/src/qgpgmechangeownertrustjob.cpp | 4 +
lang/qt/src/qgpgmechangepasswdjob.cpp | 4 +
lang/qt/src/qgpgmedecryptjob.cpp | 4 +
lang/qt/src/qgpgmedecryptverifyjob.cpp | 4 +
lang/qt/src/qgpgmedeletejob.cpp | 4 +
lang/qt/src/qgpgmedownloadjob.cpp | 4 +
lang/qt/src/qgpgmeencryptjob.cpp | 4 +
lang/qt/src/qgpgmeexportjob.cpp | 4 +
lang/qt/src/qgpgmeimportfromkeyserverjob.cpp | 4 +
lang/qt/src/qgpgmeimportjob.cpp | 4 +
lang/qt/src/qgpgmekeyformailboxjob.cpp | 4 +
lang/qt/src/qgpgmekeygenerationjob.cpp | 4 +
lang/qt/src/qgpgmekeylistjob.cpp | 4 +
lang/qt/src/qgpgmelistallkeysjob.cpp | 4 +
lang/qt/src/qgpgmenewcryptoconfig.cpp | 6 +-
lang/qt/src/qgpgmerefreshkeysjob.cpp | 6 +-
lang/qt/src/qgpgmesecretkeyexportjob.cpp | 6 +-
lang/qt/src/qgpgmesignencryptjob.cpp | 4 +
lang/qt/src/qgpgmesignjob.cpp | 4 +
lang/qt/src/qgpgmesignkeyjob.cpp | 4 +
lang/qt/src/qgpgmetofupolicyjob.cpp | 4 +
lang/qt/src/qgpgmeverifydetachedjob.cpp | 4 +
lang/qt/src/qgpgmeverifyopaquejob.cpp | 4 +
lang/qt/src/qgpgmewkspublishjob.cpp | 10 +-
lang/qt/src/qgpgmewkspublishjob.h | 2 +-
lang/qt/src/threadedjobmixin.cpp | 4 +
lang/qt/src/threadedjobmixin.h | 3 +-
lang/qt/src/wkspublishjob.h | 4 +-
lang/qt/tests/Makefile.am | 7 +-
lang/qt/tests/run-keyformailboxjob.cpp | 4 +
lang/qt/tests/t-encrypt.cpp | 36 ++-
lang/qt/tests/t-keylist.cpp | 4 +
lang/qt/tests/t-keylocate.cpp | 4 +
lang/qt/tests/t-ownertrust.cpp | 4 +
lang/qt/tests/t-support.cpp | 4 +
lang/qt/tests/t-support.h | 4 +-
lang/qt/tests/t-tofuinfo.cpp | 4 +
lang/qt/tests/{t-support.h => t-verify.cpp} | 80 +++--
lang/qt/tests/t-wkspublish.cpp | 20 +-
src/assuan-support.c | 14 +
src/b64dec.c | 2 +-
src/conversion.c | 56 ++++
src/data-identify.c | 2 +-
src/engine-gpg.c | 4 +-
src/gpgme.def | 2 +
src/gpgme.h.in | 6 +-
src/libgpgme.vers | 2 +
src/mbox-util.c | 20 +-
src/mbox-util.h | 2 +-
src/util.h | 10 +
src/w32-util.c | 39 +--
tests/ChangeLog-2011 | 8 +-
tests/gpg/Makefile.am | 12 +-
tests/gpg/geheim.txt | 2 +-
tests/gpg/{t-eventloop.c => t-cancel.c} | 171 +++++++----
tests/gpg/t-eventloop.c | 6 +-
tests/gpg/t-sig-notation.c | 1 +
tests/gpgsm/t-decrypt.c | 14 +-
126 files changed, 1503 insertions(+), 260 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gpgme.git
More information about the Pkg-gnupg-commit
mailing list