[Python-modules-commits] [pyopenssl] 01/04: Merge branch 'master' into jessie-backports

Sandro Tosi morph at moszumanska.debian.org
Sat Jul 16 22:42:24 UTC 2016


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

morph pushed a commit to branch jessie-backports
in repository pyopenssl.

commit b34f83ab70de1cdf0a8f3db484c65f36baaca062
Merge: 963db79 cac4f1f
Author: Sandro Tosi <morph at debian.org>
Date:   Sat Jul 16 23:31:10 2016 +0100

    Merge branch 'master' into jessie-backports

 .coveragerc                                        |   12 +
 CHANGELOG.rst                                      |   75 +
 CODE_OF_CONDUCT.rst                                |   55 +
 CONTRIBUTING.rst                                   |  107 +-
 INSTALL.rst                                        |   11 +-
 MANIFEST.in                                        |    7 +-
 OpenSSL/__init__.py                                |   12 -
 OpenSSL/test/README                                |    8 -
 OpenSSL/version.py                                 |    9 -
 PKG-INFO                                           |  132 +-
 README.rst                                         |   45 +-
 TODO                                               |    8 -
 debian/.git-dpm                                    |   14 +-
 debian/changelog                                   |   21 +
 debian/control                                     |   10 +-
 debian/copyright                                   |   14 +-
 ...t_set_default_verify_paths-since-it-tries.patch |   58 +
 ...02-pass-PYTHONPATH-when-building-HTML-doc.patch |   30 +
 .../disable_test_set_default_verify_paths.patch    |   51 -
 debian/patches/series                              |    3 +-
 debian/rules                                       |    6 +-
 ChangeLog => doc/ChangeLog_old.txt                 |    9 +-
 doc/Makefile                                       |    3 +-
 doc/README                                         |    2 +-
 doc/api/crypto.rst                                 |  750 ++-------
 doc/api/rand.rst                                   |   74 +-
 doc/api/ssl.rst                                    |   63 +-
 doc/backward-compatibility.rst                     |   11 +
 doc/changelog.rst                                  |    1 +
 doc/conf.py                                        |   48 +-
 doc/index.rst                                      |   27 +-
 doc/install.rst                                    |    1 +
 doc/introduction.rst                               |   43 +-
 docs-requirements.txt                              |    2 +
 examples/README                                    |   48 -
 examples/README.rst                                |   56 +
 examples/SecureXMLRPCServer.py                     |   43 +-
 examples/certgen.py                                |   19 +-
 examples/mk_simple_certs.py                        |   53 +-
 examples/proxy.py                                  |   13 +-
 examples/simple/CA.cert                            |   17 +
 examples/simple/CA.pkey                            |   28 +
 examples/simple/client.cert                        |   17 +
 examples/simple/client.pkey                        |   28 +
 examples/simple/client.py                          |   28 +-
 examples/simple/server.cert                        |   17 +
 examples/simple/server.pkey                        |   28 +
 examples/simple/server.py                          |   60 +-
 examples/sni/client.py                             |    9 +-
 examples/sni/server.py                             |   11 +-
 pyOpenSSL.egg-info/PKG-INFO                        |   32 -
 pyOpenSSL.egg-info/SOURCES.txt                     |   64 -
 pyOpenSSL.egg-info/requires.txt                    |    2 -
 rpm/build_script                                   |    2 +-
 runtests.py                                        |   11 -
 setup.cfg                                          |    7 +-
 setup.py                                           |  159 +-
 {OpenSSL => src/OpenSSL}/SSL.py                    |  358 ++--
 src/OpenSSL/__init__.py                            |   20 +
 {OpenSSL => src/OpenSSL}/_util.py                  |   32 +-
 {OpenSSL => src/OpenSSL}/crypto.py                 | 1104 +++++++------
 {OpenSSL => src/OpenSSL}/rand.py                   |  105 +-
 {OpenSSL => src/OpenSSL}/tsafe.py                  |   16 +-
 src/OpenSSL/version.py                             |   22 +
 src/pyOpenSSL.egg-info/PKG-INFO                    |  138 ++
 src/pyOpenSSL.egg-info/SOURCES.txt                 |   75 +
 .../pyOpenSSL.egg-info}/dependency_links.txt       |    0
 src/pyOpenSSL.egg-info/requires.txt                |    2 +
 .../pyOpenSSL.egg-info}/top_level.txt              |    0
 {OpenSSL/test => tests}/__init__.py                |    0
 tests/conftest.py                                  |   12 +
 memdbg.py => tests/memdbg.py                       |   13 +-
 {OpenSSL/test => tests}/test_crypto.py             | 1217 +++++++-------
 {OpenSSL/test => tests}/test_rand.py               |  112 +-
 {OpenSSL/test => tests}/test_ssl.py                | 1709 ++++++++++----------
 {OpenSSL/test => tests}/test_tsafe.py              |    3 +-
 {OpenSSL/test => tests}/test_util.py               |    6 +-
 {OpenSSL/test => tests}/util.py                    |  222 ++-
 tox.ini                                            |   84 +-
 79 files changed, 4256 insertions(+), 3468 deletions(-)

diff --cc debian/changelog
index 3eccac9,f78a9d5..668b416
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,24 +1,30 @@@
+ pyopenssl (16.0.0-1) unstable; urgency=medium
+ 
+   [ Sandro Tosi ]
+   * New upstream release; Closes: #820569
+   * debian/copyright
+     - extend packaging copyright years
+     - update path for new upstream code organization
+   * debian/control
+     - bump deps on cryptography >= 1.3
+     - bump Standards-Version to 3.9.7 (no changes needed)
+     - add python*-cffi and python*-all-dev, needed to run tests at build time
+   * debian/rules
+     - install CHANGELOG.rst as upstream changelog
+     - pass PYTOHNPATH when building the doc
+   * run tests with py.test
+ 
+   [ Ondřej Nový ]
+   * Fixed VCS URL (https)
+ 
+  -- Sandro Tosi <morph at debian.org>  Wed, 13 Apr 2016 21:54:52 +0100
+ 
 +pyopenssl (0.15.1-2~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +
 + -- Sandro Tosi <morph at debian.org>  Thu, 07 Jan 2016 23:00:49 +0000
 +
  pyopenssl (0.15.1-2) unstable; urgency=medium
  
    * upload to unstable

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



More information about the Python-modules-commits mailing list