[Python-modules-commits] [python-gnutls] 03/08: merge patched into master

[Orestis Ioannou]

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

oorestisime-guest pushed a commit to branch master
in repository python-gnutls.

commit 199482bc497419fb8808d9b27dff1f8c8a0f279d
Merge: d16bab0 294e034
Author: Orestis Ioannou <orestis at oioannou.com>
Date:   Sun Apr 10 17:23:37 2016 +0200

    merge patched into master

 ChangeLog                                          |  12 ++
 INSTALL                                            |  52 +++-----
 LICENSE                                            |   5 +-
 PKG-INFO                                           |  24 ++--
 README                                             |  14 +-
 debian/.git-dpm                                    |   6 +-
 debian/patches/openpgp-availability-function.patch |  31 -----
 debian/patches/series                              |   1 -
 examples/client.py                                 |   3 +-
 examples/server.py                                 |   3 +-
 examples/twisted-client.py                         |   5 +-
 examples/twisted-server.py                         |   6 +-
 gnutls/__info__.py                                 |  14 ++
 gnutls/__init__.py                                 |   5 +-
 gnutls/connection.py                               | 147 +++++----------------
 gnutls/constants.py                                |  17 ---
 gnutls/crypto.py                                   |  26 +---
 gnutls/errors.py                                   |   2 -
 gnutls/interfaces/__init__.py                      |   2 -
 gnutls/interfaces/twisted/__init__.py              |  42 +++---
 gnutls/library/__init__.py                         |  28 ++--
 gnutls/library/constants.py                        |   7 -
 gnutls/library/errors.py                           |   2 -
 gnutls/library/functions.py                        | 113 +---------------
 gnutls/library/types.py                            |  18 ++-
 gnutls/validators.py                               |  79 +----------
 setup.py                                           |  42 +++---
 27 files changed, 189 insertions(+), 517 deletions(-)

diff --cc debian/.git-dpm
index 7a7058d,0000000..6141c27
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- d2badd80b2671a16644b7861ed013ddc49ebfd76
- d2badd80b2671a16644b7861ed013ddc49ebfd76
- 5a9ba926eb6a03007c6cd63a5c5a3011900068c5
++294e034d4b854d9c5c079f593d352f35c2a41787
++294e034d4b854d9c5c079f593d352f35c2a41787
++294e034d4b854d9c5c079f593d352f35c2a41787
 +294e034d4b854d9c5c079f593d352f35c2a41787
 +python-gnutls_3.0.0.orig.tar.gz
 +55a61894da8af7dadef81ed35c65bf8c15aa6d94
 +40490
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-gnutls.git