[Python-modules-commits] [keyrings.alt] 02/04: Merge new upstream release.

[Dmitry Shachnev]

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

mitya57 pushed a commit to branch master
in repository keyrings.alt.

commit 6c0fdfbf52e40e60e39d24f401a734acb3221f0c
Merge: 427c701 7557b52
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Wed Mar 2 09:39:24 2016 +0300

    Merge new upstream release.
    
    Closes: #816306 (tests failures).

 .gitignore                          |   6 +
 .hgtags                             |   1 +
 CHANGES.rst                         |   8 +-
 PKG-INFO                            |   2 +-
 debian/.git-dpm                     |  14 +--
 debian/changelog                    |   7 ++
 keyrings.alt.egg-info/PKG-INFO      |   2 +-
 keyrings.alt.egg-info/SOURCES.txt   |   1 +
 keyrings.alt.egg-info/top_level.txt |   1 -
 keyrings/alt/_win_crypto.py         |   2 +-
 setup.cfg                           |   4 +-
 setup.py                            |   2 +-
 tests/mocks.py                      | 227 ++++++++++++++++++++++++++++++++++++
 tests/test_Google.py                |   2 +-
 tests/test_Windows.py               |   2 +-
 tests/test_keyczar.py               |   9 +-
 tests/test_pyfs.py                  |  16 +--
 17 files changed, 274 insertions(+), 32 deletions(-)

diff --cc debian/.git-dpm
index 6a3182b,0000000..aeedba9
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
- afa347e693b1ad6b9467d7437eacc2ab62d53b43
- afa347e693b1ad6b9467d7437eacc2ab62d53b43
- afa347e693b1ad6b9467d7437eacc2ab62d53b43
- afa347e693b1ad6b9467d7437eacc2ab62d53b43
- keyrings.alt_1.1.orig.tar.gz
- a8626a62dc33d2eb65a26a41cfff264c47024df8
- 21520
++7557b527ff033785a35151b9221cf5c0851aa845
++7557b527ff033785a35151b9221cf5c0851aa845
++7557b527ff033785a35151b9221cf5c0851aa845
++7557b527ff033785a35151b9221cf5c0851aa845
++keyrings.alt_1.1.1.orig.tar.gz
++e7ae1088af295f80bc1488cac9620fc890f46ffc
++23100
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/changelog
index 0c785c4,0000000..07e41e4
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,5 -1,0 +1,12 @@@
++keyrings.alt (1.1.1-1) UNRELEASED; urgency=medium
++
++  * New upstream release.
++    - Fixes tests failures (closes: #816306).
++
++ -- Dmitry Shachnev <mitya57 at debian.org>  Wed, 02 Mar 2016 09:39:27 +0300
++
 +keyrings.alt (1.1-1) unstable; urgency=medium
 +
 +  * Initial release (closes: #813291).
 +
 + -- Dmitry Shachnev <mitya57 at debian.org>  Sat, 06 Feb 2016 12:28:38 +0300

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