[Pkg-gnupg-commit] [gpgme] 72/412: Merge branch 'master' into justus/pyme3

[Daniel Kahn Gillmor]

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

dkg pushed a commit to branch master
in repository gpgme.

commit f531608539b45f0bbd036f430943b390ec21aa65
Merge: a7fbd52 fc38c15
Author: Justus Winter <justus at gnupg.org>
Date:   Tue May 10 13:03:34 2016 +0200

    Merge branch 'master' into justus/pyme3

 AUTHORS                          |    2 +-
 NEWS                             |   52 +-
 build-aux/git-hooks/commit-msg   |    6 +
 configure.ac                     |   22 +-
 doc/HACKING                      |   48 +-
 doc/gpgme.texi                   |  158 +++-
 doc/lesser.texi                  |   13 +-
 src/Makefile.am                  |    1 +
 src/argparse.c                   | 1609 ++++++++++++++++++++++++++++++++++++++
 src/argparse.h                   |  203 +++++
 src/context.h                    |    7 +
 src/conversion.c                 |    1 +
 src/data-compat.c                |    2 +-
 src/data-mem.c                   |    3 +-
 src/debug.c                      |   31 +-
 src/debug.h                      |   63 +-
 src/decrypt.c                    |   19 +
 src/delete.c                     |   36 +-
 src/encrypt.c                    |    9 +
 src/engine-assuan.c              |   10 +-
 src/engine-backend.h             |    6 +-
 src/engine-g13.c                 |   10 +-
 src/engine-gpg.c                 |   34 +-
 src/engine-gpgsm.c               |  104 ++-
 src/engine-uiserver.c            |   10 +-
 src/engine.c                     |   10 +-
 src/engine.h                     |    9 +-
 src/export.c                     |   35 +-
 src/funopen.c                    |    2 +-
 src/genkey.c                     |   26 +
 src/gpgme-tool.c                 |  557 ++-----------
 src/gpgme.c                      |  150 +++-
 src/gpgme.def                    |    8 +
 src/gpgme.h.in                   |  499 +++++++-----
 src/keylist.c                    |   13 +-
 src/libgpgme.vers                |    8 +
 src/op-support.c                 |   24 +
 src/ops.h                        |    4 +
 src/passphrase.c                 |   43 +-
 src/passwd.c                     |   17 +
 src/posix-io.c                   |   13 +
 src/posix-util.c                 |    9 +
 src/sign.c                       |   15 +-
 src/status-table.c               |    2 +
 src/sys-util.h                   |    5 +
 src/verify.c                     |   16 +
 src/versioninfo.rc.in            |    2 +-
 src/w32-glib-io.c                |    2 +-
 src/w32-io.c                     |   13 +-
 src/w32-util.c                   |  175 +++--
 src/wait-global.c                |    4 +-
 src/wait-private.c               |    6 +-
 tests/Makefile.am                |    3 +-
 tests/gpg/Makefile.am            |   23 +-
 tests/gpg/final.test             |    2 +-
 tests/gpg/initial.test           |    2 +-
 tests/gpgsm/Makefile.am          |   20 +-
 tests/gpgsm/final.test           |    5 +
 tests/gpgsm/initial.test         |    4 +
 tests/run-export.c               |   41 +-
 tests/run-keylist.c              |   18 +-
 tests/run-sign.c                 |   26 +
 tests/{gpg => }/start-stop-agent |    0
 tests/t-data.c                   |    2 +-
 64 files changed, 3293 insertions(+), 979 deletions(-)

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